Remove termlikeness and expect fully qualified names for children from the qrs.

6 files changed, 23 insertions, 23 deletions

diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp
index c002beb11d9..9434e8c61b4 100644
--- a/searchcore/src/tests/proton/matching/query_test.cpp
+++ b/searchcore/src/tests/proton/matching/query_test.cpp
@@ -235,7 +235,6 @@ public:
     void visit(ProtonSubstringTerm &n) override { checkNode(n, 0, true); }
     void visit(ProtonSuffixTerm &n) override { checkNode(n, 2, false); }
     void visit(ProtonPhrase &n) override { checkNode(n, 0, true); }
-    void visit(ProtonSameElement &n) override { checkNode(n, 0, true); }
     void visit(ProtonWeightedSetTerm &) override {}
     void visit(ProtonDotProduct &) override {}
     void visit(ProtonWandTerm &) override {}
@@ -383,7 +382,6 @@ public:
 
     void visit(ProtonSubstringTerm &) override {}
     void visit(ProtonSuffixTerm &) override {}
-    void visit(ProtonSameElement &) override {}
     void visit(ProtonPhrase &n) override {
         const ITermData &term_data = n;
         EXPECT_EQUAL(2u, term_data.getPhraseLength());
diff --git a/searchcore/src/tests/proton/matching/querynodes_test.cpp b/searchcore/src/tests/proton/matching/querynodes_test.cpp
index a12aa797947..7b6fdd1ae88 100644
--- a/searchcore/src/tests/proton/matching/querynodes_test.cpp
+++ b/searchcore/src/tests/proton/matching/querynodes_test.cpp
@@ -208,7 +208,7 @@ public:
 
 typedef QueryBuilder<ProtonNodeTypes> QB;
 struct Phrase { void addToBuilder(QB& b) { b.addPhrase(2, view, id, weight); }};
-struct SameElement { void addToBuilder(QB& b) { b.addSameElement(2, view, id, weight); }};
+struct SameElement { void addToBuilder(QB& b) { b.addSameElement(2, view); }};
 struct Near   { void addToBuilder(QB& b) { b.addNear(2, distance); } };
 struct ONear  { void addToBuilder(QB& b) { b.addONear(2, distance); } };
 struct Or     { void addToBuilder(QB& b) { b.addOr(2); } };
diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
index 09d2f28b1f0..165fc67179a 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
@@ -123,21 +123,22 @@ private:
     }
 
 protected:
-    void visit(ProtonAnd &n)     override { buildIntermediate(new AndBlueprint(), n); }
-    void visit(ProtonAndNot &n)  override { buildIntermediate(new AndNotBlueprint(), n); }
-    void visit(ProtonOr &n)      override { buildIntermediate(new OrBlueprint(), n); }
-    void visit(ProtonWeakAnd &n) override { buildWeakAnd(n); }
-    void visit(ProtonEquiv &n)   override { buildEquiv(n); }
-    void visit(ProtonRank &n)    override { buildIntermediate(new RankBlueprint(), n); }
-    void visit(ProtonNear &n)    override { buildIntermediate(new NearBlueprint(n.getDistance()), n); }
-    void visit(ProtonONear &n)   override { buildIntermediate(new ONearBlueprint(n.getDistance()), n); }
+    void visit(ProtonAnd &n)         override { buildIntermediate(new AndBlueprint(), n); }
+    void visit(ProtonAndNot &n)      override { buildIntermediate(new AndNotBlueprint(), n); }
+    void visit(ProtonOr &n)          override { buildIntermediate(new OrBlueprint(), n); }
+    void visit(ProtonWeakAnd &n)     override { buildWeakAnd(n); }
+    void visit(ProtonEquiv &n)       override { buildEquiv(n); }
+    void visit(ProtonRank &n)        override { buildIntermediate(new RankBlueprint(), n); }
+    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 { buildIntermediate(nullptr /*new SameElementBlueprint())*/, n); }
+
 
     void visit(ProtonWeightedSetTerm &n) override { buildTerm(n); }
     void visit(ProtonDotProduct &n)      override { buildTerm(n); }
     void visit(ProtonWandTerm &n)        override { buildTerm(n); }
 
     void visit(ProtonPhrase &n)          override { buildTerm(n); }
