Add testing of multiterm and allow mixing and matching of string vs integer.

2 files changed, 79 insertions, 9 deletions

diff --git a/searchlib/src/tests/query/querybuilder_test.cpp b/searchlib/src/tests/query/querybuilder_test.cpp
index 67b45d43406..47dccc76603 100644
--- a/searchlib/src/tests/query/querybuilder_test.cpp
+++ b/searchlib/src/tests/query/querybuilder_test.cpp
@@ -642,6 +642,77 @@ TEST("test query parsing error") {
     EXPECT_FALSE(new_node);
 }
 
+class SimpleMultiTerm : public MultiTerm {
+public:
+    SimpleMultiTerm(size_t numTerms) : MultiTerm(numTerms) {}
+    void accept(QueryVisitor & ) override { }
+};
+
+TEST("initial state of MultiTerm") {
+    SimpleMultiTerm mt(7);
+    EXPECT_EQUAL(7u, mt.getNumTerms());
+    EXPECT_TRUE(MultiTerm::Type::UNKNOWN == mt.getType());
+}
+
+void
+verify_multiterm_get(const MultiTerm & mt) {
+    EXPECT_EQUAL(7u, mt.getNumTerms());
+    for (int64_t i(0); i < mt.getNumTerms(); i++) {
+        auto v = mt.getAsInteger(i);
+        EXPECT_EQUAL(v.first, i-3);
+        EXPECT_EQUAL(v.second.percent(), i-4);
+    }
+    for (int64_t i(0); i < mt.getNumTerms(); i++) {
+        auto v = mt.getAsString(i);
+        char buf[24];
+        auto res = std::to_chars(buf, buf + sizeof(buf), i-3);
+        EXPECT_EQUAL(v.first, vespalib::stringref(buf, res.ptr - buf));
+        EXPECT_EQUAL(v.second.percent(), i-4);
+    }
+}
+
+TEST("add and get of integer MultiTerm") {
+    SimpleMultiTerm mt(7);
+    for (int64_t i(0); i < mt.getNumTerms(); i++) {
+        mt.addTerm(i-3, Weight(i-4));
+    }
+    EXPECT_TRUE(MultiTerm::Type::INTEGER == mt.getType());
+    verify_multiterm_get(mt);
+}
+
+TEST("add and get of string MultiTerm") {
+    SimpleMultiTerm mt(7);
+    for (int64_t i(0); i < mt.getNumTerms(); i++) {
+        char buf[24];
+        auto res = std::to_chars(buf, buf + sizeof(buf), i-3);
+        mt.addTerm(vespalib::stringref(buf, res.ptr - buf), Weight(i-4));
+    }
+    EXPECT_TRUE(MultiTerm::Type::STRING == mt.getType());
+    verify_multiterm_get(mt);
+}
+
+TEST("first string then integer MultiTerm") {
+    SimpleMultiTerm mt(7);
+    mt.addTerm("-3", Weight(-4));
+    for (int64_t i(1); i < mt.getNumTerms(); i++) {
+        mt.addTerm(i-3, Weight(i-4));
+    }
+    EXPECT_TRUE(MultiTerm::Type::STRING == mt.getType());
+    verify_multiterm_get(mt);
+}
+
+TEST("first integer then string MultiTerm") {
+    SimpleMultiTerm mt(7);
+    mt.addTerm(-3, Weight(-4));
+    for (int64_t i(1); i < mt.getNumTerms(); i++) {
+        char buf[24];
+        auto res = std::to_chars(buf, buf + sizeof(buf), i-3);
+        mt.addTerm(vespalib::stringref(buf, res.ptr - buf), Weight(i-4));
+    }
+    EXPECT_TRUE(MultiTerm::Type::INTEGER == mt.getType());
+    verify_multiterm_get(mt);
+}
+
 }  // namespace
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/vespa/searchlib/query/tree/termnodes.cpp b/searchlib/src/vespa/searchlib/query/tree/termnodes.cpp
index a15938d4ca0..4caf3c2ff89 100644
--- a/searchlib/src/vespa/searchlib/query/tree/termnodes.cpp
+++ b/searchlib/src/vespa/searchlib/query/tree/termnodes.cpp
@@ -27,19 +27,16 @@ WandTerm::~WandTerm() = default;
 
 namespace {
 
-void badType(const char *expected, const char *got) __attribute__((noinline));
-void badType(const char *expected, const char *got) {
-    throw IllegalArgumentException(fmt("Expected '%s' type, got '%s'", expected, got), VESPA_STRLOC);
-}
-
 class StringTermVector final : public MultiTerm::TermVector {
 public:
     StringTermVector(uint32_t sz) : _terms() { _terms.reserve(sz); }
     void addTerm(stringref term, Weight weight) override {
         _terms.emplace_back(term, weight);
     }
-    void addTerm(int64_t, Weight) override {
-        badType("string", "int64_t");
+    void addTerm(int64_t value, Weight weight) override {
+        char buf[24];
+        auto res = std::to_chars(buf, buf + sizeof(buf), value, 10);
+        addTerm(stringref(buf, res.ptr - buf), weight);
     }
     StringAndWeight getAsString(uint32_t index) const override {
         const auto & v = _terms[index];
@@ -61,8 +58,10 @@ private:
 class IntegerTermVector final : public MultiTerm::TermVector {
 public:
     IntegerTermVector(uint32_t sz) : _terms() { _terms.reserve(sz); }
-    void addTerm(stringref, Weight) override {
-        badType("int64_t", "string");
+    void addTerm(stringref valueS, Weight weight) override {
+        int64_t value;
+        std::from_chars(valueS.data(), valueS.data() + valueS.size(), value);
+        addTerm(value, weight);
     }
     void addTerm(int64_t term, Weight weight) override {
         _terms.emplace_back(term, weight);