Skip to content

Commit dfe4820

Browse files
authored
Refactor numerical filter (#11336)
1 parent 13b7a5e commit dfe4820

File tree

72 files changed

+904
-737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+904
-737
lines changed

crates/viewer/re_dataframe_ui/src/datafusion_table_widget.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use re_viewer_context::{AsyncRuntimeHandle, ViewerContext};
2121

2222
use crate::datafusion_adapter::{DataFusionAdapter, DataFusionQueryResult};
2323
use crate::display_record_batch::DisplayColumn;
24-
use crate::filters::{Filter, FilterOperation, FilterState};
24+
use crate::filters::{Filter, FilterKind, FilterState};
2525
use crate::header_tooltip::column_header_tooltip_ui;
2626
use crate::table_blueprint::{
2727
ColumnBlueprint, EntryLinksSpec, PartitionLinksSpec, SortBy, SortDirection, TableBlueprint,
@@ -705,7 +705,7 @@ impl egui_table::TableDelegate for DataFusionTableDelegate<'_> {
705705
#[expect(clippy::collapsible_if)]
706706
if column.blueprint.variant_ui.is_none()
707707
&& let Some(filter_op) =
708-
FilterOperation::default_for_column(column_field)
708+
FilterKind::default_for_column(column_field)
709709
{
710710
if ui
711711
.icon_and_text_menu_item(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl NonNullableBooleanFilter {
4040
Ok(array_has(col(column.clone()), lit(self.as_bool())))
4141
}
4242

43-
_ => Err(FilterError::InvalidNonNullableBooleanFilterOperation(
43+
_ => Err(FilterError::InvalidNonNullableBooleanFilter(
4444
self.clone(),
4545
field.clone().into(),
4646
)),
@@ -124,7 +124,7 @@ impl NullableBooleanFilter {
124124
}
125125
}
126126

127-
_ => Err(FilterError::InvalidNullableBooleanFilterOperation(
127+
_ => Err(FilterError::InvalidNullableBooleanFilter(
128128
self.clone(),
129129
field.clone().into(),
130130
)),

0 commit comments

Comments
 (0)