diff options
11 files changed, 36 insertions, 34 deletions
diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt index d5a0b2a14ae..4af337dcb67 100644 --- a/eval/CMakeLists.txt +++ b/eval/CMakeLists.txt @@ -18,6 +18,7 @@ vespa_define_module( src/tests/eval/compile_cache src/tests/eval/compiled_function src/tests/eval/fast_value + src/tests/eval/feature_name_extractor src/tests/eval/function src/tests/eval/function_speed src/tests/eval/gbdt diff --git a/searchlib/src/tests/rankingexpression/feature_name_extractor/.gitignore b/eval/src/tests/eval/feature_name_extractor/.gitignore index 88c86c1720e..88c86c1720e 100644 --- a/searchlib/src/tests/rankingexpression/feature_name_extractor/.gitignore +++ b/eval/src/tests/eval/feature_name_extractor/.gitignore diff --git a/eval/src/tests/eval/feature_name_extractor/CMakeLists.txt b/eval/src/tests/eval/feature_name_extractor/CMakeLists.txt new file mode 100644 index 00000000000..7126060e974 --- /dev/null +++ b/eval/src/tests/eval/feature_name_extractor/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(eval_name_extractor_test_app TEST + SOURCES + feature_name_extractor_test.cpp + DEPENDS + vespaeval +) +vespa_add_test(NAME eval_name_extractor_test_app COMMAND eval_name_extractor_test_app) diff --git a/searchlib/src/tests/rankingexpression/feature_name_extractor/feature_name_extractor_test.cpp b/eval/src/tests/eval/feature_name_extractor/feature_name_extractor_test.cpp index 7b3683f75d5..3acf1ee2142 100644 --- a/searchlib/src/tests/rankingexpression/feature_name_extractor/feature_name_extractor_test.cpp +++ b/eval/src/tests/eval/feature_name_extractor/feature_name_extractor_test.cpp @@ -1,8 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/searchlib/features/rankingexpression/feature_name_extractor.h> +#include <vespa/eval/eval/feature_name_extractor.h> -using search::features::rankingexpression::FeatureNameExtractor; +using vespalib::eval::FeatureNameExtractor; void verify_extract(const vespalib::string &input, const vespalib::string &expect_symbol, diff --git a/eval/src/vespa/eval/eval/CMakeLists.txt b/eval/src/vespa/eval/eval/CMakeLists.txt index 639ac3b5864..8271c7a4bed 100644 --- a/eval/src/vespa/eval/eval/CMakeLists.txt +++ b/eval/src/vespa/eval/eval/CMakeLists.txt @@ -13,6 +13,7 @@ vespa_add_library(eval_eval OBJECT fast_addr_map.cpp fast_forest.cpp fast_value.cpp + feature_name_extractor.cpp function.cpp gbdt.cpp int8float.cpp diff --git a/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.cpp b/eval/src/vespa/eval/eval/feature_name_extractor.cpp index 1987f476780..f613d026d03 100644 --- a/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.cpp +++ b/eval/src/vespa/eval/eval/feature_name_extractor.cpp @@ -2,9 +2,7 @@ #include "feature_name_extractor.h" -namespace search { -namespace features { -namespace rankingexpression { +namespace vespalib::eval { namespace { @@ -81,6 +79,4 @@ FeatureNameExtractor::extract_symbol(const char *pos_in, const char *end_in, pos_out = pos_in; } -} // namespace rankingexpression -} // namespace features -} // namespace search +} diff --git a/eval/src/vespa/eval/eval/feature_name_extractor.h b/eval/src/vespa/eval/eval/feature_name_extractor.h new file mode 100644 index 00000000000..b3a9e0567a3 --- /dev/null +++ b/eval/src/vespa/eval/eval/feature_name_extractor.h @@ -0,0 +1,18 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +#pragma once + +#include "function.h" + +namespace vespalib::eval { + +/** + * Custom symbol extractor used to extract ranking feature names when + * parsing ranking expressions. + **/ +struct FeatureNameExtractor : public vespalib::eval::SymbolExtractor { + void extract_symbol(const char *pos_in, const char *end_in, + const char *&pos_out, vespalib::string &symbol_out) const override; +}; + +} diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index ea47dddb99b..16a35a9ce9f 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -209,7 +209,6 @@ vespa_define_module( src/tests/queryeval/weak_and_scorers src/tests/queryeval/weighted_set_term src/tests/queryeval/wrappers - src/tests/rankingexpression/feature_name_extractor src/tests/rankingexpression/intrinsic_blueprint_adapter src/tests/ranksetup src/tests/ranksetup/verify_feature diff --git a/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt b/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt deleted file mode 100644 index a2e153c7527..00000000000 --- a/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_feature_name_extractor_test_app TEST - SOURCES - feature_name_extractor_test.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_feature_name_extractor_test_app COMMAND searchlib_feature_name_extractor_test_app) diff --git a/searchlib/src/vespa/searchlib/features/rankingexpression/CMakeLists.txt b/searchlib/src/vespa/searchlib/features/rankingexpression/CMakeLists.txt index 68b4c4bb043..715fbb4446e 100644 --- a/searchlib/src/vespa/searchlib/features/rankingexpression/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/features/rankingexpression/CMakeLists.txt @@ -2,7 +2,6 @@ vespa_add_library(searchlib_features_rankingexpression OBJECT SOURCES expression_replacer.cpp - feature_name_extractor.cpp intrinsic_blueprint_adapter.cpp intrinsic_expression.cpp DEPENDS diff --git a/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.h b/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.h index b7d82744953..4d59e95e7a3 100644 --- a/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.h +++ b/searchlib/src/vespa/searchlib/features/rankingexpression/feature_name_extractor.h @@ -2,22 +2,10 @@ #pragma once -#include <vespa/eval/eval/function.h> +#include <vespa/eval/eval/feature_name_extractor.h> -namespace search { -namespace features { -namespace rankingexpression { +namespace search::features::rankingexpression { -/** - * Custom symbol extractor used to extract ranking feature names when - * parsing ranking expressions. - **/ -struct FeatureNameExtractor : public vespalib::eval::SymbolExtractor { - void extract_symbol(const char *pos_in, const char *end_in, - const char *&pos_out, vespalib::string &symbol_out) const override; -}; - -} // namespace rankingexpression -} // namespace features -} // namespace search +using FeatureNameExtractor = vespalib::eval::FeatureNameExtractor; +} |