Skip to content

Commit c59d9f9

Browse files
committed
Use runtime dispatch instead of monomorphized FixedSizeBinaryFilter
1 parent 66a901f commit c59d9f9

1 file changed

Lines changed: 32 additions & 34 deletions

File tree

‎datafusion/physical-expr/src/expressions/in_list/fixed_size_binary_filter.rs‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
//! Reinterpreting an aligned Arrow buffer is zero-copy. An unaligned buffer is
3939
//! copied into aligned primitive storage before filter construction or probing.
4040
41-
use std::marker::PhantomData;
4241
use std::mem::size_of;
4342
use std::sync::Arc;
4443

@@ -84,16 +83,12 @@ where
8483
}
8584

8685
/// Adapts a primitive filter to concrete, same-width `FixedSizeBinary` arrays.
87-
struct FixedSizeBinaryFilter<T: ArrowPrimitiveType> {
86+
struct FixedSizeBinaryFilter {
8887
data_type: DataType,
8988
inner: StaticFilterRef,
90-
_marker: PhantomData<T>,
9189
}
9290

93-
impl<T> StaticFilter for FixedSizeBinaryFilter<T>
94-
where
95-
T: ArrowPrimitiveType + Send + Sync + 'static,
96-
{
91+
impl StaticFilter for FixedSizeBinaryFilter {
9792
fn null_count(&self) -> usize {
9893
self.inner.null_count()
9994
}
@@ -114,27 +109,25 @@ where
114109
self.data_type
115110
)
116111
})?;
117-
let primitive = reinterpret_as_primitive::<T>(array)?;
118-
self.inner.contains(&primitive, negated)
112+
let primitive = reinterpret(array)?;
113+
self.inner.contains(primitive.as_ref(), negated)
119114
}
120115
}
121116

122-
fn instantiate_for_primitive<T>(array: &FixedSizeBinaryArray) -> Result<StaticFilterRef>
123-
where
124-
T: ArrowPrimitiveType + Send + Sync + 'static,
125-
{
126-
let primitive: ArrayRef = Arc::new(reinterpret_as_primitive::<T>(array)?);
127-
let inner = instantiate_primitive_filter(&primitive)?.ok_or_else(|| {
128-
internal_datafusion_err!(
129-
"FixedSizeBinary filter: no primitive filter for {}",
130-
primitive.data_type()
131-
)
132-
})?;
133-
Ok(Arc::new(FixedSizeBinaryFilter::<T> {
134-
data_type: array.data_type().clone(),
135-
inner,
136-
_marker: PhantomData,
137-
}))
117+
/// Reinterprets a supported-width array as its same-width primitive array.
118+
fn reinterpret(array: &FixedSizeBinaryArray) -> Result<ArrayRef> {
119+
Ok(match array.value_size() {
120+
1 => Arc::new(reinterpret_as_primitive::<UInt8Type>(array)?) as ArrayRef,
121+
2 => Arc::new(reinterpret_as_primitive::<UInt16Type>(array)?),
122+
4 => Arc::new(reinterpret_as_primitive::<UInt32Type>(array)?),
123+
8 => Arc::new(reinterpret_as_primitive::<UInt64Type>(array)?),
124+
16 => Arc::new(reinterpret_as_primitive::<Decimal128Type>(array)?),
125+
width => {
126+
return Err(internal_datafusion_err!(
127+
"FixedSizeBinary filter: unsupported width {width}"
128+
));
129+
}
130+
})
138131
}
139132

140133
/// Creates an optimized filter for supported concrete `FixedSizeBinary` arrays.
@@ -144,19 +137,24 @@ pub(super) fn instantiate_fixed_size_binary_filter(
144137
let DataType::FixedSizeBinary(width) = in_array.data_type() else {
145138
return Ok(None);
146139
};
140+
if !matches!(width, 1 | 2 | 4 | 8 | 16) {
141+
return Ok(None);
142+
}
147143
let Some(array) = in_array.as_fixed_size_binary_opt() else {
148144
return Ok(None);
149145
};
150146

151-
let filter = match width {
152-
1 => instantiate_for_primitive::<UInt8Type>(array)?,
153-
2 => instantiate_for_primitive::<UInt16Type>(array)?,
154-
4 => instantiate_for_primitive::<UInt32Type>(array)?,
155-
8 => instantiate_for_primitive::<UInt64Type>(array)?,
156-
16 => instantiate_for_primitive::<Decimal128Type>(array)?,
157-
_ => return Ok(None),
158-
};
159-
Ok(Some(filter))
147+
let primitive = reinterpret(array)?;
148+
let inner = instantiate_primitive_filter(&primitive)?.ok_or_else(|| {
149+
internal_datafusion_err!(
150+
"FixedSizeBinary filter: no primitive filter for {}",
151+
primitive.data_type()
152+
)
153+
})?;
154+
Ok(Some(Arc::new(FixedSizeBinaryFilter {
155+
data_type: in_array.data_type().clone(),
156+
inner,
157+
})))
160158
}
161159

162160
#[cfg(test)]

0 commit comments

Comments
 (0)