allow extracting locations as terms

4 files changed, 6 insertions, 8 deletions

diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp
index 6fbd43eabbe..01f7e25eb51 100644
--- a/searchcore/src/tests/proton/matching/query_test.cpp
+++ b/searchcore/src/tests/proton/matching/query_test.cpp
@@ -716,7 +716,7 @@ void checkQueryAddsLocation(Test &test, const string &loc_string) {
                     ViewResolver(), index_environment);
     vector<const ITermData *> term_data;
     query.extractTerms(term_data);
-    test.EXPECT_EQUAL(1u, term_data.size());
+    test.EXPECT_EQUAL(2u, term_data.size());
 
     FakeRequestContext requestContext;
     FakeSearchContext context;
diff --git a/searchcore/src/tests/proton/matching/termdataextractor_test.cpp b/searchcore/src/tests/proton/matching/termdataextractor_test.cpp
index 36c34e38a04..fb338d409e7 100644
--- a/searchcore/src/tests/proton/matching/termdataextractor_test.cpp
+++ b/searchcore/src/tests/proton/matching/termdataextractor_test.cpp
@@ -103,8 +103,8 @@ void Test::requireThatTermsAreAdded() {
 
     vector<const ITermData *> term_data;
     TermDataExtractor::extractTerms(*node, term_data);
-    EXPECT_EQUAL(7u, term_data.size());
-    for (int i = 0; i < 7; ++i) {
+    EXPECT_EQUAL(8u, term_data.size());
+    for (int i = 0; i < 8; ++i) {
         EXPECT_EQUAL(id[i], term_data[i]->getUniqueId());
         EXPECT_EQUAL(1u, term_data[i]->numFields());
     }
@@ -118,8 +118,8 @@ void Test::requireThatAViewWithTwoFieldsGivesOneTermDataPerTerm() {
 
     vector<const ITermData *> term_data;
     TermDataExtractor::extractTerms(*node, term_data);
-    EXPECT_EQUAL(7u, term_data.size());
-    for (int i = 0; i < 7; ++i) {
+    EXPECT_EQUAL(8u, term_data.size());
+    for (int i = 0; i < 8; ++i) {
         EXPECT_EQUAL(id[i], term_data[i]->getUniqueId());
         EXPECT_EQUAL(2u, term_data[i]->numFields());
     }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp
index c0007ae2bda..673355f9354 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp
@@ -29,8 +29,6 @@ public:
         }
     }
 
-    void visit(ProtonLocationTerm &) override {}
-
     virtual void visit(ProtonNodeTypes::AndNot &n) override {
         assert(n.getChildren().size() > 0);
         n.getChildren()[0]->accept(*this);
diff --git a/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.h b/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.h
index efa2e3f5bfa..633d85f98df 100644
--- a/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.h
+++ b/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.h
@@ -260,7 +260,7 @@ public:
      * This indicates if this instance is actually used for ranking or not.
      * @return true if it is not needed.
      */
-    bool  isNotNeeded() const { return ((_flags & (UNPACK_NORMAL_FEATURES_FLAG | UNPACK_INTERLEAVED_FEATURES_FLAG)) == 0u); }
+    bool isNotNeeded() const { return ((_flags & (UNPACK_NORMAL_FEATURES_FLAG | UNPACK_INTERLEAVED_FEATURES_FLAG)) == 0u); }
 
     bool needs_normal_features() const { return ((_flags & UNPACK_NORMAL_FEATURES_FLAG) != 0u); }