Push handling of NearestNeighborTerm down to AttributeBlueprintFactory.

2 files changed, 2 insertions, 8 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
index 2ec3d5b18ee..c8c5a3a427b 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
@@ -109,12 +109,6 @@ private:
         _result = builder.build();
     }
 
-    void buildNearestNeighborTerm(ProtonNearestNeighborTerm &n) {
-        (void) n;
-        // TODO (geirst): implement
-        _result = std::make_unique<EmptyBlueprint>();
-    }
-
     template <typename NodeType>
     void buildTerm(NodeType &n) {
         FieldSpecList indexFields;
@@ -149,7 +143,6 @@ protected:
     void visit(ProtonNear &n)        override { buildIntermediate(new NearBlueprint(n.getDistance()), n); }
     void visit(ProtonONear &n)       override { buildIntermediate(new ONearBlueprint(n.getDistance()), n); }
     void visit(ProtonSameElement &n) override { buildSameElement(n); }
-    void visit(ProtonNearestNeighborTerm &n) override { buildNearestNeighborTerm(n); }
 
 
     void visit(ProtonWeightedSetTerm &n) override { buildTerm(n); }
@@ -166,6 +159,7 @@ protected:
     void visit(ProtonSuffixTerm &n)      override { buildTerm(n); }
     void visit(ProtonPredicateQuery &n)  override { buildTerm(n); }
     void visit(ProtonRegExpTerm &n)      override { buildTerm(n); }
+    void visit(ProtonNearestNeighborTerm &n) override { buildTerm(n); }
 
 public:
     BlueprintBuilderVisitor(const IRequestContext & requestContext, ISearchContext &context) :
diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
index 2a87c4dc953..3184b5cc061 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
@@ -42,7 +42,7 @@ struct TermDataFromTermVisitor
     void visit(ProtonSuffixTerm &n) override { visitTerm(n); }
     void visit(ProtonPredicateQuery &) override { }
     void visit(ProtonRegExpTerm &n) override { visitTerm(n); }
-    void visit(ProtonNearestNeighborTerm &) override { }
+    void visit(ProtonNearestNeighborTerm &n) override { visitTerm(n); }
 };
 }  // namespace