From 2cd11208a159052df913241ead01ac18530a1150 Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Mon, 4 Mar 2019 18:54:13 +0200 Subject: [PATCH] tests: use global nop_lp_handler in test_services Signed-off-by: Benny Halevy --- configure.py | 9 ++++++--- tests/mutation_test.cc | 2 -- tests/perf/perf_sstable.hh | 7 ++----- tests/sstable_datafile_test.cc | 5 +---- tests/sstable_mutation_test.cc | 2 -- tests/sstable_resharding_test.cc | 2 -- tests/sstable_test.cc | 2 -- tests/test_services.cc | 4 ++-- tests/test_services.hh | 3 +++ tests/view_build_test.cc | 3 +-- 10 files changed, 15 insertions(+), 24 deletions(-) diff --git a/configure.py b/configure.py index 8edbbb390c..49a99d24c2 100755 --- a/configure.py +++ b/configure.py @@ -792,13 +792,16 @@ idls = ['idl/gossip_digest.idl.hh', headers = find_headers('.', excluded_dirs=['idl', 'build', 'seastar', '.git']) -scylla_tests_dependencies = scylla_core + idls + [ +scylla_tests_generic_dependencies = [ 'tests/cql_test_env.cc', + 'tests/test_services.cc', +] + +scylla_tests_dependencies = scylla_core + idls + scylla_tests_generic_dependencies + [ 'tests/cql_assertions.cc', 'tests/result_set_assertions.cc', 'tests/mutation_source_test.cc', 'tests/data_model.cc', - 'tests/test_services.cc', ] deps = { @@ -869,7 +872,7 @@ for t in scylla_tests: if t not in tests_not_using_seastar_test_framework: deps[t] += scylla_tests_dependencies else: - deps[t] += scylla_core + idls + ['tests/cql_test_env.cc'] + deps[t] += scylla_core + idls + scylla_tests_generic_dependencies perf_tests_seastar_deps = [ 'seastar/tests/perf/perf_tests.cc' diff --git a/tests/mutation_test.cc b/tests/mutation_test.cc index 005d42e55f..c491fa4ce2 100644 --- a/tests/mutation_test.cc +++ b/tests/mutation_test.cc @@ -65,8 +65,6 @@ using namespace std::chrono_literals; static sstring some_keyspace("ks"); static sstring some_column_family("cf"); -static db::nop_large_data_handler nop_lp_handler; - static atomic_cell make_atomic_cell(bytes value) { return atomic_cell::make_live(*bytes_type, 0, std::move(value)); } diff --git a/tests/perf/perf_sstable.hh b/tests/perf/perf_sstable.hh index 043e3fa4b5..adbe7cd6ea 100644 --- a/tests/perf/perf_sstable.hh +++ b/tests/perf/perf_sstable.hh @@ -26,14 +26,13 @@ #include "cell_locking.hh" #include "mutation_reader.hh" #include "tests/sstable_utils.hh" +#include "tests/test_services.hh" #include #include #include using namespace sstables; -static db::nop_large_data_handler nop_lp_handler; - class perf_sstable_test_env { test_env _env; @@ -172,9 +171,7 @@ public: cache_tracker tracker; cell_locker_stats cl_stats; auto cm = make_lw_shared(); - column_family::config cfg; - cfg.large_data_handler = &nop_lp_handler; - auto cf = make_lw_shared(s, cfg, column_family::no_commitlog(), *cm, cl_stats, tracker); + auto cf = make_lw_shared(s, column_family_test_config(), column_family::no_commitlog(), *cm, cl_stats, tracker); auto start = perf_sstable_test_env::now(); auto ret = sstables::compact_sstables(sstables::compaction_descriptor(std::move(ssts)), *cf, sst_gen, sstables::replacer_fn_no_op()).get0(); diff --git a/tests/sstable_datafile_test.cc b/tests/sstable_datafile_test.cc index f05a6ea89a..665d2eed77 100644 --- a/tests/sstable_datafile_test.cc +++ b/tests/sstable_datafile_test.cc @@ -71,8 +71,6 @@ using namespace sstables; static const sstring some_keyspace("ks"); static const sstring some_column_family("cf"); -static db::nop_large_data_handler nop_lp_handler; - atomic_cell make_atomic_cell(data_type dt, bytes_view value, uint32_t ttl = 0, uint32_t expiration = 0) { if (ttl) { return atomic_cell::make_live(*dt, 0, value, @@ -1042,11 +1040,10 @@ SEASTAR_TEST_CASE(compaction_manager_test) { cm->start(); auto tmp = tmpdir(); - column_family::config cfg; + column_family::config cfg = column_family_test_config(); cfg.datadir = tmp.path().string(); cfg.enable_commitlog = false; cfg.enable_incremental_backups = false; - cfg.large_data_handler = &nop_lp_handler; auto cl_stats = make_lw_shared(); auto tracker = make_lw_shared(); auto cf = make_lw_shared(s, cfg, column_family::no_commitlog(), *cm, *cl_stats, *tracker); diff --git a/tests/sstable_mutation_test.cc b/tests/sstable_mutation_test.cc index b3eec9a45b..a0f5eac2a5 100644 --- a/tests/sstable_mutation_test.cc +++ b/tests/sstable_mutation_test.cc @@ -49,8 +49,6 @@ using namespace sstables; using namespace std::chrono_literals; -static db::nop_large_data_handler nop_lp_handler; - SEASTAR_THREAD_TEST_CASE(nonexistent_key) { auto wait_bg = seastar::defer([] { sstables::await_background_jobs().get(); }); sstables::test_env env; diff --git a/tests/sstable_resharding_test.cc b/tests/sstable_resharding_test.cc index 45875c00a5..12014d4206 100644 --- a/tests/sstable_resharding_test.cc +++ b/tests/sstable_resharding_test.cc @@ -23,8 +23,6 @@ using namespace sstables; -static db::nop_large_data_handler nop_lp_handler; - static inline std::vector> token_generation_for_shard(shard_id shard, unsigned tokens_to_generate) { unsigned tokens = 0; unsigned key_id = 0; diff --git a/tests/sstable_test.cc b/tests/sstable_test.cc index a223eb3666..580cc4b9bc 100644 --- a/tests/sstable_test.cc +++ b/tests/sstable_test.cc @@ -42,8 +42,6 @@ using namespace sstables; -static db::nop_large_data_handler nop_lp_handler; - bytes as_bytes(const sstring& s) { return { reinterpret_cast(s.begin()), s.size() }; } diff --git a/tests/test_services.cc b/tests/test_services.cc index 29206d972e..38494e84b1 100644 --- a/tests/test_services.cc +++ b/tests/test_services.cc @@ -39,11 +39,11 @@ range create_token_range_from_keys(sstring start_key, sstring end_ke return range::make(start, end); } -static db::nop_large_data_handler nop_lp_handler; - static const sstring some_keyspace("ks"); static const sstring some_column_family("cf"); +db::nop_large_data_handler nop_lp_handler; + column_family::config column_family_test_config() { column_family::config cfg; cfg.large_data_handler = &nop_lp_handler; diff --git a/tests/test_services.hh b/tests/test_services.hh index f9fe27d615..6879a529e0 100644 --- a/tests/test_services.hh +++ b/tests/test_services.hh @@ -31,6 +31,7 @@ #include "database.hh" #include "cell_locking.hh" #include "sstables/compaction_manager.hh" +#include "db/large_data_handler.hh" // Includes: database, auth, storage_service class storage_service_for_tests { @@ -41,6 +42,8 @@ public: ~storage_service_for_tests(); }; +extern db::nop_large_data_handler nop_lp_handler; + column_family::config column_family_test_config(); struct column_family_for_tests { diff --git a/tests/view_build_test.cc b/tests/view_build_test.cc index a959d56e45..aa359aab44 100644 --- a/tests/view_build_test.cc +++ b/tests/view_build_test.cc @@ -30,11 +30,10 @@ #include "tests/cql_assertions.hh" #include "schema_builder.hh" #include "service/priority_manager.hh" +#include "test_services.hh" using namespace std::literals::chrono_literals; -static db::nop_large_data_handler nop_lp_handler; - schema_ptr test_table_schema() { static thread_local auto s = [] { schema_builder builder(make_lw_shared(schema(