-    void visit(ProtonSameElement &n)     override { buildTerm(n); }
     void visit(ProtonNumberTerm &n)      override { buildTerm(n); }
     void visit(ProtonLocationTerm &n)    override { buildTerm(n); }
     void visit(ProtonPrefixTerm &n)      override { buildTerm(n); }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.cpp b/searchcore/src/vespa/searchcore/proton/matching/query.cpp
index 9181205bb19..8896e4d35c8 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/query.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/query.cpp
@@ -78,8 +78,8 @@ void AddLocationNode(const string &location_str, Node::UP &query_tree, Location
 }
 }  // namespace
 
-Query::Query() {}
-Query::~Query() {}
+Query::Query() = default;
+Query::~Query() = default;
 
 bool
 Query::buildTree(const vespalib::stringref &stack, const string &location,
diff --git a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
index 0bec68bd27d..986c5d2dde9 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
@@ -104,13 +104,15 @@ struct ProtonTerm : public ProtonTermBase<Base> {
     ~ProtonTerm() {}
 };
 
-typedef search::query::SimpleAnd     ProtonAnd;
-typedef search::query::SimpleAndNot  ProtonAndNot;
-typedef search::query::SimpleNear    ProtonNear;
-typedef search::query::SimpleONear   ProtonONear;
-typedef search::query::SimpleOr      ProtonOr;
-typedef search::query::SimpleRank    ProtonRank;
-typedef search::query::SimpleWeakAnd ProtonWeakAnd;
+typedef search::query::SimpleAnd         ProtonAnd;
+typedef search::query::SimpleAndNot      ProtonAndNot;
+typedef search::query::SimpleNear        ProtonNear;
+typedef search::query::SimpleONear       ProtonONear;
+typedef search::query::SimpleOr          ProtonOr;
+typedef search::query::SimpleRank        ProtonRank;
+typedef search::query::SimpleWeakAnd     ProtonWeakAnd;
+typedef search::query::SimpleSameElement ProtonSameElement;
+
 
 struct ProtonEquiv final : public ProtonTermBase<search::query::Equiv>
 {
@@ -121,7 +123,6 @@ struct ProtonEquiv final : public ProtonTermBase<search::query::Equiv>
 typedef ProtonTerm<search::query::LocationTerm>    ProtonLocationTerm;
 typedef ProtonTerm<search::query::NumberTerm>      ProtonNumberTerm;
 typedef ProtonTerm<search::query::Phrase>          ProtonPhrase;
-typedef ProtonTerm<search::query::SameElement>     ProtonSameElement;
 
 typedef ProtonTerm<search::query::PrefixTerm>      ProtonPrefixTerm;
 typedef ProtonTerm<search::query::RangeTerm>       ProtonRangeTerm;
diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
index 8980ad6a220..3fd4000bf9f 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
@@ -25,12 +25,12 @@ struct TermDataFromTermVisitor
     void visit(ProtonOr &) override {}
     void visit(ProtonRank &) override {}
     void visit(ProtonWeakAnd &) override {}
+    void visit(ProtonSameElement &) override { }
 
     void visit(ProtonWeightedSetTerm &n) override { visitTerm(n); }
     void visit(ProtonDotProduct &n) override { visitTerm(n); }
     void visit(ProtonWandTerm &n) override { visitTerm(n); }
     void visit(ProtonPhrase &n) override { visitTerm(n); }
-    void visit(ProtonSameElement &n) override { visitTerm(n); }
     void visit(ProtonEquiv &n) override { visitTerm(n); }
 
     void visit(ProtonNumberTerm &n) override { visitTerm(n); }