Merge pull request #29378 from vespa-engine/toregge/hide-predicate-query-term-definition

Hide PredicateQueryTerm definition.

2 files changed, 12 insertions, 3 deletions

diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
index d1a2c26a75d..a25766fcc71 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "stackdumpiterator.h"
+#include <vespa/searchlib/query/tree/predicate_query_term.h>
 #include <vespa/vespalib/util/compress.h>
 #include <vespa/vespalib/objects/nbo.h>
 
@@ -274,4 +275,10 @@ SimpleQueryStackDumpIterator::readFuzzy(const char *&p) {
     return true;
 }
 
+std::unique_ptr<query::PredicateQueryTerm>
+SimpleQueryStackDumpIterator::getPredicateQueryTerm()
+{
+    return std::move(_predicate_query_term);
+}
+
 }
diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
index dece4ecc0b6..7a6b3359223 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
@@ -3,8 +3,10 @@
 #pragma once
 
 #include "parse.h"
-#include <vespa/searchlib/query/tree/predicate_query_term.h>
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
+
+namespace search::query { class PredicateQueryTerm; }
 
 namespace search {
 /**
@@ -45,7 +47,7 @@ private:
     double   _extraDoubleArg4;
     double   _extraDoubleArg5;
     /** The predicate query specification */
-    query::PredicateQueryTerm::UP _predicate_query_term;
+    std::unique_ptr<query::PredicateQueryTerm> _predicate_query_term;
 
     VESPA_DLL_LOCAL vespalib::stringref read_stringref(const char *&p);
     VESPA_DLL_LOCAL uint64_t readCompressedPositiveInt(const char *&p);
@@ -118,7 +120,7 @@ public:
     uint32_t getFuzzyMaxEditDistance() const { return _extraIntArg1; }
     uint32_t getFuzzyPrefixLength() const { return _extraIntArg2; }
 
-    query::PredicateQueryTerm::UP getPredicateQueryTerm() { return std::move(_predicate_query_term); }
+    std::unique_ptr<query::PredicateQueryTerm> getPredicateQueryTerm();
 
     vespalib::stringref getIndexName() const { return _curr_index_name; }
     vespalib::stringref getTerm() const { return _curr_term; }