Merge branch 'master' into balder/milliseconds-in-config-rebased-1

3 files changed, 91 insertions, 3 deletions

diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp
index a80b08badf8..cc6d964219d 100644
--- a/searchcore/src/tests/proton/matching/query_test.cpp
+++ b/searchcore/src/tests/proton/matching/query_test.cpp
@@ -191,8 +191,7 @@ Node::UP buildQueryTree(const ViewResolver &resolver,
     query_builder.addNumberTerm(int_term, field, 1, Weight(0));
     query_builder.addPrefixTerm(prefix_term, field, 2, Weight(0));
     query_builder.addRangeTerm(range_term, field, 3, Weight(0));
-    query_builder.addStringTerm(string_term, field, string_id, string_weight)
-        .setTermIndex(term_index);
+    query_builder.addStringTerm(string_term, field, string_id, string_weight);
     query_builder.addSubstringTerm(substring_term, field, 5, Weight(0));
     query_builder.addSuffixTerm(suffix_term, field, 6, Weight(0));
     query_builder.addPhrase(2, field, 7, Weight(0));
@@ -402,7 +401,6 @@ public:
         EXPECT_EQUAL(string_weight.percent(),
                    term_data.getWeight().percent());
         EXPECT_EQUAL(1u, term_data.getPhraseLength());
-        EXPECT_EQUAL(-1u, term_data.getTermIndex());
         EXPECT_EQUAL(string_id, term_data.getUniqueId());
         EXPECT_EQUAL(term_data.numFields(), n.numFields());
         for (size_t i = 0; i < term_data.numFields(); ++i) {
diff --git a/searchcore/src/tests/proton/matching/request_context/CMakeLists.txt b/searchcore/src/tests/proton/matching/request_context/CMakeLists.txt
new file mode 100644
index 00000000000..54696112302
--- /dev/null
+++ b/searchcore/src/tests/proton/matching/request_context/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchcore_matching_request_context_test_app TEST
+    SOURCES
+    request_context_test.cpp
+    DEPENDS
+    searchcore_matching
+    gtest
+)
+vespa_add_test(NAME searchcore_matching_request_context_test_app COMMAND searchcore_matching_request_context_test_app)
diff --git a/searchcore/src/tests/proton/matching/request_context/request_context_test.cpp b/searchcore/src/tests/proton/matching/request_context/request_context_test.cpp
new file mode 100644
index 00000000000..be70bacb4b1
--- /dev/null
+++ b/searchcore/src/tests/proton/matching/request_context/request_context_test.cpp
@@ -0,0 +1,81 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/eval/eval/tensor_spec.h>
+#include <vespa/eval/tensor/default_tensor_engine.h>
+#include <vespa/searchcore/proton/matching/requestcontext.h>
+#include <vespa/searchlib/fef/properties.h>
+#include <vespa/vespalib/gtest/gtest.h>
+#include <vespa/vespalib/objects/nbostream.h>
+
+using search::attribute::IAttributeContext;
+using search::attribute::IAttributeFunctor;
+using search::attribute::IAttributeVector;
+using search::fef::Properties;
+using vespalib::eval::TensorSpec;
+using vespalib::eval::Value;
+using vespalib::tensor::DefaultTensorEngine;
+using namespace proton;
+
+class MyAttributeContext : public search::attribute::IAttributeContext {
+public:
+    const IAttributeVector* getAttribute(const vespalib::string&) const override { abort(); }
+    const IAttributeVector* getAttributeStableEnum(const vespalib::string&) const override { abort(); }
+    void getAttributeList(std::vector<const IAttributeVector*>&) const override { abort(); }
+    void asyncForAttribute(const vespalib::string&, std::unique_ptr<IAttributeFunctor>) const override { abort(); }
+};
+
+class RequestContextTest : public ::testing::Test {
+private:
+    vespalib::Clock _clock;
+    vespalib::Doom _doom;
+    MyAttributeContext _attr_ctx;
+    Properties _props;
+    RequestContext _request_ctx;
+    Value::UP _query_tensor;
+
+    void insert_tensor_in_properties(const vespalib::string& tensor_name, const Value& tensor_value) {
+        vespalib::nbostream stream;
+        DefaultTensorEngine::ref().encode(tensor_value, stream);
+        _props.add(tensor_name, vespalib::stringref(stream.c_str(), stream.size()));
+    }
+
+public:
+    RequestContextTest()
+        : _clock(),
+          _doom(_clock, fastos::SteadyTimeStamp()),
+          _attr_ctx(),
+          _props(),
+          _request_ctx(_doom, _attr_ctx, _props),
+          _query_tensor(DefaultTensorEngine::ref().from_spec(TensorSpec("tensor(x[2])")
+                                                                     .add({{"x", 0}}, 3).add({{"x", 1}}, 5)))
+    {
+        insert_tensor_in_properties("my_tensor", *_query_tensor);
+        _props.add("my_string", "foo bar");
+    }
+    TensorSpec expected_query_tensor() const { return DefaultTensorEngine::ref().to_spec(*_query_tensor); }
+    Value::UP get_query_tensor(const vespalib::string& tensor_name) const {
+        return _request_ctx.get_query_tensor(tensor_name);
+    }
+};
+
+TEST_F(RequestContextTest, query_tensor_can_be_retrieved)
+{
+    auto tensor = get_query_tensor("my_tensor");
+    ASSERT_TRUE(tensor);
+    EXPECT_TRUE(tensor->is_tensor());
+    EXPECT_EQ(expected_query_tensor(), DefaultTensorEngine::ref().to_spec(*tensor));
+}
+
+TEST_F(RequestContextTest, non_existing_query_tensor_returns_nullptr)
+{
+    auto tensor = get_query_tensor("non_existing");
+    EXPECT_FALSE(tensor);
+}
+
+TEST_F(RequestContextTest, rank_property_of_non_tensor_type_returns_nullptr)
+{
+    auto tensor = get_query_tensor("my_string");
+    EXPECT_FALSE(tensor);
+}
+
+GTEST_MAIN_RUN_ALL_TESTS()