Skip to content

Commit a80d8e4

Browse files
grtlrtimsaucer
authored andcommitted
Initial commit
1 parent a415cf8 commit a80d8e4

File tree

18 files changed

+487
-387
lines changed

18 files changed

+487
-387
lines changed

Cargo.lock

Lines changed: 394 additions & 318 deletions
Large diffs are not rendered by default.

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ ahash = "0.8"
188188
anyhow = { version = "1.0", default-features = false }
189189
argh = "0.1.12"
190190
array-init = "2.1"
191-
arrow = { version = "55.2", default-features = false }
191+
arrow = { version = "56.1", default-features = false }
192192
async-stream = "0.3"
193193
async-trait = "0.1.83"
194194
axum = "0.8.4"
@@ -218,7 +218,7 @@ convert_case = "0.6"
218218
criterion = "0.5"
219219
cros-codecs = "0.0.6"
220220
crossbeam = "0.8"
221-
datafusion = { version = "49.0.2", default-features = false, features = [
221+
datafusion = { version = "50.1.0", default-features = false, features = [
222222
# NOTE: we enable the same features everywhere
223223
# because otherwise we will recompile datafusion all the time based on our current compile target.
224224
# The features here are the same as in https://github.com/lancedb/lance/blob/v0.36.0/Cargo.toml#L99-L107
@@ -231,7 +231,7 @@ datafusion = { version = "49.0.2", default-features = false, features = [
231231
"string_expressions",
232232
"unicode_expressions",
233233
] }
234-
datafusion-ffi = "49.0.2"
234+
datafusion-ffi = "50.1.0"
235235
directories = "6"
236236
document-features = "0.2.8"
237237
econtext = "0.2" # Prints error contexts on crashes
@@ -264,7 +264,7 @@ itertools = "0.14"
264264
jiff = { version = "0.2.3", features = ["js"] }
265265
js-sys = "0.3"
266266
jsonwebtoken = { version = "9", default-features = false }
267-
lance = { version = "0.36.0", default-features = false } # When you update this, also update the list of features enabled for `datafusion` (~50 lines up)
267+
lance = { version = "0.38.1", default-features = false } # When you update this, also update the list of features enabled for `datafusion` (~50 lines up)
268268
libc = "0.2"
269269
linked-hash-map = { version = "0.5", default-features = false }
270270
log = "0.4"
@@ -285,15 +285,15 @@ nohash-hasher = "0.2"
285285
notify = { version = "8", features = ["macos_kqueue"] }
286286
num-derive = "0.4"
287287
num-traits = "0.2"
288-
numpy = "0.24"
288+
numpy = "0.25"
289289
objc2-app-kit = "0.3"
290290
opentelemetry = { version = "0.30", features = ["metrics"] }
291291
opentelemetry-appender-tracing = "0.30"
292292
opentelemetry-otlp = "0.30"
293293
opentelemetry_sdk = { version = "0.30", features = ["rt-tokio"] }
294294
ordered-float = "4.3.0"
295295
parking_lot = "0.12.3"
296-
parquet = { version = "55.1", default-features = false }
296+
parquet = { version = "56.1", default-features = false }
297297
paste = "1.0"
298298
pathdiff = "0.2"
299299
percent-encoding = "2.3"
@@ -312,8 +312,8 @@ prost-types = "0.13.3"
312312
prost-reflect = "0.15.3"
313313
puffin = "0.19.1"
314314
puffin_http = "0.16"
315-
pyo3 = "0.24.1"
316-
pyo3-build-config = "0.24.1"
315+
pyo3 = "0.25.1"
316+
pyo3-build-config = "0.25.1"
317317
quote = "1.0"
318318
rand = { version = "0.8", default-features = false, features = ["small_rng"] }
319319
rand_distr = { version = "0.4", default-features = false }

crates/store/re_types_core/src/reflection.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ pub fn generic_placeholder_for_datatype(
224224
))
225225
}
226226

227+
DataType::Decimal32(_, _) => Arc::new(array::Decimal32Array::from_iter([0])),
228+
DataType::Decimal64(_, _) => Arc::new(array::Decimal64Array::from_iter([0])),
227229
DataType::Decimal128(_, _) => Arc::new(array::Decimal128Array::from_iter([0])),
228230

229231
DataType::Decimal256(_, _) => Arc::new(array::Decimal256Array::from_iter([

crates/utils/re_arrow_util/src/format_data_type.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ impl std::fmt::Display for DisplayDatatype<'_> {
119119
DataType::Dictionary(key, value) => {
120120
return write!(f, "Dictionary{{{}: {}}}", Self(key), Self(value));
121121
}
122+
DataType::Decimal32(_, _) => "Decimal32",
123+
DataType::Decimal64(_, _) => "Decimal64",
122124
DataType::Decimal128(_, _) => "Decimal128",
123125
DataType::Decimal256(_, _) => "Decimal256",
124126
DataType::BinaryView => "BinaryView",

crates/utils/re_byte_size/src/arrow_sizes.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ impl SizeBytes for DataType {
106106
| Self::Utf8
107107
| Self::LargeUtf8
108108
| Self::BinaryView
109+
| Self::Decimal32(_, _)
110+
| Self::Decimal64(_, _)
109111
| Self::Decimal128(_, _)
110112
| Self::Decimal256(_, _)
111113
| Self::FixedSizeBinary(_)

crates/viewer/re_arrow_ui/src/show_index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ fn make_ui<'a>(
170170
| DataType::Utf8View | DataType::BinaryView
171171
| DataType::Date32 | DataType::Date64 | DataType::Time32(_) | DataType::Time64(_)
172172
| DataType::Duration(_) | DataType::Interval(_)
173-
| DataType::Decimal128(_, _) | DataType::Decimal256(_, _)
173+
| DataType::Decimal32(_, _) | DataType::Decimal64(_, _) | DataType::Decimal128(_, _) | DataType::Decimal256(_, _)
174174
=> {
175175
show_arrow_builtin(array, options)
176176
}

crates/viewer/re_dataframe_ui/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ egui_table.workspace = true
4444
itertools.workspace = true
4545
jiff.workspace = true
4646
nohash-hasher.workspace = true
47+
num-traits.workspace = true
48+
ordered-float.workspace = true
4749
parking_lot.workspace = true
4850
serde.workspace = true
4951
strum.workspace = true

crates/viewer/re_dataframe_ui/src/filters/boolean.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use super::{Filter, FilterError, FilterUiAction};
1414
/// Filter for non-nullable boolean columns.
1515
///
1616
/// This represents both the filter itself, and the state of the corresponding UI.
17-
#[derive(Debug, Clone, Default, PartialEq, Eq)]
17+
#[derive(Debug, Clone, Default, PartialEq, Eq, Hash)]
1818
pub enum NonNullableBooleanFilter {
1919
#[default]
2020
IsTrue,
@@ -87,7 +87,7 @@ impl SyntaxHighlighting for NonNullableBooleanFilter {
8787
}
8888
}
8989

90-
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, strum::VariantArray)]
90+
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash, strum::VariantArray)]
9191
#[expect(clippy::enum_variant_names)]
9292
pub enum NullableBooleanValue {
9393
#[default]
@@ -106,7 +106,7 @@ impl NullableBooleanValue {
106106
}
107107
}
108108

109-
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, strum::VariantArray)]
109+
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash, strum::VariantArray)]
110110
pub enum NullableBooleanOperator {
111111
#[default]
112112
Is,
@@ -125,7 +125,7 @@ impl std::fmt::Display for NullableBooleanOperator {
125125
/// Filter for nullable boolean columns.
126126
///
127127
/// This represents both the filter itself, and the state of the corresponding UI.
128-
#[derive(Clone, Default, PartialEq, Eq)]
128+
#[derive(Clone, Default, PartialEq, Eq, Hash)]
129129
pub struct NullableBooleanFilter {
130130
value: NullableBooleanValue,
131131
operator: NullableBooleanOperator,

crates/viewer/re_dataframe_ui/src/filters/column_filter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl Nullability {
7272
}
7373

7474
/// A filter applied to a table's column.
75-
#[derive(Debug, Clone, PartialEq)]
75+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
7676
pub struct ColumnFilter {
7777
pub field: FieldRef,
7878
pub filter: TypedFilter,

crates/viewer/re_dataframe_ui/src/filters/filter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub trait Filter {
6464
/// need them (e.g., to test blueprint inequality before triggering a costly table update).
6565
/// The last item is related to how the filter UI is implemented using the `SyntaxHighlighting`
6666
/// machinery.
67-
#[derive(Debug, Clone, PartialEq)]
67+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
6868
pub enum TypedFilter {
6969
NullableBoolean(NullableBooleanFilter),
7070
NonNullableBoolean(NonNullableBooleanFilter),

0 commit comments

Comments
 (0)