Skip to content

fix: bracket match query display #7796

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

Merged
jackye1995 merged 1 commit into from
Jul 15, 2026
Merged

fix: bracket match query display #7796

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion rust/lance/src/dataset/mem_wal/memtable/flush.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2247,7 +2247,7 @@ mod tests {
"ProjectionExec: expr=[id@2 as id, text@3 as text, _score@1 as _score]
Take: ...
CoalesceBatchesExec: ...
MatchQuery: column=text, query=hello",
MatchQuery: column=text, query=[hello]",
)
.await
.unwrap();
Expand Down
20 changes: 10 additions & 10 deletions rust/lance/src/dataset/scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11248,7 +11248,7 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
let expected = r#"ProjectionExec: expr=[s@2 as s, _score@1 as _score, _rowid@0 as _rowid]
Take: columns="_rowid, _score, (s)"
CoalesceBatchesExec: target_batch_size=8192
MatchQuery: column=s, query=hello"#;
MatchQuery: column=s, query=[hello]"#;
assert_plan_equals(
&dataset.dataset,
|scan| {
Expand Down Expand Up @@ -11282,8 +11282,8 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
Take: columns="_rowid, _score, (s)"
CoalesceBatchesExec: target_batch_size=8192
BoostQuery: negative_boost=1
MatchQuery: column=s, query=hello
MatchQuery: column=s, query=world"#;
MatchQuery: column=s, query=[hello]
MatchQuery: column=s, query=[world]"#;
assert_plan_equals(
&dataset.dataset,
|scan| {
Expand All @@ -11305,7 +11305,7 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
r#"ProjectionExec: expr=[s@2 as s, _score@1 as _score, _rowid@0 as _rowid]
Take: columns="_rowid, _score, (s)"
CoalesceBatchesExec: target_batch_size=8192
MatchQuery: column=s, query=hello
MatchQuery: column=s, query=[hello]
CoalescePartitionsExec
UnionExec
MaterializeIndex: query=[i > 10]@i_idx(BTree)
Expand All @@ -11316,7 +11316,7 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
r#"ProjectionExec: expr=[s@2 as s, _score@1 as _score, _rowid@0 as _rowid]
Take: columns="_rowid, _score, (s)"
CoalesceBatchesExec: target_batch_size=8192
MatchQuery: column=s, query=hello
MatchQuery: column=s, query=[hello]
LanceRead: uri=..., projection=[], num_fragments=5, range_before=None, range_after=None, row_id=true, row_addr=false, full_filter=i > Int32(10), refine_filter=--
ScalarIndexQuery: query=[i > 10]@i_idx(BTree)"#
};
Expand Down Expand Up @@ -11345,7 +11345,7 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
SortExec: expr=[_score@1 DESC NULLS LAST], preserve_partitioning=[false]
CoalescePartitionsExec
UnionExec
MatchQuery: column=s, query=hello
MatchQuery: column=s, query=[hello]
FlatMatchQuery: column=s, query=hello
LanceScan: uri=..., projection=[s], row_id=true, row_addr=false, ordered=true, range=None"#
} else {
Expand All @@ -11355,7 +11355,7 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
SortExec: expr=[_score@1 DESC NULLS LAST], preserve_partitioning=[false]
CoalescePartitionsExec
UnionExec
MatchQuery: column=s, query=hello
MatchQuery: column=s, query=[hello]
FlatMatchQuery: column=s, query=hello
LanceRead: uri=..., projection=[s], num_fragments=1, range_before=None, range_after=None, row_id=true, row_addr=false, full_filter=--, refine_filter=--"#
};
Expand All @@ -11375,7 +11375,7 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
let expected = r#"ProjectionExec: expr=[s@2 as s, _score@1 as _score, _rowid@0 as _rowid]
Take: columns="_rowid, _score, (s)"
CoalesceBatchesExec: target_batch_size=8192
MatchQuery: column=s, query=hello"#;
MatchQuery: column=s, query=[hello]"#;
assert_plan_equals(
&dataset.dataset,
|scan| {
Expand All @@ -11402,7 +11402,7 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
SortExec: expr=[_score@1 DESC NULLS LAST], preserve_partitioning=[false]
CoalescePartitionsExec
UnionExec
MatchQuery: column=s, query=hello
MatchQuery: column=s, query=[hello]
CoalescePartitionsExec
UnionExec
MaterializeIndex: query=[i > 10]@i_idx(BTree)
Expand All @@ -11425,7 +11425,7 @@ full_filter=name LIKE Utf8(\"test%2\"), refine_filter=name LIKE Utf8(\"test%2\")
SortExec: expr=[_score@1 DESC NULLS LAST], preserve_partitioning=[false]
CoalescePartitionsExec
UnionExec
MatchQuery: column=s, query=hello
MatchQuery: column=s, query=[hello]
LanceRead: uri=..., projection=[], num_fragments=5, range_before=None, range_after=None, row_id=true, row_addr=false, full_filter=i > Int32(10), refine_filter=--
ScalarIndexQuery: query=[i > 10]@i_idx(BTree)
FlatMatchQuery: column=s, query=hello
Expand Down
2 changes: 1 addition & 1 deletion rust/lance/src/dataset/tests/dataset_aggregate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,7 +1602,7 @@ async fn test_scanner_count_rows_with_fts() {
assert_plan_node_equals(
plan.clone(),
"AggregateExec: mode=Single, gby=[], aggr=[count(Int32(1))]
MatchQuery: column=text, query=document",
MatchQuery: column=text, query=[document]",
)
.await
.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion rust/lance/src/io/exec/fts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ impl DisplayAs for MatchQueryExec {
DisplayFormatType::Default | DisplayFormatType::Verbose => {
write!(
f,
"MatchQuery: column={}, query={}",
"MatchQuery: column={}, query=[{}]",
self.query.column.as_deref().unwrap_or_default(),
self.query.terms
)
Expand Down
Loading