mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-21 17:10:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vector_search: forward non-primary key restrictions to Vector Store service

Browse Source 
Include non-primary key restrictions (e.g. regular column filters) in
the filter JSON sent to the Vector Store service. Previously only
partition key and clustering column restrictions were forwarded, so
filtering on regular columns was silently ignored.

Add get_nonprimary_key_restrictions() getter to statement_restrictions.

Add unit tests for non-primary key equality, range, and bind marker
restrictions in filter_test.

Fixes: SCYLLADB-970

Closes scylladb/scylladb#29019
This commit is contained in:
Michał Hudobski
2026-03-12 15:30:14 +01:00
committed by Piotr Dulikowski
parent 3bd770d4d9
commit 7d648961ed
4 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cql3/restrictions/statement_restrictions.hh
View File

@@ -201,6 +201,10 @@ public:
return _clustering_columns_restrictions;
}
const expr::expression& get_nonprimary_key_restrictions() const {
return _nonprimary_key_restrictions;
}
// Get a set of columns restricted by the IS NOT NULL restriction.
// IS NOT NULL is a special case that is handled separately from other restrictions.
const std::unordered_set<const column_definition*> get_not_null_columns() const;

40
test/vector_search/filter_test.cc
View File

@@ -407,4 +407,44 @@ SEASTAR_TEST_CASE(to_json_no_bind_markers_uses_cache) {
});
}
SEASTAR_TEST_CASE(to_json_nonprimary_key_eq) {
return do_with_cql_env_thread([](cql_test_env& e) {
cquery_nofail(e, "create table ks.t(pk int, ck int, r int, v vector<float, 3>, primary key(pk, ck))");
auto restr = make_restrictions("pk=1 and r=42", e);
auto json = get_restrictions_json(restr, true);
auto expected = R"json({"restrictions":[{"type":"==","lhs":"pk","rhs":1},{"type":"==","lhs":"r","rhs":42}],"allow_filtering":true})json";
BOOST_CHECK_EQUAL(json, expected);
});
}
SEASTAR_TEST_CASE(to_json_nonprimary_key_range) {
return do_with_cql_env_thread([](cql_test_env& e) {
cquery_nofail(e, "create table ks.t(pk int, ck int, r int, v vector<float, 3>, primary key(pk, ck))");
auto restr = make_restrictions("pk=1 and r>10 and r<100", e);
auto json = get_restrictions_json(restr, true);
auto expected = R"json({"restrictions":[{"type":"==","lhs":"pk","rhs":1},{"type":">","lhs":"r","rhs":10},{"type":"<","lhs":"r","rhs":100}],"allow_filtering":true})json";
BOOST_CHECK_EQUAL(json, expected);
});
}
SEASTAR_TEST_CASE(to_json_nonprimary_key_bind_marker) {
return do_with_cql_env_thread([](cql_test_env& e) {
cquery_nofail(e, "create table ks.t(pk int, ck int, r int, v vector<float, 3>, primary key(pk, ck))");
auto restr = make_restrictions("pk=1 and r=?", e);
auto filter = vector_search::prepare_filter(restr, true);
std::vector<raw_value> bind_values = {raw_value::make_value(int32_type->decompose(99))};
auto options = make_query_options(std::move(bind_values));
auto json = rjson::print(filter.to_json(options));
auto expected = R"json({"restrictions":[{"type":"==","lhs":"pk","rhs":1},{"type":"==","lhs":"r","rhs":99}],"allow_filtering":true})json";
BOOST_CHECK_EQUAL(json, expected);
});
}
BOOST_AUTO_TEST_SUITE_END()

6
vector_search/filter.cc
View File

@@ -186,11 +186,15 @@ prepared_filter prepare_filter(const cql3::restrictions::statement_restrictions&
auto& partition_key_restrictions = restrictions.get_partition_key_restrictions();
auto& clustering_columns_restrictions = restrictions.get_clustering_columns_restrictions();
auto& nonprimary_key_restrictions = restrictions.get_nonprimary_key_restrictions();
expression_to_prepared(partition_key_restrictions, prepared_restrictions);
expression_to_prepared(clustering_columns_restrictions, prepared_restrictions);
expression_to_prepared(nonprimary_key_restrictions, prepared_restrictions);
bool has_bind_markers = cql3::expr::contains_bind_marker(partition_key_restrictions) || cql3::expr::contains_bind_marker(clustering_columns_restrictions);
bool has_bind_markers = cql3::expr::contains_bind_marker(partition_key_restrictions)
|| cql3::expr::contains_bind_marker(clustering_columns_restrictions)
|| cql3::expr::contains_bind_marker(nonprimary_key_restrictions);
if (!has_bind_markers) {
auto cached_json = restrictions_to_json(prepared_restrictions, allow_filtering, cql3::query_options({}));

2
vector_search/filter.hh
View File

@@ -55,7 +55,7 @@ public:
};
/// Prepares a filter from CQL statement restrictions for use in Vector Store service.
/// This function extracts primary key restrictions from the statement_restrictions
/// This function extracts restrictions from the statement_restrictions
/// and prepares them for serialization to JSON compatible to Vector Store service filtering API.
prepared_filter prepare_filter(const cql3::restrictions::statement_restrictions& restrictions, bool allow_filtering);