Merge pull request #4126 from vespa-engine/vekterli/move-to-flex-bison-parsing-for-document-selection-rebased

Use new C++ document selection parser

3 files changed, 6 insertions, 6 deletions

diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
index a7418629f81..16d317551e0 100644
--- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
+++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
@@ -1070,9 +1070,8 @@ TwoPhaseUpdateOperationTest::testSafePathConditionParseFailureFailsWithIllegalPa
                          "timestamp 0, timestamp of updated doc: 0) "
                          "ReturnCode(ILLEGAL_PARAMETERS, "
                                      "Failed to parse test and set condition: "
-                                     "Unexpected token at position 16 "
-                                     "('==fran...c') in query 'testdoctype1."
-                                     "san==fran...cisco',)"s,
+                                     "syntax error, unexpected . at column 24 when "
+                                     "parsing selection 'testdoctype1.san==fran...cisco')"s,
             sender.getLastReply(true));
 }
 
@@ -1096,7 +1095,8 @@ TwoPhaseUpdateOperationTest::testSafePathConditonUnknownDocTypeFailsWithIllegalP
                          "timestamp 0, timestamp of updated doc: 0) "
                          "ReturnCode(ILLEGAL_PARAMETERS, "
                                     "Failed to parse test and set condition: "
-                                    "Document type langbein not found)"s,
+                                    "Document type 'langbein' not found at column 1 "
+                                    "when parsing selection 'langbein.headerval=1234')"s,
             sender.getLastReply(true));
 }
 
diff --git a/storage/src/tests/distributor/visitoroperationtest.cpp b/storage/src/tests/distributor/visitoroperationtest.cpp
index 26f4fb3e784..972ccf41bfe 100644
--- a/storage/src/tests/distributor/visitoroperationtest.cpp
+++ b/storage/src/tests/distributor/visitoroperationtest.cpp
@@ -454,7 +454,8 @@ VisitorOperationTest::testInvalidOrderDocSelection()
     CPPUNIT_ASSERT_EQUAL(
             std::string("CreateVisitorReply(last=BucketId(0x0000000000000000)) "
                         "ReturnCode(ILLEGAL_PARAMETERS, Failed to parse document select "
-                        "string 'id.order(10,3)=1 and dummy': Document type dummy not found)"),
+                        "string 'id.order(10,3)=1 and dummy': Document type 'dummy' not "
+                        "found at column 22 when parsing selection 'id.order(10,3)=1 and dummy')"),
             runEmptyVisitor(
                     createVisitorCommand("invalidOrderDoc",
                             id,
diff --git a/storage/src/vespa/storage/persistence/fieldvisitor.h b/storage/src/vespa/storage/persistence/fieldvisitor.h
index 96b73ca779b..4b47c68e33b 100644
--- a/storage/src/vespa/storage/persistence/fieldvisitor.h
+++ b/storage/src/vespa/storage/persistence/fieldvisitor.h
@@ -42,7 +42,6 @@ public:
     void visitArithmeticValueNode(const document::select::ArithmeticValueNode &) override {}
     void visitFunctionValueNode(const document::select::FunctionValueNode &) override {}
     void visitIdValueNode(const document::select::IdValueNode &) override {}
-    void visitSearchColumnValueNode(const document::select::SearchColumnValueNode &) override {}
     void visitFloatValueNode(const document::select::FloatValueNode &) override {}
     void visitVariableValueNode(const document::select::VariableValueNode &) override {}
     void visitIntegerValueNode(const document::select::IntegerValueNode &) override {}