Skip to content

branch-4.0: [chore](search) remove useless params #57117 #57134

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
yiguolei merged 1 commit into from
Oct 20, 2025
Merged

branch-4.0: [chore](search) remove useless params #57117 #57134

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
17 changes: 8 additions & 9 deletions be/src/vec/functions/function_search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ Status FunctionSearch::evaluate_inverted_index_with_search_param(

query_v2::QueryPtr root_query;
std::string root_binding_key;
RETURN_IF_ERROR(build_query_recursive(*this, search_param.root, context, resolver, &root_query,
RETURN_IF_ERROR(build_query_recursive(search_param.root, context, resolver, &root_query,
&root_binding_key));
if (root_query == nullptr) {
LOG(INFO) << "search: Query tree resolved to empty query, dsl:"
Expand Down Expand Up @@ -390,8 +390,7 @@ InvertedIndexQueryType FunctionSearch::clause_type_to_query_type(
return InvertedIndexQueryType::EQUAL_QUERY;
}

Status FunctionSearch::build_query_recursive(const FunctionSearch& function,
const TSearchClause& clause,
Status FunctionSearch::build_query_recursive(const TSearchClause& clause,
const std::shared_ptr<IndexQueryContext>& context,
FieldReaderResolver& resolver,
inverted_index::query_v2::QueryPtr* out,
Expand All @@ -416,8 +415,8 @@ Status FunctionSearch::build_query_recursive(const FunctionSearch& function,
for (const auto& child_clause : clause.children) {
query_v2::QueryPtr child_query;
std::string child_binding_key;
RETURN_IF_ERROR(build_query_recursive(function, child_clause, context, resolver,
&child_query, &child_binding_key));
RETURN_IF_ERROR(build_query_recursive(child_clause, context, resolver, &child_query,
&child_binding_key));
// Add all children including empty BitmapQuery
// BooleanQuery will handle the logic:
// - AND with empty bitmap → result is empty
Expand All @@ -431,10 +430,10 @@ Status FunctionSearch::build_query_recursive(const FunctionSearch& function,
return Status::OK();
}

return build_leaf_query(function, clause, context, resolver, out, binding_key);
return build_leaf_query(clause, context, resolver, out, binding_key);
}

Status FunctionSearch::build_leaf_query(const FunctionSearch& function, const TSearchClause& clause,
Status FunctionSearch::build_leaf_query(const TSearchClause& clause,
const std::shared_ptr<IndexQueryContext>& context,
FieldReaderResolver& resolver,
inverted_index::query_v2::QueryPtr* out,
Expand All @@ -453,7 +452,7 @@ Status FunctionSearch::build_leaf_query(const FunctionSearch& function, const TS
const std::string& value = clause.value;
const std::string& clause_type = clause.clause_type;

auto query_type = function.clause_type_to_query_type(clause_type);
auto query_type = clause_type_to_query_type(clause_type);

FieldReaderBinding binding;
RETURN_IF_ERROR(resolver.resolve(field_name, query_type, &binding));
Expand All @@ -474,7 +473,7 @@ Status FunctionSearch::build_leaf_query(const FunctionSearch& function, const TS
*binding_key = binding.binding_key;
}

FunctionSearch::ClauseTypeCategory category = function.get_clause_type_category(clause_type);
FunctionSearch::ClauseTypeCategory category = get_clause_type_category(clause_type);
std::wstring field_wstr = binding.stored_field_wstr;
std::wstring value_wstr = StringHelper::to_wstring(value);

Expand Down
4 changes: 2 additions & 2 deletions be/src/vec/functions/function_search.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ class FunctionSearch : public IFunction {
// Map clause_type string to InvertedIndexQueryType
InvertedIndexQueryType clause_type_to_query_type(const std::string& clause_type) const;

Status build_query_recursive(const FunctionSearch& function, const TSearchClause& clause,
Status build_query_recursive(const TSearchClause& clause,
const std::shared_ptr<IndexQueryContext>& context,
FieldReaderResolver& resolver,
inverted_index::query_v2::QueryPtr* out,
std::string* binding_key) const;

Status build_leaf_query(const FunctionSearch& function, const TSearchClause& clause,
Status build_leaf_query(const TSearchClause& clause,
const std::shared_ptr<IndexQueryContext>& context,
FieldReaderResolver& resolver, inverted_index::query_v2::QueryPtr* out,
std::string* binding_key) const;
Expand Down
Loading