summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-07-12 08:54:33 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2023-07-13 09:17:32 +0000
commit12a961c14bf256cd07d75e3dd1adf408b972e07b (patch)
tree92476781679114e294372d4b978cb6c715fea25a /searchcore
parent66161a01d7bdf35b3a8c108b165ec041927740a0 (diff)
Separate out non templated code, and avoid magic pre include LOG_SETUP.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/query.cpp2
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp6
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 {