diff options
author | Tor Egge <Tor.Egge@yahooinc.com> | 2023-07-18 13:18:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-18 13:18:50 +0200 |
commit | 06b3744b44d2a2d4fbe18f9121af2a0c57fd9683 (patch) | |
tree | ef698f296371e5416b286804b6ebf54ac7b3ae18 /searchcore | |
parent | 4a40184527c637904cbb898aa288fc10c6eead73 (diff) | |
parent | b75d5f4f9e7a4418b956548cdbe850849ee76470 (diff) |
Merge pull request #27765 from vespa-engine/balder/refactor-query-building-1
Balder/refactor query building 1
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/query.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.cpp b/searchcore/src/vespa/searchcore/proton/matching/query.cpp index b7e3f32a6f6..d0738f1857f 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/query.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/query.cpp @@ -15,10 +15,10 @@ #include <vespa/searchlib/queryeval/intermediate_blueprints.h> #include <vespa/vespalib/util/issue.h> #include <vespa/vespalib/util/thread_bundle.h> +#include <vespa/searchlib/query/tree/querytreecreator.h> #include <vespa/log/log.h> LOG_SETUP(".proton.matching.query"); -#include <vespa/searchlib/query/tree/querytreecreator.h> using document::PositionDataType; using search::SimpleQueryStackDumpIterator; diff --git a/searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp b/searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp index d8545f1263c..48c656984b0 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp @@ -2,15 +2,15 @@ #include "unpacking_iterators_optimizer.h" -#include <vespa/log/log.h> -LOG_SETUP(".matching.unpacking_iterators_optimizer"); - #include "querynodes.h" #include <vespa/vespalib/util/classname.h> #include <vespa/searchlib/query/tree/queryvisitor.h> #include <vespa/searchlib/query/tree/templatetermvisitor.h> #include <vespa/searchlib/query/tree/querytreecreator.h> +#include <vespa/log/log.h> +LOG_SETUP(".matching.unpacking_iterators_optimizer"); + using namespace search::query; namespace proton::matching { |