diff --git a/replica/database.hh b/replica/database.hh index edb72b4f2d..c2d429ebc1 100644 --- a/replica/database.hh +++ b/replica/database.hh @@ -571,12 +571,6 @@ private: // overwrite an existing table. return sstables::generation_from_value((*_sstable_generation)++ * smp::count + this_shard_id()); } - - // inverse of calculate_generation_for_new_table(), used to determine which - // shard a sstable should be opened at. - static seastar::shard_id calculate_shard_from_sstable_generation(sstables::generation_type sstable_generation) { - return sstables::generation_value(sstable_generation) % smp::count; - } private: void rebuild_statistics(); diff --git a/test/boost/sstable_resharding_test.cc b/test/boost/sstable_resharding_test.cc index 714a414b31..43e5e83aaf 100644 --- a/test/boost/sstable_resharding_test.cc +++ b/test/boost/sstable_resharding_test.cc @@ -102,6 +102,7 @@ void run_sstable_resharding_test() { BOOST_REQUIRE(new_sstables.size() == smp::count); uint64_t bloom_filter_size_after = 0; + std::unordered_set processed_shards; for (auto& sstable : new_sstables) { auto new_sst = env.reusable_sst(s, tmp.path().string(), generation_value(sstable->generation()), @@ -111,7 +112,7 @@ void run_sstable_resharding_test() { auto shards = new_sst->get_shards_for_this_sstable(); BOOST_REQUIRE(shards.size() == 1); // check sstable is unshared. auto shard = shards.front(); - BOOST_REQUIRE(column_family_test::calculate_shard_from_sstable_generation(generation_value(new_sst->generation())) == shard); + BOOST_REQUIRE(processed_shards.insert(shard).second == true); // check resharding created one sstable per shard. auto rd = assert_that(new_sst->as_mutation_source().make_reader_v2(s, env.make_reader_permit())); BOOST_REQUIRE(muts[shard].size() == keys_per_shard); diff --git a/test/boost/sstable_test.hh b/test/boost/sstable_test.hh index c47c4df805..abc0ca8428 100644 --- a/test/boost/sstable_test.hh +++ b/test/boost/sstable_test.hh @@ -50,10 +50,6 @@ public: return generation_value(cf.calculate_generation_for_new_table()); } - static int64_t calculate_shard_from_sstable_generation(int64_t generation) { - return replica::column_family::calculate_shard_from_sstable_generation(generation_from_value(generation)); - } - auto try_flush_memtable_to_sstable(lw_shared_ptr mt) { auto cg = _cf->single_compaction_group_if_available(); assert(cg);