From e1937ead260a9094bbb77b44d4c6fa3aac7d2924 Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Fri, 3 Jul 2020 12:18:57 +0000 Subject: Remove legacy distributor bucket DB implementation and config wiring --- storage/src/tests/distributor/CMakeLists.txt | 1 - storage/src/tests/distributor/distributortest.cpp | 21 +++++++-------------- .../src/tests/distributor/distributortestutil.cpp | 3 +-- storage/src/tests/distributor/distributortestutil.h | 2 +- .../tests/distributor/maintenanceschedulertest.cpp | 1 - .../src/tests/distributor/mapbucketdatabasetest.cpp | 11 ----------- .../distributor/simplemaintenancescannertest.cpp | 4 ++-- 7 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 storage/src/tests/distributor/mapbucketdatabasetest.cpp (limited to 'storage/src/tests/distributor') diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt index 1403021a9c3..f983fb32e1c 100644 --- a/storage/src/tests/distributor/CMakeLists.txt +++ b/storage/src/tests/distributor/CMakeLists.txt @@ -22,7 +22,6 @@ vespa_add_executable(storage_distributor_gtest_runner_app TEST idealstatemanagertest.cpp joinbuckettest.cpp maintenanceschedulertest.cpp - mapbucketdatabasetest.cpp mergelimitertest.cpp mergeoperationtest.cpp nodeinfotest.cpp diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp index b110e99f8a4..0da860d0542 100644 --- a/storage/src/tests/distributor/distributortest.cpp +++ b/storage/src/tests/distributor/distributortest.cpp @@ -1072,7 +1072,7 @@ TEST_F(DistributorTest, pending_to_no_pending_global_merges_edge_immediately_sen } TEST_F(DistributorTest, stale_reads_config_is_propagated_to_external_operation_handler) { - createLinks(true); + createLinks(); setupDistributor(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); configure_stale_reads_enabled(true); @@ -1083,7 +1083,7 @@ TEST_F(DistributorTest, stale_reads_config_is_propagated_to_external_operation_h } TEST_F(DistributorTest, fast_path_on_consistent_gets_config_is_propagated_to_internal_config) { - createLinks(true); + createLinks(); setupDistributor(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); configure_update_fast_path_restart_enabled(true); @@ -1094,7 +1094,7 @@ TEST_F(DistributorTest, fast_path_on_consistent_gets_config_is_propagated_to_int } TEST_F(DistributorTest, merge_disabling_config_is_propagated_to_internal_config) { - createLinks(true); + createLinks(); setupDistributor(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); configure_merge_operations_disabled(true); @@ -1105,7 +1105,7 @@ TEST_F(DistributorTest, merge_disabling_config_is_propagated_to_internal_config) } TEST_F(DistributorTest, metadata_update_phase_config_is_propagated_to_internal_config) { - createLinks(true); + createLinks(); setupDistributor(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); configure_metadata_update_phase_enabled(true); @@ -1116,7 +1116,7 @@ TEST_F(DistributorTest, metadata_update_phase_config_is_propagated_to_internal_c } TEST_F(DistributorTest, weak_internal_read_consistency_config_is_propagated_to_internal_configs) { - createLinks(true); + createLinks(); setupDistributor(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); configure_use_weak_internal_read_consistency(true); @@ -1128,15 +1128,8 @@ TEST_F(DistributorTest, weak_internal_read_consistency_config_is_propagated_to_i EXPECT_FALSE(getExternalOperationHandler().use_weak_internal_read_consistency_for_gets()); } -TEST_F(DistributorTest, concurrent_reads_not_enabled_if_btree_db_is_not_enabled) { - createLinks(false); - setupDistributor(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); - configure_stale_reads_enabled(true); - EXPECT_FALSE(getExternalOperationHandler().concurrent_gets_enabled()); -} - void DistributorTest::set_up_and_start_get_op_with_stale_reads_enabled(bool enabled) { - createLinks(true); + createLinks(); setupDistributor(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); configure_stale_reads_enabled(enabled); @@ -1145,7 +1138,7 @@ void DistributorTest::set_up_and_start_get_op_with_stale_reads_enabled(bool enab _distributor->onDown(make_dummy_get_command_for_bucket_1()); } -TEST_F(DistributorTest, gets_are_started_outside_main_distributor_logic_if_btree_db_and_stale_reads_enabled) { +TEST_F(DistributorTest, gets_are_started_outside_main_distributor_logic_if_stale_reads_enabled) { set_up_and_start_get_op_with_stale_reads_enabled(true); ASSERT_THAT(_sender.commands(), SizeIs(1)); EXPECT_THAT(_sender.replies(), SizeIs(0)); diff --git a/storage/src/tests/distributor/distributortestutil.cpp b/storage/src/tests/distributor/distributortestutil.cpp index 9f0c56c3fa5..3c26ea01c19 100644 --- a/storage/src/tests/distributor/distributortestutil.cpp +++ b/storage/src/tests/distributor/distributortestutil.cpp @@ -20,7 +20,7 @@ DistributorTestUtil::DistributorTestUtil() DistributorTestUtil::~DistributorTestUtil() { } void -DistributorTestUtil::createLinks(bool use_btree_db) +DistributorTestUtil::createLinks() { _node.reset(new TestDistributorApp(_config.getConfigId())); _threadPool = framework::TickingThreadPool::createDefault("distributor"); @@ -29,7 +29,6 @@ DistributorTestUtil::createLinks(bool use_btree_db) *_threadPool, *this, true, - use_btree_db, _hostInfo, &_messageSender)); _component.reset(new storage::DistributorComponent(_node->getComponentRegister(), "distrtestutil")); diff --git a/storage/src/tests/distributor/distributortestutil.h b/storage/src/tests/distributor/distributortestutil.h index a6e7ea16798..3dc71bcb433 100644 --- a/storage/src/tests/distributor/distributortestutil.h +++ b/storage/src/tests/distributor/distributortestutil.h @@ -34,7 +34,7 @@ public: /** * Sets up the storage link chain. */ - void createLinks(bool use_btree_db = false); + void createLinks(); void setTypeRepo(const std::shared_ptr &repo); void close(); diff --git a/storage/src/tests/distributor/maintenanceschedulertest.cpp b/storage/src/tests/distributor/maintenanceschedulertest.cpp index 53408bbf6b6..f4b1b687158 100644 --- a/storage/src/tests/distributor/maintenanceschedulertest.cpp +++ b/storage/src/tests/distributor/maintenanceschedulertest.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include diff --git a/storage/src/tests/distributor/mapbucketdatabasetest.cpp b/storage/src/tests/distributor/mapbucketdatabasetest.cpp deleted file mode 100644 index 2c000f6b5db..00000000000 --- a/storage/src/tests/distributor/mapbucketdatabasetest.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include -#include - -namespace storage::distributor { - -VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(MapDatabase, BucketDatabaseTest, - ::testing::Values(std::make_shared())); - -} diff --git a/storage/src/tests/distributor/simplemaintenancescannertest.cpp b/storage/src/tests/distributor/simplemaintenancescannertest.cpp index abf061dd990..b21a10c319e 100644 --- a/storage/src/tests/distributor/simplemaintenancescannertest.cpp +++ b/storage/src/tests/distributor/simplemaintenancescannertest.cpp @@ -36,7 +36,7 @@ void SimpleMaintenanceScannerTest::SetUp() { _priorityGenerator = std::make_unique(); - _bucketSpaceRepo = std::make_unique(false); + _bucketSpaceRepo = std::make_unique(); _priorityDb = std::make_unique(); _scanner = std::make_unique(*_priorityDb, *_priorityGenerator, *_bucketSpaceRepo); } @@ -79,7 +79,7 @@ TEST_F(SimpleMaintenanceScannerTest, prioritize_single_bucket) { TEST_F(SimpleMaintenanceScannerTest, prioritize_single_bucket_alt_bucket_space) { document::BucketSpace bucketSpace(4); - _bucketSpaceRepo->add(bucketSpace, std::make_unique(false)); + _bucketSpaceRepo->add(bucketSpace, std::make_unique()); _scanner->reset(); addBucketToDb(bucketSpace, 1); std::string expected("PrioritizedBucket(Bucket(BucketSpace(0x0000000000000004), BucketId(0x4000000000000001)), pri VERY_HIGH)\n"); -- cgit v1.2.3