Skip to content

Commit 4559ceb

Browse files
archang19archang19
committed
Iterator class does not need internal stats passed in
1 parent d1ec645 commit 4559ceb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+178
-153
lines changed

‎db/compaction/compaction_job.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,7 @@ Status CompactionJob::Run() {
781781
cfd->internal_comparator(), files_output[file_idx]->meta,
782782
/*range_del_agg=*/nullptr,
783783
compact_->compaction->mutable_cf_options(),
784-
/*table_reader_ptr=*/nullptr,
785-
cfd->internal_stats(),
784+
/*table_reader_ptr=*/nullptr, cfd->internal_stats(),
786785
cfd->internal_stats()->GetFileReadHist(
787786
compact_->compaction->output_level()),
788787
TableReaderCaller::kCompactionRefill, /*arena=*/nullptr,

‎db/compaction/compaction_job_test.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -463,11 +463,12 @@ class CompactionJobTestBase : public testing::Test {
463463
TableReaderOptions(cfd->ioptions(), nullptr, FileOptions(),
464464
cfd_->internal_comparator(),
465465
0 /* block_protection_bytes_per_key */),
466-
std::move(freader), file_size, &table_reader, /*internal_stast=*/nullptr, false);
466+
std::move(freader), file_size, &table_reader,
467+
/*internal_stast=*/nullptr, false);
467468
ASSERT_OK(s);
468469
assert(table_reader);
469470
std::unique_ptr<InternalIterator> iiter(
470-
table_reader->NewIterator(read_opts, nullptr, nullptr, nullptr, true,
471+
table_reader->NewIterator(read_opts, nullptr, nullptr, true,
471472
TableReaderCaller::kUncategorized));
472473
assert(iiter);
473474

‎db/convenience.cc

+6-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Status VerifySstFileChecksum(const Options& options,
3636
InternalStats* internal_stats) {
3737
// TODO: plumb Env::IOActivity, Env::IOPriority
3838
const ReadOptions read_options;
39-
return VerifySstFileChecksum(options, env_options, read_options, file_path, /*largest_seqno=*/0, internal_stats);
39+
return VerifySstFileChecksum(options, env_options, read_options, file_path,
40+
/*largest_seqno=*/0, internal_stats);
4041
}
4142
Status VerifySstFileChecksum(const Options& options,
4243
const EnvOptions& env_options,
@@ -52,7 +53,8 @@ Status VerifySstFileChecksum(const Options& options,
5253
}
5354
ReadOptions read_options(_read_options);
5455
return VerifySstFileChecksumInternal(options, env_options, read_options,
55-
file_path, largest_seqno, internal_stats);
56+
file_path, largest_seqno,
57+
internal_stats);
5658
}
5759

