Drop ranking assets repo from SearchableDocSubDB.

2 files changed, 15 insertions, 21 deletions

diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index a7d57a1f1b1..db5fb1ae294 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -153,7 +153,6 @@ struct Fixture
     vespalib::TestClock _clock;
     matching::QueryLimiter _queryLimiter;
     EmptyConstantValueFactory _constantValueFactory;
-    RankingAssetsRepo _constantValueRepo;
     vespalib::ThreadStackExecutor _summaryExecutor;
     std::shared_ptr<PendingLidTrackerBase> _pendingLidsForCommit;
     SessionManager _sessionMgr;
@@ -178,7 +177,6 @@ Fixture::Fixture()
     : _clock(),
       _queryLimiter(),
       _constantValueFactory(),
-      _constantValueRepo(_constantValueFactory),
       _summaryExecutor(8),
       _pendingLidsForCommit(std::make_shared<PendingLidTracker>()),
       _sessionMgr(100),
@@ -190,7 +188,7 @@ Fixture::Fixture()
     std::filesystem::create_directory(std::filesystem::path(BASE_DIR));
     initViewSet(_views);
     _configurer = std::make_unique<Configurer>(_views._summaryMgr, _views.searchView, _views.feedView, _queryLimiter,
-                                               _constantValueRepo, _clock.clock(), "test", 0);
+                                               _constantValueFactory, _clock.clock(), "test", 0);
 }
 Fixture::~Fixture() = default;
 
@@ -199,7 +197,8 @@ Fixture::initViewSet(ViewSet &views)
 {
     using IndexManager = proton::index::IndexManager;
     using IndexConfig = proton::index::IndexConfig;
-    auto matchers = std::make_shared<Matchers>(_clock.clock(), _queryLimiter, _constantValueRepo);
+    RankingAssetsRepo ranking_assets_repo_source(_constantValueFactory, {}, {}, {});
+    auto matchers = std::make_shared<Matchers>(_clock.clock(), _queryLimiter, ranking_assets_repo_source);
     auto indexMgr = make_shared<IndexManager>(BASE_DIR, IndexConfig(searchcorespi::index::WarmupConfig(), 2, 0), Schema(), 1,
                                               views._reconfigurer, views._service.write(), _summaryExecutor,
                                               TuneFileIndexManager(), TuneFileAttributes(), views._fileHeaderContext);
diff --git a/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp b/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp
index 3c157221e60..39b06906a91 100644
--- a/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp
+++ b/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp
@@ -39,18 +39,25 @@ public:
     }
 };
 
+namespace {
+
+std::shared_ptr<RankingConstants> make_ranking_constants() {
+    RankingConstants::Vector constants;
+    constants.emplace_back("foo", "double", "path_1");
+    constants.emplace_back("bar", "double", "path_3");
+    return std::make_shared<RankingConstants>(constants);
+}
+
+}
+
 struct Fixture {
     MyConstantValueFactory factory;
     RankingAssetsRepo repo;
     Fixture()
-        : factory(), repo(factory)
+        : factory(), repo(factory, make_ranking_constants(), {}, {})
     {
         factory.add("path_1", "double", 3);
         factory.add("path_2", "double", 5);
-        RankingConstants::Vector constants;
-        constants.emplace_back("foo", "double", "path_1");
-        constants.emplace_back("bar", "double", "path_3");
-        repo.reconfigure(std::make_shared<RankingConstants>(constants),{}, {});
     }
 };
 
@@ -69,16 +76,4 @@ TEST_F("require that non-existing constant value in factory returns bad constant
     EXPECT_TRUE(f.repo.getConstant("bar")->type().is_error());
 }
 
-TEST_F("require that reconfigure replaces existing constant values in repo", Fixture)
-{
-    RankingConstants::Vector constants;
-    constants.emplace_back("bar", "double", "path_3");
-    constants.emplace_back("baz", "double", "path_2");
-    f.repo.reconfigure(std::make_shared<RankingConstants>(constants), {}, {});
-    f.factory.add("path_3", "double", 7);
-    EXPECT_TRUE(f.repo.getConstant("foo").get() == nullptr);
-    EXPECT_EQUAL(7, f.repo.getConstant("bar")->value().as_double());
-    EXPECT_EQUAL(5, f.repo.getConstant("baz")->value().as_double());
-}
-
 TEST_MAIN() { TEST_RUN_ALL(); }