Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Datatype deduplication 2: switch to re_arrow2 #4883

Merged
merged 5 commits into from
Jan 24, 2024
Merged

Datatype deduplication 2: switch to re_arrow2 #4883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c02dc1
switch to re_arrow2
teh-cmc Jan 22, 2024
bbbd54f
accomodate to all breaking changes
teh-cmc Jan 22, 2024
14e3b67
codegen
teh-cmc Jan 24, 2024
cd2fbcd
clean up strum and comfy-table deps
teh-cmc Jan 24, 2024
83b8817
we're smaller, yaaay
teh-cmc Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ anyhow = { version = "1.0", default-features = false }
arboard = { version = "3.2", default-features = false }
argh = "0.1.12"
array-init = "2.1"
arrow2 = "0.17"
arrow2_convert = "0.5.0"
arrow2 = { package = "re_arrow2", version = "0.17" }
async-executor = "1.0"
backtrace = "0.3"
bincode = "1.3"
Expand All @@ -118,7 +117,7 @@ cfg-if = "1.0"
clang-format = "0.3"
clap = "4.0"
clean-path = "0.2"
comfy-table = { version = "6.1", default-features = false } # update of comfy-table blocked on old version used by arrow2
comfy-table = { version = "7.0", default-features = false }
console_error_panic_hook = "0.1.6"
convert_case = "0.6"
criterion = "0.5"
Expand Down Expand Up @@ -199,9 +198,8 @@ similar-asserts = "1.4.2"
slotmap = { version = "1.0.6", features = ["serde"] }
smallvec = { version = "1.0", features = ["const_generics", "union"] }
static_assertions = "1.1"
# update of strum blocked by arrow2/comfytable
strum = { version = "0.24", features = ["derive"] }
strum_macros = "0.24"
strum = { version = "0.25", features = ["derive"] }
strum_macros = "0.25"
sublime_fuzzy = "0.7"
syn = "2.0"
sysinfo = { version = "0.30.1", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions crates/re_entity_db/src/blueprint/components/entity_properties_component.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion crates/re_format/src/arrow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,10 @@ impl std::fmt::Display for DisplayDataType {
DataType::Decimal(_, _) => "decimal",
DataType::Decimal256(_, _) => "decimal256",
DataType::Extension(name, data_type, _) => {
let s = format!("extension<{name}>[{}]", DisplayDataType(*data_type.clone()));
let s = format!(
"extension<{name}>[{}]",
DisplayDataType((**data_type).clone())
);
return f.write_str(&s);
}
};
Expand Down
8 changes: 4 additions & 4 deletions crates/re_log_types/src/data_cell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,8 +686,8 @@ fn data_cell_sizes() {
DataCell::from_arrow(InstanceKey::name(), UInt64Array::from_vec(vec![]).boxed());
cell.compute_size_bytes();

assert_eq!(216, cell.heap_size_bytes());
assert_eq!(216, cell.heap_size_bytes());
assert_eq!(184, cell.heap_size_bytes());
assert_eq!(184, cell.heap_size_bytes());
}

// anything else
Expand All @@ -699,7 +699,7 @@ fn data_cell_sizes() {
cell.compute_size_bytes();

// zero-sized + 3x u64s
assert_eq!(240, cell.heap_size_bytes());
assert_eq!(240, cell.heap_size_bytes());
assert_eq!(208, cell.heap_size_bytes());
assert_eq!(208, cell.heap_size_bytes());
}
}
Loading
Loading