refactor: drop VectorQuery, unify single-target query on SearchQuery by egolearner · Pull Request #428 · alibaba/zvec

egolearner · 2026-05-28T06:25:20Z

Extract query types from doc.h into a new src/include/zvec/db/query.h and introduce VectorClause / FtsClause / QueryTarget / SearchQuery as the unified query API.

SearchQuery becomes the single canonical entry at the SQLEngine layer (execute, parse_request, MessageToSQLInfo)
Collection gains Query(const SearchQuery&); the old Query(const VectorQuery&) overload is kept as a backward-compat delegating shim and marked [[deprecated]]
VectorQuery struct itself is also marked [[deprecated]] with a migration hint to SearchQuery
GroupByVectorQuery is reorganized to hold a QueryTarget (not publicly released, so the layout change is safe)
C and Python bindings now route through SearchQuery internally while preserving the external surface (C symbol names, Python _VectorQuery attribute names, pickle tuple layout)
All SQLEngine-layer tests, plus the collection / doc / optimize-recovery tests, are migrated to construct SearchQuery directly
The C++ example and the bug-report issue template are updated to the new API

chinaux

LGTM

Adapt FTS to the query-model refactor from alibaba#428/alibaba#405 on main: - VectorQuery is replaced by SearchQuery + QueryTarget (variant<VectorClause, FtsClause>) - Fold FTS validation into SearchQuery::validate_and_sanitize - c_api / python binding read & write FTS via FtsClause and target_.clause_ - Add QueryTarget::get_fts_clause() helper, replacing raw std::get_if calls - Migrate FTS tests to the new model; drop the vector/fts mutual-exclusion case that no longer applies under the variant

egolearner requested review from Cuiyus, chinaux and zhourrr as code owners May 28, 2026 06:25

github-actions Bot assigned egolearner May 28, 2026

egolearner force-pushed the refactor/search-query-abstraction branch from 41a9da5 to 85cefc1 Compare May 28, 2026 07:53

refactor: drop VectorQuery, unify single-target query on SearchQuery

27dea57

egolearner force-pushed the refactor/search-query-abstraction branch from 85cefc1 to 27dea57 Compare May 29, 2026 03:05

egolearner changed the title ~~refactor: introduce SearchQuery and QueryTarget, deprecate VectorQuery~~ refactor: drop VectorQuery, unify single-target query on SearchQuery May 29, 2026