Skip to content

use vec instead of hashset for PrimitiveListContainsAny and StringListContainsAny predicates #53

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

Open
tmcgroul wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −14
Open

use vec instead of hashset for PrimitiveListContainsAny and StringListContainsAny predicates #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 52 additions & 14 deletions crates/query/src/scan/array_predicate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use arrow::array::{Array, ArrayRef, AsArray, BooleanArray, Datum, PrimitiveArray
use arrow::buffer::{BooleanBuffer, Buffer};
use arrow::compute::{cast_with_options, CastOptions};
use arrow::datatypes::{ArrowNativeType, ArrowNativeTypeOp, ArrowPrimitiveType, DataType, Int16Type, Int32Type, Int64Type, Int8Type, UInt16Type, UInt32Type, UInt64Type, UInt8Type};
use std::collections::HashSet;
use std::hash::Hash;
use std::ops::BitAnd;
use std::sync::Arc;
Expand Down Expand Up @@ -532,14 +531,11 @@ impl ArrayPredicate for BloomFilter {


pub struct PrimitiveListContainsAny<T: ArrowPrimitiveType> {
values: HashSet<T::Native>,
values: Vec<T::Native>,
}


impl<T: ArrowPrimitiveType> PrimitiveListContainsAny<T>
where
T::Native: std::cmp::Eq + Hash,
{
impl<T: ArrowPrimitiveType> PrimitiveListContainsAny<T> {
pub fn new(values: &[T::Native]) -> Self {
Self {
values: values.iter().copied().collect(),
Expand All @@ -548,10 +544,7 @@ where
}


impl<T: ArrowPrimitiveType> ArrayPredicate for PrimitiveListContainsAny<T>
where
T::Native: std::cmp::Eq + Hash,
{
impl<T: ArrowPrimitiveType> ArrayPredicate for PrimitiveListContainsAny<T> {
fn evaluate(&self, arr: &dyn Array) -> anyhow::Result<BooleanArray> {
let list_array = arr.as_list_opt::<i32>().ok_or_else(|| {
anyhow!("expected List array, but got {}", arr.data_type())
Expand Down Expand Up @@ -585,7 +578,7 @@ where


pub struct StringListContainsAny {
values: HashSet<String>,
values: Vec<String>,
}


Expand Down Expand Up @@ -619,7 +612,7 @@ impl ArrayPredicate for StringListContainsAny {
let start = offsets[i].as_usize();
let end = offsets[i + 1].as_usize();
for j in start..end {
if self.values.contains(values_array.value(j)) {
if self.values.iter().any(|v| v.as_str() == values_array.value(j)) {
return true;
}
}
Expand All @@ -633,9 +626,10 @@ impl ArrayPredicate for StringListContainsAny {

#[cfg(feature = "_bench")]
mod bench {
use crate::scan::array_predicate::{ArrayPredicate, BloomFilter};
use arrow::array::FixedSizeBinaryArray;
use crate::scan::array_predicate::{ArrayPredicate, BloomFilter, PrimitiveListContainsAny, StringListContainsAny};
use arrow::array::{FixedSizeBinaryArray, ListArray, ListBuilder, StringBuilder};
use arrow::buffer::MutableBuffer;
use arrow::datatypes::UInt32Type;


#[divan::bench]
Expand All @@ -650,4 +644,48 @@ mod bench {
pred.evaluate(&array).unwrap()
})
}


#[divan::bench]
fn primitive_list_contains(bench: divan::Bencher) {
let pred: PrimitiveListContainsAny<UInt32Type> = PrimitiveListContainsAny::new(&vec![0]);
let array = ListArray::from_iter_primitive::<UInt32Type, _, _>(vec![
Some(vec![Some(1), Some(2), Some(3)]),
Some(vec![Some(0), Some(1)]),
Some(vec![Some(100), Some(200), Some(300), Some(400), Some(500)]),
]);
bench.bench(|| {
pred.evaluate(&array).unwrap()
})
}


#[divan::bench]
fn string_list_contains(bench: divan::Bencher) {
let pred = StringListContainsAny::new(&vec!["0x00000000000000000000000000000000"]);

let mut list_builder = ListBuilder::new(StringBuilder::new());

list_builder.values().append_value("0x11111111111111111111111111111111");
list_builder.values().append_value("0x22222222222222222222222222222222");
list_builder.values().append_value("0x33333333333333333333333333333333");
list_builder.append(true);

list_builder.values().append_value("0x00000000000000000000000000000000");
list_builder.values().append_value("0x11111111111111111111111111111111");
list_builder.append(true);

list_builder.values().append_value("0x11111111111111111111111111111111");
list_builder.values().append_value("0x22222222222222222222222222222222");
list_builder.values().append_value("0x33333333333333333333333333333333");
list_builder.values().append_value("0x44444444444444444444444444444444");
list_builder.values().append_value("0x55555555555555555555555555555555");
list_builder.append(true);

let array = list_builder.finish();

bench.bench(|| {
pred.evaluate(&array).unwrap()
})
}
}