diff --git a/sstables/index_reader.hh b/sstables/index_reader.hh index 7112d8a883..ad6767c601 100644 --- a/sstables/index_reader.hh +++ b/sstables/index_reader.hh @@ -763,8 +763,11 @@ private: } public: - index_reader(shared_sstable sst, reader_permit permit, const io_priority_class& pc, tracing::trace_state_ptr trace_state, - use_caching caching, bool single_partition_read = false) + index_reader(shared_sstable sst, reader_permit permit, + const io_priority_class& pc = default_priority_class(), + tracing::trace_state_ptr trace_state = {}, + use_caching caching = use_caching::yes, + bool single_partition_read = false) : _sstable(std::move(sst)) , _permit(std::move(permit)) , _pc(pc) diff --git a/sstables/sstables.cc b/sstables/sstables.cc index b47fa1fef8..271be30a73 100644 --- a/sstables/sstables.cc +++ b/sstables/sstables.cc @@ -2784,7 +2784,7 @@ future sstable::has_partition_key(const utils::hashed_key& hk, const dht:: std::exception_ptr ex; auto sem = reader_concurrency_semaphore(reader_concurrency_semaphore::no_limits{}, "sstables::has_partition_key()"); try { - auto lh_index_ptr = std::make_unique(s, sem.make_tracking_only_permit(_schema.get(), s->get_filename(), db::no_timeout, {}), default_priority_class(), tracing::trace_state_ptr(), use_caching::yes); + auto lh_index_ptr = std::make_unique(s, sem.make_tracking_only_permit(_schema.get(), s->get_filename(), db::no_timeout, {})); present = co_await lh_index_ptr->advance_lower_and_check_if_present(dk); } catch (...) { ex = std::current_exception(); diff --git a/test/boost/sstable_3_x_test.cc b/test/boost/sstable_3_x_test.cc index d96ef96665..6b18ba8b42 100644 --- a/test/boost/sstable_3_x_test.cc +++ b/test/boost/sstable_3_x_test.cc @@ -4586,8 +4586,7 @@ static sstring get_read_index_test_path(sstring table_name) { } static std::unique_ptr get_index_reader(shared_sstable sst, reader_permit permit) { - return std::make_unique(sst, std::move(permit), default_priority_class(), - tracing::trace_state_ptr(), use_caching::yes); + return std::make_unique(sst, std::move(permit)); } shared_sstable make_test_sstable(test_env& env, schema_ptr schema, const sstring& table_name) { diff --git a/test/boost/sstable_datafile_test.cc b/test/boost/sstable_datafile_test.cc index b5619cdade..bbd0657940 100644 --- a/test/boost/sstable_datafile_test.cc +++ b/test/boost/sstable_datafile_test.cc @@ -2309,8 +2309,7 @@ SEASTAR_TEST_CASE(test_wrong_counter_shard_order) { } static std::unique_ptr get_index_reader(shared_sstable sst, reader_permit permit) { - return std::make_unique(sst, std::move(permit), default_priority_class(), - tracing::trace_state_ptr(), use_caching::yes); + return std::make_unique(sst, std::move(permit)); } SEASTAR_TEST_CASE(test_broken_promoted_index_is_skipped) { diff --git a/test/boost/sstable_mutation_test.cc b/test/boost/sstable_mutation_test.cc index fe9e6130c2..cee8629faa 100644 --- a/test/boost/sstable_mutation_test.cc +++ b/test/boost/sstable_mutation_test.cc @@ -900,8 +900,7 @@ SEASTAR_TEST_CASE(test_has_partition_key) { } static std::unique_ptr get_index_reader(shared_sstable sst, reader_permit permit) { - return std::make_unique(sst, std::move(permit), default_priority_class(), - tracing::trace_state_ptr(), use_caching::yes); + return std::make_unique(sst, std::move(permit)); } SEASTAR_TEST_CASE(test_promoted_index_blocks_are_monotonic) { diff --git a/test/lib/sstable_utils.hh b/test/lib/sstable_utils.hh index b9e6b81939..7ddc431452 100644 --- a/test/lib/sstable_utils.hh +++ b/test/lib/sstable_utils.hh @@ -64,8 +64,7 @@ public: } std::unique_ptr make_index_reader(reader_permit permit) { - return std::make_unique(_sst, std::move(permit), default_priority_class(), - tracing::trace_state_ptr(), use_caching::yes); + return std::make_unique(_sst, std::move(permit)); } struct index_entry { diff --git a/tools/scylla-sstable.cc b/tools/scylla-sstable.cc index 6dfff7f845..729fe50d19 100644 --- a/tools/scylla-sstable.cc +++ b/tools/scylla-sstable.cc @@ -962,7 +962,7 @@ void dump_index_operation(schema_ptr schema, reader_permit permit, const std::ve json_writer writer; writer.StartStream(); for (auto& sst : sstables) { - sstables::index_reader idx_reader(sst, permit, default_priority_class(), {}, sstables::use_caching::yes); + sstables::index_reader idx_reader(sst, permit); auto close_idx_reader = deferred_close(idx_reader); writer.SstableKey(*sst);