Skip to content

Change local used variable #853

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
lide-reed merged 1 commit into from
Apr 1, 2019
Merged

Change local used variable #853

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
5 changes: 2 additions & 3 deletions be/src/util/es_query_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ BooleanQueryBuilder::BooleanQueryBuilder(const std::vector<ExtPredicate*>& predi
}
case TExprNodeType::FUNCTION_CALL: {
ExtFunction* function_predicate = (ExtFunction *)predicate;
if ("es_query" == function_predicate->func_name ) {
if ("esquery" == function_predicate->func_name ) {
ESQueryBuilder* es_query = new ESQueryBuilder(function_predicate);
_should_clauses.push_back(es_query);
};
Expand Down Expand Up @@ -300,8 +300,7 @@ void BooleanQueryBuilder::must_not(QueryBuilder* filter) {
_must_not_clauses.push_back(filter);
}

rapidjson::Value BooleanQueryBuilder::to_query(const std::vector<EsPredicate*>& predicates) {
rapidjson::Document root;
rapidjson::Value BooleanQueryBuilder::to_query(const std::vector<EsPredicate*>& predicates, rapidjson::Document& root) {
if (predicates.size() == 0) {
MatchAllQueryBuilder match_all_query;
return match_all_query.to_json(root)
Expand Down
2 changes: 1 addition & 1 deletion be/src/util/es_query_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class BooleanQueryBuilder : public QueryBuilder {
void must(QueryBuilder* filter);
void must_not(QueryBuilder* filter);
// class method for transfer predicate to es query value, invoker should enclose this value with `query`
static rapidjson::Value to_query(const std::vector<EsPredicate*>& predicates);
static rapidjson::Value to_query(const std::vector<EsPredicate*>& predicates, rapidjson::Document& root);

private:
std::vector<QueryBuilder*> _must_clauses;
Expand Down
3 changes: 2 additions & 1 deletion be/src/util/es_scroll_query.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ std::string ESScrollQueryBuilder::build(const std::map<std::string, std::string>
rapidjson::Document::AllocatorType &allocator = es_query_dsl.GetAllocator();
es_query_dsl.SetObject();
// generate the filter caluse
rapidjson::Value query_node = BooleanQueryBuilder::to_query(predicates);
rapidjson::Document scratch_document;
rapidjson::Value query_node = BooleanQueryBuilder::to_query(predicates, scratch_document);
// note: add `query` for this value....
es_query_dsl.AddMember("query", query_node, allocator);
// just filter the selected fields for reducing the network cost
Expand Down