mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

index_reader: Introduce and use default arguments to constructor

Browse Source 
Most of creators of index_reader construct it with default prio class,
null trace pointer and use_caching::yes. Assigning implicit defaults to
constructor arguments keeps the code shorter and easier to read.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2023-05-18 16:14:26 +03:00
parent 3fd5d3cc2b
commit 2bb024c948
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sstables/index_reader.hh
View File

@@ -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)

2
sstables/sstables.cc
View File

@@ -2784,7 +2784,7 @@ future<bool> 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<sstables::index_reader>(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<sstables::index_reader>(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();

3
test/boost/sstable_3_x_test.cc
View File

@@ -4586,8 +4586,7 @@ static sstring get_read_index_test_path(sstring table_name) {
}
static std::unique_ptr<index_reader> get_index_reader(shared_sstable sst, reader_permit permit) {
return std::make_unique<index_reader>(sst, std::move(permit), default_priority_class(),
tracing::trace_state_ptr(), use_caching::yes);
return std::make_unique<index_reader>(sst, std::move(permit));
}
shared_sstable make_test_sstable(test_env& env, schema_ptr schema, const sstring& table_name) {

3
test/boost/sstable_datafile_test.cc
View File

@@ -2309,8 +2309,7 @@ SEASTAR_TEST_CASE(test_wrong_counter_shard_order) {
}
static std::unique_ptr<index_reader> get_index_reader(shared_sstable sst, reader_permit permit) {
return std::make_unique<index_reader>(sst, std::move(permit), default_priority_class(),
tracing::trace_state_ptr(), use_caching::yes);
return std::make_unique<index_reader>(sst, std::move(permit));
}
SEASTAR_TEST_CASE(test_broken_promoted_index_is_skipped) {

3
test/boost/sstable_mutation_test.cc
View File

@@ -900,8 +900,7 @@ SEASTAR_TEST_CASE(test_has_partition_key) {
}
static std::unique_ptr<index_reader> get_index_reader(shared_sstable sst, reader_permit permit) {
return std::make_unique<index_reader>(sst, std::move(permit), default_priority_class(),
tracing::trace_state_ptr(), use_caching::yes);
return std::make_unique<index_reader>(sst, std::move(permit));
}
SEASTAR_TEST_CASE(test_promoted_index_blocks_are_monotonic) {

3
test/lib/sstable_utils.hh
View File

@@ -64,8 +64,7 @@ public:
}
std::unique_ptr<index_reader> make_index_reader(reader_permit permit) {
return std::make_unique<index_reader>(_sst, std::move(permit), default_priority_class(),
tracing::trace_state_ptr(), use_caching::yes);
return std::make_unique<index_reader>(_sst, std::move(permit));
}
struct index_entry {

2
tools/scylla-sstable.cc
View File

@@ -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);