summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2023-11-24 10:23:03 +0100
committerTor Egge <Tor.Egge@online.no>2023-11-24 10:23:03 +0100
commit580dc0762fceb32a6c16678745b022ade9cf4146 (patch)
tree3825094440a43408e0622f656f006e3463aff68f /searchcore
parent7e1fc00d718e3c80f837d50da4e48cadf146987c (diff)
Add InTerm to backend.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/matching/query_test.cpp2
-rw-r--r--searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/unpacking_iterators_optimizer_test.cpp1
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp1
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/querynodes.h2
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/same_element_builder.cpp1
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp1
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp1
-rw-r--r--searchcore/src/vespa/searchcorespi/index/indexcollection.cpp1
8 files changed, 10 insertions, 0 deletions
diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp
index 0b87734cec2..cb24d8bc407 100644
--- a/searchcore/src/tests/proton/matching/query_test.cpp
+++ b/searchcore/src/tests/proton/matching/query_test.cpp
@@ -289,6 +289,7 @@ public:
void visit(ProtonPredicateQuery &) override {}
void visit(ProtonRegExpTerm &) override {}
void visit(ProtonNearestNeighborTerm &) override {}
+ void visit(ProtonInTerm&) override {}
};
void Test::requireThatTermsAreLookedUp() {
@@ -441,6 +442,7 @@ public:
void visit(ProtonRegExpTerm &) override {}
void visit(ProtonNearestNeighborTerm &) override {}
void visit(ProtonFuzzyTerm &) override {}
+ void visit(ProtonInTerm&) override { }
};
void Test::requireThatTermDataIsFilledIn() {
diff --git a/searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/unpacking_iterators_optimizer_test.cpp b/searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/unpacking_iterators_optimizer_test.cpp
index 2e1a28402a1..5e576ba9487 100644
--- a/searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/unpacking_iterators_optimizer_test.cpp
+++ b/searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/unpacking_iterators_optimizer_test.cpp
@@ -70,6 +70,7 @@ struct DumpQuery : QueryVisitor {
void visit(TrueQueryNode &) override {}
void visit(FalseQueryNode &) override {}
void visit(FuzzyTerm &) override {}
+ void visit(InTerm&) override {}
};
std::string dump_query(Node &root) {
diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
index cbdf5890094..092fbd85d56 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
@@ -171,6 +171,7 @@ protected:
_result = std::make_unique<EmptyBlueprint>();
}
void visit(ProtonFuzzyTerm &n) override { buildTerm(n); }
+ void visit(ProtonInTerm& n) override { buildTerm(n); }
public:
BlueprintBuilderVisitor(const IRequestContext & requestContext, ISearchContext &context) :
diff --git a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
index 93111d857ab..41290555997 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
@@ -149,6 +149,7 @@ using ProtonWandTerm = ProtonTerm<search::query::WandTerm>;
using ProtonPredicateQuery = ProtonTerm<search::query::PredicateQuery>;
using ProtonRegExpTerm = ProtonTerm<search::query::RegExpTerm>;
using ProtonFuzzyTerm = ProtonTerm<search::query::FuzzyTerm>;
+using ProtonInTerm = ProtonTerm<search::query::InTerm>;
struct ProtonNodeTypes {
using And = ProtonAnd;
@@ -177,6 +178,7 @@ struct ProtonNodeTypes {
using TrueQueryNode = ProtonTrue;
using FalseQueryNode = ProtonFalse;
using FuzzyTerm = ProtonFuzzyTerm;
+ using InTerm = ProtonInTerm;
};
}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/same_element_builder.cpp b/searchcore/src/vespa/searchcore/proton/matching/same_element_builder.cpp
index c0426cc85a3..af309bc2f76 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/same_element_builder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/same_element_builder.cpp
@@ -70,6 +70,7 @@ public:
void visit(ProtonTrue &) override {}
void visit(ProtonFalse &) override {}
void visit(ProtonFuzzyTerm &n) override { visitTerm(n); }
+ void visit(ProtonInTerm&) override { }
};
} // namespace proton::matching::<unnamed>
diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
index 00835d64c4e..f6b8f74f5c7 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp
@@ -46,6 +46,7 @@ struct TermDataFromTermVisitor
void visit(ProtonRegExpTerm &n) override { visitTerm(n); }
void visit(ProtonNearestNeighborTerm &n) override { visitTerm(n); }
void visit(ProtonFuzzyTerm &n) override { visitTerm(n); }
+ void visit(ProtonInTerm& n) override { visitTerm(n); }
};
} // namespace
diff --git a/searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp b/searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp
index c9cfbbfd40e..712d3d20a00 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/unpacking_iterators_optimizer.cpp
@@ -62,6 +62,7 @@ struct TermExpander : QueryVisitor {
void visit(TrueQueryNode &) override {}
void visit(FalseQueryNode &) override {}
void visit(FuzzyTerm &) override {}
+ void visit(InTerm&) override {}
void flush(Intermediate &parent) {
for (Node::UP &term: terms) {
diff --git a/searchcore/src/vespa/searchcorespi/index/indexcollection.cpp b/searchcore/src/vespa/searchcorespi/index/indexcollection.cpp
index 77771032f1c..e6cc618ead7 100644
--- a/searchcore/src/vespa/searchcorespi/index/indexcollection.cpp
+++ b/searchcore/src/vespa/searchcorespi/index/indexcollection.cpp
@@ -206,6 +206,7 @@ private:
void visit(RegExpTerm &n) override { visitTerm(n); }
void visit(NearestNeighborTerm &n) override { visitTerm(n); }
void visit(FuzzyTerm &n) override { visitTerm(n); }
+ void visit(InTerm& n) override { visitTerm(n); }
public:
CreateBlueprintVisitor(const IIndexCollection &indexes,