Avoid bad flattening in streaming search.

4 files changed, 4 insertions, 4 deletions

diff --git a/searchlib/src/vespa/searchlib/query/streaming/near_query_node.h b/searchlib/src/vespa/searchlib/query/streaming/near_query_node.h
index b49d17ff936..9258c3efe27 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/near_query_node.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/near_query_node.h
@@ -21,7 +21,7 @@ public:
     void distance(size_t dist)       { _distance = dist; }
     size_t distance()          const { return _distance; }
     void visitMembers(vespalib::ObjectVisitor &visitor) const override;
-    bool isFlattenable(ParseItem::ItemType type) const override { return type == ParseItem::ITEM_NOT; }
+    bool isFlattenable(ParseItem::ItemType) const override { return false; }
 private:
     size_t _distance;
 };
diff --git a/searchlib/src/vespa/searchlib/query/streaming/phrase_query_node.h b/searchlib/src/vespa/searchlib/query/streaming/phrase_query_node.h
index f28684ffeb4..09475178da5 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/phrase_query_node.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/phrase_query_node.h
@@ -20,7 +20,7 @@ public:
     void getPhrases(ConstQueryNodeRefList & tl) const override;
     const QueryTerm::FieldInfo & getFieldInfo(size_t fid) const { return _fieldInfo[fid]; }
     size_t getFieldInfoSize() const { return _fieldInfo.size(); }
-    bool isFlattenable(ParseItem::ItemType type) const override { return type == ParseItem::ITEM_NOT; }
+    bool isFlattenable(ParseItem::ItemType) const override { return false; }
     void addChild(QueryNode::UP child) override;
 private:
     mutable std::vector<QueryTerm::FieldInfo> _fieldInfo;
diff --git a/searchlib/src/vespa/searchlib/query/streaming/query.h b/searchlib/src/vespa/searchlib/query/streaming/query.h
index 4ab33a01d86..5296d3a4f69 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/query.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/query.h
@@ -76,7 +76,7 @@ class AndNotQueryNode : public QueryConnector
 public:
     AndNotQueryNode() noexcept : QueryConnector("ANDNOT") { }
     bool evaluate() const override;
-    bool isFlattenable(ParseItem::ItemType type) const override { return type == ParseItem::ITEM_NOT; }
+    bool isFlattenable(ParseItem::ItemType) const override { return false; }
 };
 
 /**
diff --git a/searchlib/src/vespa/searchlib/query/streaming/same_element_query_node.h b/searchlib/src/vespa/searchlib/query/streaming/same_element_query_node.h
index 50a479eda94..8e675feb569 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/same_element_query_node.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/same_element_query_node.h
@@ -15,7 +15,7 @@ public:
     SameElementQueryNode() noexcept : AndQueryNode("SAME_ELEMENT") { }
     bool evaluate() const override;
     const HitList & evaluateHits(HitList & hl) const override;
-    bool isFlattenable(ParseItem::ItemType type) const override { return type == ParseItem::ITEM_NOT; }
+    bool isFlattenable(ParseItem::ItemType) const override { return false; }
     void addChild(QueryNode::UP child) override;
 };