summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorReply.datbin65 -> 65 bytes
-rw-r--r--searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp11
-rw-r--r--searchlib/src/tests/features/prod_features.cpp8
3 files changed, 16 insertions, 3 deletions
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorReply.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorReply.dat
index e13917227d1..493fa3291c5 100644
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorReply.dat
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorReply.dat
Binary files differ
diff --git a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
index 802d175b5af..6f4420695c4 100644
--- a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
+++ b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
@@ -270,6 +270,7 @@ struct SimpleSetup : Setup {
index("list", DataType::STRING, CollectionType::ARRAY);
index("keywords", DataType::STRING, CollectionType::WEIGHTEDSET);
attribute("date", DataType::INT32, CollectionType::SINGLE);
+ attribute("pos_zcurve", DataType::INT64, CollectionType::SINGLE);
attribute("imported_attr", DataType::INT32, CollectionType::SINGLE, true);
constants["my_tensor"] = "tensor(x{},y{})";
}
@@ -493,6 +494,16 @@ TEST_F("require that query tensor default value expression does not need paramet
//-----------------------------------------------------------------------------
+TEST_F("require that zcurve distance can be set up", SimpleSetup()) {
+ f.verify_valid({"distance(pos)"});
+}
+
+TEST_F("require that zcurve distance must be backed by an attribute", SimpleSetup()) {
+ f.verify_invalid({"distance(unknown)"});
+}
+
+//-----------------------------------------------------------------------------
+
TEST_F("cleanup files", Setup()) {
ASSERT_TRUE(vespalib::Process::run(fmt("rm -rf %s", gen_dir.c_str())));
}
diff --git a/searchlib/src/tests/features/prod_features.cpp b/searchlib/src/tests/features/prod_features.cpp
index ecb1d7be137..f146abe5556 100644
--- a/searchlib/src/tests/features/prod_features.cpp
+++ b/searchlib/src/tests/features/prod_features.cpp
@@ -891,10 +891,12 @@ Test::testDistance()
StringList params, in, out;
FT_SETUP_FAIL(pt, params);
- /*
- FT_SETUP_OK(pt, params.add("pos"), in,
+ FtIndexEnvironment idx_env;
+ idx_env
+ .getBuilder()
+ .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, DataType::INT64, "pos");
+ FT_SETUP_OK(pt, idx_env, params.add("pos"), in,
out.add("out").add("index").add("latitude").add("longitude").add("km"));
- */
FT_DUMP_EMPTY(_factory, "distance");
}