Skip to content

Commit 78fa520

Browse files
noobpwnftwmm304321141
noobpwnftw
authored and
mm304321141
committed
1. Fix typo and coding style
2. Do not increase file number for random seed
1 parent 9cf4e52 commit 78fa520

13 files changed

+26
-26
lines changed

‎db/compaction_iterator_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class FakeCompaction : public CompactionIterator::CompactionProxy {
172172
return is_bottommost_level || key_not_exists_beyond_output_level;
173173
}
174174
virtual SeparationType separation_type() const {
175-
return kCompactionIngoreSeparate;
175+
return kCompactionIgnoreSeparate;
176176
}
177177
virtual bool need_rebuild(uint64_t fn) { return false; }
178178
virtual bool bottommost_level() const override { return is_bottommost_level; }

‎db/compaction_job.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {
15521552
cfd->ioptions()->level_compaction_dynamic_level_bytes));
15531553
if (kOutFileLen != port::kMaxSizet) {
15541554
const size_t kOutFileNumSamples = kOutFileLen >> kSampleLenShift;
1555-
Random64 generator{versions_->NewFileNumber()};
1555+
Random64 generator{Random::GetTLSInstance()->Next()};
15561556
for (size_t i = 0; i < kMaxSamples; ++i) {
15571557
sample_begin_offsets.insert(
15581558
static_cast<size_t>(generator.Uniform(kOutFileNumSamples))

‎db/compaction_job_stats_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ class CompactionJobStatsTest : public testing::Test,
301301
void TEST_Compact(int level, int cf, const Slice& start, const Slice& limit) {
302302
ASSERT_OK(
303303
dbfull()->TEST_CompactRange(level, &start, &limit, handles_[cf],
304-
SeparationType::kCompactionTransToSeparate,
304+
kCompactionTransToSeparate,
305305
true /* disallow trivial move */));
306306
}
307307

‎db/compaction_job_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ class CompactionJobTest : public testing::Test {
254254
params.max_compaction_bytes = 10 * 1024 * 1024;
255255
params.compression_opts = cfd->ioptions()->compression_opts;
256256
params.manual_compaction = true;
257-
params.separation_type = kCompactionIngoreSeparate;
257+
params.separation_type = kCompactionIgnoreSeparate;
258258

259259
Compaction compaction(std::move(params));
260260
compaction.SetInputVersion(cfd->current());

‎db/cuckoo_table_db_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ TEST_F(CuckooTableDBTest, CompactionIntoMultipleFiles) {
246246
ASSERT_EQ("1", FilesPerLevel());
247247

248248
dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
249-
SeparationType::kCompactionTransToSeparate,
249+
kCompactionTransToSeparate,
250250
true /* disallow trivial move */);
251251
ASSERT_EQ("0,2", FilesPerLevel());
252252
for (int idx = 0; idx < 28; ++idx) {

‎db/db_bloom_filter_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ TEST_P(DBBloomFilterTestDefFormatVersion, KeyMayExist) {
120120

121121
ASSERT_OK(Flush(1));
122122
dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1],
123-
SeparationType::kCompactionTransToSeparate,
123+
kCompactionTransToSeparate,
124124
true /* disallow trivial move */);
125125

126126
numopen = TestGetTickerCount(options, NO_FILE_OPENS);

‎db/db_compaction_test.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ TEST_P(DBCompactionTestWithParam, CompactionsGenerateMultipleFiles) {
868868
// Reopening moves updates to level-0
869869
ReopenWithColumnFamilies({"default", "pikachu"}, options);
870870
dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1],
871-
SeparationType::kCompactionTransToSeparate,
871+
kCompactionTransToSeparate,
872872
true /* disallow trivial move */);
873873

874874
ASSERT_EQ(NumTableFilesAtLevel(0, 1), 0);
@@ -1376,19 +1376,19 @@ TEST_P(DBCompactionTestWithParam, ManualCompactionPartial) {
13761376
// 1 files in L0
13771377
ASSERT_EQ("1,0,0,0,0,0,2", FilesPerLevel(0));
13781378
ASSERT_OK(dbfull()->TEST_CompactRange(
1379-
0, nullptr, nullptr, nullptr, SeparationType::kCompactionTransToSeparate,
1379+
0, nullptr, nullptr, nullptr, kCompactionTransToSeparate,
13801380
false));
13811381
ASSERT_OK(dbfull()->TEST_CompactRange(
1382-
1, nullptr, nullptr, nullptr, SeparationType::kCompactionTransToSeparate,
1382+
1, nullptr, nullptr, nullptr, kCompactionTransToSeparate,
13831383
false));
13841384
ASSERT_OK(dbfull()->TEST_CompactRange(
1385-
2, nullptr, nullptr, nullptr, SeparationType::kCompactionTransToSeparate,
1385+
2, nullptr, nullptr, nullptr, kCompactionTransToSeparate,
13861386
false));
13871387
ASSERT_OK(dbfull()->TEST_CompactRange(
1388-
3, nullptr, nullptr, nullptr, SeparationType::kCompactionTransToSeparate,
1388+
3, nullptr, nullptr, nullptr, kCompactionTransToSeparate,
13891389
false));
13901390
ASSERT_OK(dbfull()->TEST_CompactRange(
1391-
4, nullptr, nullptr, nullptr, SeparationType::kCompactionTransToSeparate,
1391+
4, nullptr, nullptr, nullptr, kCompactionTransToSeparate,
13921392
false));
13931393
// 2 files in L6, 1 file in L5
13941394
ASSERT_EQ("0,0,0,0,0,1,2", FilesPerLevel(0));
@@ -1526,7 +1526,7 @@ TEST_F(DBCompactionTest, DISABLED_ManualPartialFill) {
15261526
// 2 files in L2, 1 in L0
15271527
ASSERT_EQ("1,0,2", FilesPerLevel(0));
15281528
ASSERT_OK(dbfull()->TEST_CompactRange(
1529-
0, nullptr, nullptr, nullptr, SeparationType::kCompactionTransToSeparate,
1529+
0, nullptr, nullptr, nullptr, kCompactionTransToSeparate,
15301530
false));
15311531
// 2 files in L2, 1 in L1
15321532
ASSERT_EQ("0,1,2", FilesPerLevel(0));

‎db/db_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ class DBImpl : public DB {
413413
Status TEST_CompactRange(int level, const Slice* begin, const Slice* end,
414414
ColumnFamilyHandle* column_family = nullptr,
415415
SeparationType separation_type =
416-
SeparationType::kCompactionTransToSeparate,
416+
kCompactionTransToSeparate,
417417
bool disallow_trivial_move = false);
418418

419419
void TEST_SwitchWAL();

‎db/db_io_failure_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ TEST_F(DBIOFailureTest, DropWrites) {
4444
}
4545
dbfull()->TEST_CompactRange(
4646
level, nullptr, nullptr, nullptr,
47-
SeparationType::kCompactionTransToSeparate,
47+
kCompactionTransToSeparate,
4848
true /* disallow trivial move */);
4949
}
5050
} else {
@@ -112,7 +112,7 @@ TEST_F(DBIOFailureTest, NoSpaceCompactRange) {
112112

113113
Status s =
114114
dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
115-
SeparationType::kCompactionTransToSeparate,
115+
kCompactionTransToSeparate,
116116
true /* disallow trivial move */);
117117
ASSERT_TRUE(s.IsIOError());
118118
ASSERT_TRUE(s.IsNoSpace());

‎db/db_range_del_test.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ TEST_F(DBRangeDelTest, CompactionOutputHasOnlyRangeTombstone) {
6666
ASSERT_EQ(1, NumTableFilesAtLevel(0));
6767
ASSERT_EQ(0, NumTableFilesAtLevel(1));
6868
dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
69-
SeparationType::kCompactionTransToSeparate,
69+
kCompactionTransToSeparate,
7070
true /* disallow_trivial_move */);
7171
ASSERT_EQ(0, NumTableFilesAtLevel(0));
7272
ASSERT_EQ(1, NumTableFilesAtLevel(1));
@@ -118,7 +118,7 @@ TEST_F(DBRangeDelTest, CompactionOutputFilesExactlyFilled) {
118118
ASSERT_EQ(0, NumTableFilesAtLevel(1));
119119

120120
dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
121-
SeparationType::kCompactionTransToSeparate,
121+
kCompactionTransToSeparate,
122122
true /* disallow_trivial_move */);
123123
ASSERT_EQ(0, NumTableFilesAtLevel(0));
124124
ASSERT_EQ(2, NumTableFilesAtLevel(1));
@@ -163,7 +163,7 @@ TEST_F(DBRangeDelTest, MaxCompactionBytesCutsOutputFiles) {
163163
}
164164

165165
dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
166-
SeparationType::kCompactionTransToSeparate,
166+
kCompactionTransToSeparate,
167167
true /* disallow_trivial_move */);
168168
ASSERT_EQ(0, NumTableFilesAtLevel(0));
169169
ASSERT_GE(NumTableFilesAtLevel(1), 2);
@@ -237,7 +237,7 @@ TEST_F(DBRangeDelTest, CompactRangeDelsSameStartKey) {
237237
for (int i = 0; i < 2; ++i) {
238238
if (i > 0) {
239239
dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
240-
SeparationType::kCompactionTransToSeparate,
240+
kCompactionTransToSeparate,
241241
true /* disallow_trivial_move */);
242242
ASSERT_EQ(0, NumTableFilesAtLevel(0));
243243
ASSERT_EQ(1, NumTableFilesAtLevel(1));
@@ -445,7 +445,7 @@ TEST_F(DBRangeDelTest, ValidUniversalSubcompactionBoundaries) {
445445
ASSERT_OK(dbfull()->RunManualCompaction(
446446
reinterpret_cast<ColumnFamilyHandleImpl*>(db_->DefaultColumnFamily())
447447
->cfd(),
448-
SeparationType::kCompactionTransToSeparate, 1 /* input_level */,
448+
kCompactionTransToSeparate, 1 /* input_level */,
449449
2 /* output_level */, 0 /* output_path_id */, 0 /* max_subcompactions */,
450450
nullptr /* begin */, nullptr /* end */, nullptr /* files_being_compact */,
451451
true /* exclusive */, true /* disallow_trivial_move */));
@@ -1206,7 +1206,7 @@ TEST_F(DBRangeDelTest, KeyAtOverlappingEndpointReappears) {
12061206
// tighter endpoints, so we can verify that doesn't mess anything up.
12071207
dbfull()->TEST_CompactRange(1 /* level */, nullptr /* begin */,
12081208
nullptr /* end */, nullptr /* column_family */,
1209-
SeparationType::kCompactionTransToSeparate,
1209+
kCompactionTransToSeparate,
12101210
true /* disallow_trivial_move */);
12111211
ASSERT_EQ(NumTableFilesAtLevel(2), 1);
12121212
ASSERT_TRUE(db_->Get(ReadOptions(), "key", &value).IsNotFound());
@@ -1483,7 +1483,7 @@ TEST_F(DBRangeDelTest, RangeTombstoneWrittenToMinimalSsts) {
14831483
Slice end_key(end_key_storage);
14841484
dbfull()->TEST_CompactRange(0 /* level */, &begin_key /* begin */,
14851485
&end_key /* end */, nullptr /* column_family */,
1486-
SeparationType::kCompactionTransToSeparate,
1486+
kCompactionTransToSeparate,
14871487
true /* disallow_trivial_move */);
14881488
ASSERT_EQ(2, NumTableFilesAtLevel(1));
14891489

0 commit comments

Comments
 (0)