5860
Status VerifySstFileChecksumInternal(const Options& options,
@@ -91,7 +93,8 @@ Status VerifySstFileChecksumInternal(const Options& options,
9193
reader_options.largest_seqno = largest_seqno;
9294
s = options.table_factory->NewTableReader(
9395
read_options, reader_options, std::move(file_reader), file_size,
94-
&table_reader, internal_stats, false /* prefetch_index_and_filter_in_cache */);
96+
&table_reader, internal_stats,
97+
false /* prefetch_index_and_filter_in_cache */);
9598
if (!s.ok()) {
9699
return s;
97100
}

‎db/external_sst_file_ingestion_job.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ Status ExternalSstFileIngestionJob::GetIngestedFileInfo(
923923
ReadOptions ro;
924924
ro.fill_cache = ingestion_options_.fill_cache;
925925
std::unique_ptr<InternalIterator> iter(table_reader->NewIterator(
926-
ro, sv->mutable_cf_options.prefix_extractor.get(), /*arena=*/nullptr, /*internal_stats=*/nullptr,
926+
ro, sv->mutable_cf_options.prefix_extractor.get(), /*arena=*/nullptr,
927927
/*skip_filters=*/false, TableReaderCaller::kExternalSSTIngestion));
928928

929929
// Get first (smallest) and last (largest) key from file.

‎db/forward_iterator.cc

+9-6
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,9 @@ void ForwardIterator::RebuildIterators(bool refresh_sv) {
750750
read_options_, *cfd_->soptions(), cfd_->internal_comparator(), *l0,
751751
read_options_.ignore_range_deletions ? nullptr : &range_del_agg,
752752
sv_->mutable_cf_options,
753-
/*table_reader_ptr=*/nullptr, cfd_->internal_stats(),/*file_read_hist=*/nullptr,
754-
TableReaderCaller::kUserIterator, /*arena=*/nullptr,
753+
/*table_reader_ptr=*/nullptr, cfd_->internal_stats(),
754+
/*file_read_hist=*/nullptr, TableReaderCaller::kUserIterator,
755+
/*arena=*/nullptr,
755756
/*skip_filters=*/false, /*level=*/-1,
756757
MaxFileSizeForL0MetaPin(sv_->mutable_cf_options),
757758
/*smallest_compaction_key=*/nullptr,
@@ -838,8 +839,9 @@ void ForwardIterator::RenewIterators() {
838839
*l0_files_new[inew],
839840
read_options_.ignore_range_deletions ? nullptr : &range_del_agg,
840841
svnew->mutable_cf_options,
841-
/*table_reader_ptr=*/nullptr, cfd_->internal_stats(),/*file_read_hist=*/nullptr,
842-
TableReaderCaller::kUserIterator, /*arena=*/nullptr,
842+
/*table_reader_ptr=*/nullptr, cfd_->internal_stats(),
843+
/*file_read_hist=*/nullptr, TableReaderCaller::kUserIterator,
844+
/*arena=*/nullptr,
843845
/*skip_filters=*/false, /*level=*/-1,
844846
MaxFileSizeForL0MetaPin(svnew->mutable_cf_options),
845847
/*smallest_compaction_key=*/nullptr,
@@ -903,8 +905,9 @@ void ForwardIterator::ResetIncompleteIterators() {
903905
l0_iters_[i] = cfd_->table_cache()->NewIterator(
904906
read_options_, *cfd_->soptions(), cfd_->internal_comparator(),
905907
*l0_files[i], /*range_del_agg=*/nullptr, sv_->mutable_cf_options,
906-
/*table_reader_ptr=*/nullptr, cfd_->internal_stats(),/*file_read_hist=*/nullptr,
907-
TableReaderCaller::kUserIterator, /*arena=*/nullptr,
908+
/*table_reader_ptr=*/nullptr, cfd_->internal_stats(),
909+
/*file_read_hist=*/nullptr, TableReaderCaller::kUserIterator,
910+
/*arena=*/nullptr,
908911
/*skip_filters=*/false, /*level=*/-1,
909912
MaxFileSizeForL0MetaPin(sv_->mutable_cf_options),
910913
/*smallest_compaction_key=*/nullptr,

‎db/import_column_family_job.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ Status ImportColumnFamilyJob::GetIngestedFileInfo(
338338
/*block_cache_tracer*/ nullptr,
339339
/*max_file_size_for_l0_meta_pin*/ 0, versions_->DbSessionId(),
340340
/*cur_file_num*/ new_file_number),
341-
std::move(sst_file_reader), file_to_import->file_size, &table_reader, /*internal_stats=*/nullptr);
341+
std::move(sst_file_reader), file_to_import->file_size, &table_reader,
342+
/*internal_stats=*/nullptr);
342343
if (!status.ok()) {
343344
return status;
344345
}
@@ -361,7 +362,7 @@ Status ImportColumnFamilyJob::GetIngestedFileInfo(
361362
// TODO: plumb Env::IOActivity, Env::IOPriority
362363
ReadOptions ro;
363364
std::unique_ptr<InternalIterator> iter(table_reader->NewIterator(
364-
ro, sv->mutable_cf_options.prefix_extractor.get(), /*arena=*/nullptr, /*internal_stats=*/nullptr,
365+
ro, sv->mutable_cf_options.prefix_extractor.get(), /*arena=*/nullptr,
365366
/*skip_filters=*/false, TableReaderCaller::kExternalSSTIngestion));
366367

367368
// Get first (smallest) key from file

‎db/plain_table_db_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ class TestPlainTableFactory : public PlainTableFactory {
323323
Status NewTableReader(
324324
const ReadOptions& /*ro*/, const TableReaderOptions& table_reader_options,
325325
std::unique_ptr<RandomAccessFileReader>&& file, uint64_t file_size,
326-
std::unique_ptr<TableReader>* table,InternalStats* /*internal_stats*/,
326+
std::unique_ptr<TableReader>* table, InternalStats* /*internal_stats*/,
327327
bool /*prefetch_index_and_filter_in_cache*/) const override {
328328
std::unique_ptr<TableProperties> props;
329329
const ReadOptions read_options;

‎db/repair.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,10 @@ class Repairer {
604604
InternalIterator* iter = table_cache_->NewIterator(
605605
ropts, file_options_, cfd->internal_comparator(), t->meta,
606606
nullptr /* range_del_agg */, cfd->GetLatestMutableCFOptions(),
607-
/*table_reader_ptr=*/nullptr, cfd == nullptr ? nullptr : cfd->internal_stats(),/*file_read_hist=*/nullptr,
608-
TableReaderCaller::kRepair, /*arena=*/nullptr, /*skip_filters=*/false,
607+
/*table_reader_ptr=*/nullptr,
608+
cfd == nullptr ? nullptr : cfd->internal_stats(),
609+
/*file_read_hist=*/nullptr, TableReaderCaller::kRepair,
610+
/*arena=*/nullptr, /*skip_filters=*/false,
609611
/*level=*/-1, /*max_file_size_for_l0_meta_pin=*/0,
610612
/*smallest_compaction_key=*/nullptr,
611613
/*largest_compaction_key=*/nullptr,

‎db/table_cache.cc

+6-7
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ Status TableCache::GetTableReader(
154154
file_meta.fd.GetNumber(), expected_unique_id,
155155
file_meta.fd.largest_seqno, file_meta.tail_size,
156156
file_meta.user_defined_timestamps_persisted),
157-
std::move(file_reader), file_meta.fd.GetFileSize(), table_reader, /*internal_stats=*/nullptr,
158-
prefetch_index_and_filter_in_cache);
157+
std::move(file_reader), file_meta.fd.GetFileSize(), table_reader,
158+
/*internal_stats=*/nullptr, prefetch_index_and_filter_in_cache);
159159
TEST_SYNC_POINT("TableCache::GetTableReader:0");
160160
}
161161
return s;
@@ -222,15 +222,15 @@ InternalIterator* TableCache::NewIterator(
222222
const InternalKeyComparator& icomparator, const FileMetaData& file_meta,
223223
RangeDelAggregator* range_del_agg,
224224
const MutableCFOptions& mutable_cf_options, TableReader** table_reader_ptr,
225-
InternalStats* internal_stats,
226-
HistogramImpl* file_read_hist, TableReaderCaller caller, Arena* arena,
227-
bool skip_filters, int level, size_t max_file_size_for_l0_meta_pin,
225+
InternalStats* internal_stats, HistogramImpl* file_read_hist,
226+
TableReaderCaller caller, Arena* arena, bool skip_filters, int level,
227+
size_t max_file_size_for_l0_meta_pin,
228228
const InternalKey* smallest_compaction_key,
229229
const InternalKey* largest_compaction_key, bool allow_unprepared_value,
230230
const SequenceNumber* read_seqno,
231231
std::unique_ptr<TruncatedRangeDelIterator>* range_del_iter) {
232232
PERF_TIMER_GUARD(new_table_iterator_nanos);
233-
(void) internal_stats;
233+
(void)internal_stats;
234234
Status s;
235235
TableReader* table_reader = nullptr;
236236
TypedHandle* handle = nullptr;
@@ -259,7 +259,6 @@ InternalIterator* TableCache::NewIterator(
259259
} else {
260260
result = table_reader->NewIterator(
261261
options, mutable_cf_options.prefix_extractor.get(), arena,
262-
internal_stats,
263262
skip_filters, caller, file_options.compaction_readahead_size,
264263
allow_unprepared_value);
265264
}

‎db/table_cache.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ class TableCache {
9494
const InternalKeyComparator& internal_comparator,
9595
const FileMetaData& file_meta, RangeDelAggregator* range_del_agg,
9696
const MutableCFOptions& mutable_cf_options,
97-
TableReader** table_reader_ptr, InternalStats* internal_stats, HistogramImpl* file_read_hist,
98-
TableReaderCaller caller, Arena* arena, bool skip_filters, int level,
99-
size_t max_file_size_for_l0_meta_pin,
97+
TableReader** table_reader_ptr, InternalStats* internal_stats,
98+
HistogramImpl* file_read_hist, TableReaderCaller caller, Arena* arena,
99+
bool skip_filters, int level, size_t max_file_size_for_l0_meta_pin,
100100
const InternalKey* smallest_compaction_key,
101101
const InternalKey* largest_compaction_key, bool allow_unprepared_value,
102102
const SequenceNumber* range_del_read_seqno = nullptr,

‎db/version_set.cc

+13-17
Original file line numberDiff line numberDiff line change
@@ -971,9 +971,9 @@ class LevelIterator final : public InternalIterator {
971971
TableCache* table_cache, const ReadOptions& read_options,
972972
const FileOptions& file_options, const InternalKeyComparator& icomparator,
973973
const LevelFilesBrief* flevel, const MutableCFOptions& mutable_cf_options,
974-
bool should_sample, InternalStats* internal_stats,HistogramImpl* file_read_hist,
975-
TableReaderCaller caller, bool skip_filters, int level,
976-
RangeDelAggregator* range_del_agg,
974+
bool should_sample, InternalStats* internal_stats,
975+
HistogramImpl* file_read_hist, TableReaderCaller caller,
976+
bool skip_filters, int level, RangeDelAggregator* range_del_agg,
977977
const std::vector<AtomicCompactionUnitBoundary>* compaction_boundaries =
978978
nullptr,
979979
bool allow_unprepared_value = false,
@@ -1150,7 +1150,8 @@ class LevelIterator final : public InternalIterator {
11501150
return table_cache_->NewIterator(
11511151
read_options_, file_options_, icomparator_, *file_meta.file_metadata,
11521152
range_del_agg_, mutable_cf_options_,
1153-
nullptr /* don't need reference to table */, internal_stats_, file_read_hist_, caller_,
1153+
nullptr /* don't need reference to table */, internal_stats_,
1154+
file_read_hist_, caller_,
11541155
/*arena=*/nullptr, skip_filters_, level_,
11551156
/*max_file_size_for_l0_meta_pin=*/0, smallest_compaction_key,
11561157
largest_compaction_key, allow_unprepared_value_, &read_seq_,
@@ -1932,8 +1933,7 @@ InternalIterator* Version::TEST_GetLevelIterator(
19321933
auto level_iter = new (mem) LevelIterator(
19331934
cfd_->table_cache(), read_options, file_options_,
19341935
cfd_->internal_comparator(), &storage_info_.LevelFilesBrief(level),
1935-
mutable_cf_options_, should_sample_file_read(),
1936-
cfd_->internal_stats(),
1936+
mutable_cf_options_, should_sample_file_read(), cfd_->internal_stats(),
19371937
cfd_->internal_stats()->GetFileReadHist(level),
19381938
TableReaderCaller::kUserIterator, IsFilterSkipped(level), level,
19391939
nullptr /* range_del_agg */, nullptr /* compaction_boundaries */,
@@ -2041,7 +2041,8 @@ void Version::AddIteratorsForLevel(const ReadOptions& read_options,
20412041
auto table_iter = cfd_->table_cache()->NewIterator(
20422042
read_options, soptions, cfd_->internal_comparator(),
20432043
*file.file_metadata, /*range_del_agg=*/nullptr, mutable_cf_options_,
2044-
nullptr, cfd_->internal_stats(), cfd_->internal_stats()->GetFileReadHist(0),
2044+
nullptr, cfd_->internal_stats(),
2045+
cfd_->internal_stats()->GetFileReadHist(0),
20452046
TableReaderCaller::kUserIterator, arena,
20462047
/*skip_filters=*/false, /*level=*/0, max_file_size_for_l0_meta_pin_,
20472048
/*smallest_compaction_key=*/nullptr,
@@ -2072,8 +2073,7 @@ void Version::AddIteratorsForLevel(const ReadOptions& read_options,
20722073
auto level_iter = new (mem) LevelIterator(
20732074
cfd_->table_cache(), read_options, soptions,
20742075
cfd_->internal_comparator(), &storage_info_.LevelFilesBrief(level),
2075-
mutable_cf_options_, should_sample_file_read(),
2076-
cfd_->internal_stats(),
2076+
mutable_cf_options_, should_sample_file_read(), cfd_->internal_stats(),
20772077
cfd_->internal_stats()->GetFileReadHist(level),
20782078
TableReaderCaller::kUserIterator, IsFilterSkipped(level), level,
20792079
/*range_del_agg=*/nullptr,
@@ -2115,8 +2115,7 @@ Status Version::OverlapWithLevelIterator(const ReadOptions& read_options,
21152115
ScopedArenaPtr<InternalIterator> iter(cfd_->table_cache()->NewIterator(
21162116
read_options, file_options, cfd_->internal_comparator(),
21172117
*file->file_metadata, &range_del_agg, mutable_cf_options_, nullptr,
2118-
cfd_->internal_stats(),
2119-
cfd_->internal_stats()->GetFileReadHist(0),
2118+
cfd_->internal_stats(), cfd_->internal_stats()->GetFileReadHist(0),
21202119
TableReaderCaller::kUserIterator, &arena,
21212120
/*skip_filters=*/false, /*level=*/0, max_file_size_for_l0_meta_pin_,
21222121
/*smallest_compaction_key=*/nullptr,
@@ -2133,8 +2132,7 @@ Status Version::OverlapWithLevelIterator(const ReadOptions& read_options,
21332132
ScopedArenaPtr<InternalIterator> iter(new (mem) LevelIterator(
21342133
cfd_->table_cache(), read_options, file_options,
21352134
cfd_->internal_comparator(), &storage_info_.LevelFilesBrief(level),
2136-
mutable_cf_options_, should_sample_file_read(),
2137-
cfd_->internal_stats(),
2135+
mutable_cf_options_, should_sample_file_read(), cfd_->internal_stats(),
21382136
cfd_->internal_stats()->GetFileReadHist(level),
21392137
TableReaderCaller::kUserIterator, IsFilterSkipped(level), level,
21402138
&range_del_agg, nullptr, false));
@@ -7080,8 +7078,7 @@ InternalIterator* VersionSet::MakeInputIterator(
70807078
read_options, file_options_compactions,
70817079
cfd->internal_comparator(), fmd, range_del_agg,
70827080
c->mutable_cf_options(),
7083-
/*table_reader_ptr=*/nullptr,
7084-
cfd->internal_stats(),
7081+
/*table_reader_ptr=*/nullptr, cfd->internal_stats(),
70857082
/*file_read_hist=*/nullptr, TableReaderCaller::kCompaction,
70867083
/*arena=*/nullptr,
70877084
/*skip_filters=*/false,
@@ -7102,8 +7099,7 @@ InternalIterator* VersionSet::MakeInputIterator(
71027099
list[num++] = new LevelIterator(
71037100
cfd->table_cache(), read_options, file_options_compactions,
71047101
cfd->internal_comparator(), flevel, c->mutable_cf_options(),
7105-
/*should_sample=*/false,
7106-
cfd->internal_stats(),
7102+
/*should_sample=*/false, cfd->internal_stats(),
71077103
/*no per level latency histogram=*/nullptr,
71087104
TableReaderCaller::kCompaction, /*skip_filters=*/false,
71097105
/*level=*/static_cast<int>(c->level(which)), range_del_agg,

‎file/file_prefetch_buffer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class FilePrefetchBuffer {
232232
}
233233
}
234234

235-
~FilePrefetchBuffer() {
235+
~FilePrefetchBuffer() {
236236
// Abort any pending async read request before destroying the class object.
237237
if (fs_ != nullptr) {
238238
std::vector<void*> handles;

0 commit comments

Comments
 (0)