Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 20 additions & 21 deletions crates/lance-csr/src/datafusion_planner/scalar_functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
use std::sync::Arc;

use arrow::array::{
new_null_array, Array, AsArray, BooleanArray, Int64Array, ListBuilder, StringArray,
StringBuilder,
new_null_array, Array, AsArray, Datum, Int64Array, ListBuilder, StringArray, StringBuilder,
};
use arrow::compute::kernels::comparison;
use arrow::compute::{cast, cast_with_options, CastOptions};
use arrow_schema::{DataType, Field};
use datafusion::common::{exec_err, plan_err, ScalarValue};
Expand Down Expand Up @@ -268,6 +268,24 @@ impl ScalarUDFImpl for CypherScalar {
Ok(result)
};
}
if matches!(
self.name.as_str(),
"__string_contains" | "__string_starts_with" | "__string_ends_with"
) {
// Arrow's kernels build one substring searcher per batch, and a literal
// pattern stays a scalar instead of being repeated for every row.
let text = cast(&args.args[0].to_array(args.number_rows)?, &DataType::Utf8)?;
let pattern: Box<dyn Datum> = match &args.args[1] {
ColumnarValue::Scalar(p) => Box::new(p.cast_to(&DataType::Utf8)?.to_scalar()?),
ColumnarValue::Array(p) => Box::new(cast(p, &DataType::Utf8)?),
};
let result = match self.name.as_str() {
"__string_contains" => comparison::contains(&text, pattern.as_ref()),
"__string_starts_with" => comparison::starts_with(&text, pattern.as_ref()),
_ => comparison::ends_with(&text, pattern.as_ref()),
}?;
return Ok(ColumnarValue::Array(Arc::new(result)));
}
let arrays = args
.args
.iter()
Expand All @@ -282,25 +300,6 @@ impl ScalarUDFImpl for CypherScalar {
})
.collect::<std::result::Result<Vec<_>, _>>()?;
let strings = arrays[0].as_string::<i32>();
if matches!(
self.name.as_str(),
"__string_contains" | "__string_starts_with" | "__string_ends_with"
) {
let patterns = arrays[1].as_string::<i32>();
let result: BooleanArray = strings
.iter()
.zip(patterns.iter())
.map(|(text, pattern)| {
text.zip(pattern)
.map(|(text, pattern)| match self.name.as_str() {
"__string_contains" => text.contains(pattern),
"__string_starts_with" => text.starts_with(pattern),
_ => text.ends_with(pattern),
})
})
.collect();
return Ok(ColumnarValue::Array(Arc::new(result)));
}
if self.name == "size" {
return Ok(ColumnarValue::Array(Arc::new(
strings
Expand Down
5 changes: 5 additions & 0 deletions python/python/tests/test_string_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,8 @@ def test_bound_string_operands(csr: bool) -> None:
assert engine.execute(
"MATCH (p:Person {id: $id}) RETURN p.id AS id", {"id": 2}
).to_pylist() == [{"id": 2}]
# The search string can also be a column, one value per row.
assert engine.execute(
"MATCH (p:Person), (q:Person) WHERE q.id IN [2, 3] "
"AND p.name CONTAINS q.name RETURN p.id AS id, q.id AS q ORDER BY id, q"
).to_pylist() == [{"id": 1, "q": 2}, {"id": 2, "q": 2}]