Skip to content

Commit 3b27725

Browse files
zaorangyangfacebook-github-bot
authored andcommitted
Fix a minor issue with initializing the test path (facebook#8555)
Summary: The PerThreadDBPath has already specified a slash. It does not need to be specified when initializing the test path. Pull Request resolved: facebook#8555 Reviewed By: ajkr Differential Revision: D29758399 Pulled By: jay-zhuang fbshipit-source-id: 6d2b878523e3e8580536e2829cb25489844d9011
1 parent c521a9a commit 3b27725

Some content is hidden

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

51 files changed

+67
-71
lines changed

cache/lru_cache_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ class TestSecondaryCache : public SecondaryCache {
378378
class DBSecondaryCacheTest : public DBTestBase {
379379
public:
380380
DBSecondaryCacheTest()
381-
: DBTestBase("/db_secondary_cache_test", /*env_do_fsync=*/true) {
381+
: DBTestBase("db_secondary_cache_test", /*env_do_fsync=*/true) {
382382
fault_fs_.reset(new FaultInjectionTestFS(env_->GetFileSystem()));
383383
fault_env_.reset(new CompositeEnvWrapper(env_, fault_fs_));
384384
}

db/blob/db_blob_basic_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace ROCKSDB_NAMESPACE {
1616
class DBBlobBasicTest : public DBTestBase {
1717
protected:
1818
DBBlobBasicTest()
19-
: DBTestBase("/db_blob_basic_test", /* env_do_fsync */ false) {}
19+
: DBTestBase("db_blob_basic_test", /* env_do_fsync */ false) {}
2020
};
2121

2222
TEST_F(DBBlobBasicTest, GetBlob) {

db/blob/db_blob_compaction_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ROCKSDB_NAMESPACE {
1515
class DBBlobCompactionTest : public DBTestBase {
1616
public:
1717
explicit DBBlobCompactionTest()
18-
: DBTestBase("/db_blob_compaction_test", /*env_do_fsync=*/false) {}
18+
: DBTestBase("db_blob_compaction_test", /*env_do_fsync=*/false) {}
1919

2020
#ifndef ROCKSDB_LITE
2121
const std::vector<InternalStats::CompactionStats>& GetCompactionStats() {

db/blob/db_blob_corruption_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace ROCKSDB_NAMESPACE {
1212
class DBBlobCorruptionTest : public DBTestBase {
1313
protected:
1414
DBBlobCorruptionTest()
15-
: DBTestBase("/db_blob_corruption_test", /* env_do_fsync */ false) {}
15+
: DBTestBase("db_blob_corruption_test", /* env_do_fsync */ false) {}
1616

1717
void Corrupt(FileType filetype, int offset, int bytes_to_corrupt) {
1818
// Pick file to corrupt

db/blob/db_blob_index_test.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ class DBBlobIndexTest : public DBTestBase {
4141
Tier::kImmutableMemtables,
4242
Tier::kL0SstFile, Tier::kLnSstFile};
4343

44-
DBBlobIndexTest()
45-
: DBTestBase("/db_blob_index_test", /*env_do_fsync=*/true) {}
44+
DBBlobIndexTest() : DBTestBase("db_blob_index_test", /*env_do_fsync=*/true) {}
4645

4746
ColumnFamilyHandle* cfh() { return dbfull()->DefaultColumnFamily(); }
4847

db/db_basic_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace ROCKSDB_NAMESPACE {
3131

3232
class DBBasicTest : public DBTestBase {
3333
public:
34-
DBBasicTest() : DBTestBase("/db_basic_test", /*env_do_fsync=*/false) {}
34+
DBBasicTest() : DBTestBase("db_basic_test", /*env_do_fsync=*/false) {}
3535
};
3636

3737
TEST_F(DBBasicTest, OpenWhenOpen) {
@@ -2576,7 +2576,7 @@ class DBBasicTestTrackWal : public DBTestBase,
25762576
public testing::WithParamInterface<bool> {
25772577
public:
25782578
DBBasicTestTrackWal()
2579-
: DBTestBase("/db_basic_test_track_wal", /*env_do_fsync=*/false) {}
2579+
: DBTestBase("db_basic_test_track_wal", /*env_do_fsync=*/false) {}
25802580

25812581
int CountWalFiles() {
25822582
VectorLogPtr log_files;

db/db_block_cache_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DBBlockCacheTest : public DBTestBase {
3939
const size_t kValueSize = 100;
4040

4141
DBBlockCacheTest()
42-
: DBTestBase("/db_block_cache_test", /*env_do_fsync=*/true) {}
42+
: DBTestBase("db_block_cache_test", /*env_do_fsync=*/true) {}
4343

4444
BlockBasedTableOptions GetTableOptions() {
4545
BlockBasedTableOptions table_options;
@@ -1218,7 +1218,7 @@ class DBBlockCachePinningTest
12181218
std::tuple<bool, PinningTier, PinningTier, PinningTier>> {
12191219
public:
12201220
DBBlockCachePinningTest()
1221-
: DBTestBase("/db_block_cache_test", /*env_do_fsync=*/false) {}
1221+
: DBTestBase("db_block_cache_test", /*env_do_fsync=*/false) {}
12221222

12231223
void SetUp() override {
12241224
partition_index_and_filters_ = std::get<0>(GetParam());

db/db_bloom_filter_test.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ using BFP = BloomFilterPolicy;
2828
class DBBloomFilterTest : public DBTestBase {
2929
public:
3030
DBBloomFilterTest()
31-
: DBTestBase("/db_bloom_filter_test", /*env_do_fsync=*/true) {}
31+
: DBTestBase("db_bloom_filter_test", /*env_do_fsync=*/true) {}
3232
};
3333

3434
class DBBloomFilterTestWithParam : public DBTestBase,
@@ -42,7 +42,7 @@ class DBBloomFilterTestWithParam : public DBTestBase,
4242

4343
public:
4444
DBBloomFilterTestWithParam()
45-
: DBTestBase("/db_bloom_filter_tests", /*env_do_fsync=*/true) {}
45+
: DBTestBase("db_bloom_filter_tests", /*env_do_fsync=*/true) {}
4646

4747
~DBBloomFilterTestWithParam() override {}
4848

@@ -1094,7 +1094,7 @@ class DBBloomFilterTestVaryPrefixAndFormatVer
10941094

10951095
public:
10961096
DBBloomFilterTestVaryPrefixAndFormatVer()
1097-
: DBTestBase("/db_bloom_filter_tests", /*env_do_fsync=*/true) {}
1097+
: DBTestBase("db_bloom_filter_tests", /*env_do_fsync=*/true) {}
10981098

10991099
~DBBloomFilterTestVaryPrefixAndFormatVer() override {}
11001100

db/db_compaction_filter_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ static std::string NEW_VALUE = "NewValue";
2222
class DBTestCompactionFilter : public DBTestBase {
2323
public:
2424
DBTestCompactionFilter()
25-
: DBTestBase("/db_compaction_filter_test", /*env_do_fsync=*/true) {}
25+
: DBTestBase("db_compaction_filter_test", /*env_do_fsync=*/true) {}
2626
};
2727

2828
// Param variant of DBTestBase::ChangeCompactOptions

db/db_compaction_test.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ namespace ROCKSDB_NAMESPACE {
3232
class DBCompactionTest : public DBTestBase {
3333
public:
3434
DBCompactionTest()
35-
: DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) {}
35+
: DBTestBase("db_compaction_test", /*env_do_fsync=*/true) {}
3636
};
3737

3838
class DBCompactionTestWithParam
3939
: public DBTestBase,
4040
public testing::WithParamInterface<std::tuple<uint32_t, bool>> {
4141
public:
4242
DBCompactionTestWithParam()
43-
: DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) {
43+
: DBTestBase("db_compaction_test", /*env_do_fsync=*/true) {
4444
max_subcompactions_ = std::get<0>(GetParam());
4545
exclusive_manual_compaction_ = std::get<1>(GetParam());
4646
}
@@ -58,7 +58,7 @@ class DBCompactionTestWithBottommostParam
5858
public testing::WithParamInterface<BottommostLevelCompaction> {
5959
public:
6060
DBCompactionTestWithBottommostParam()
61-
: DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) {
61+
: DBTestBase("db_compaction_test", /*env_do_fsync=*/true) {
6262
bottommost_level_compaction_ = GetParam();
6363
}
6464

@@ -5005,7 +5005,7 @@ class CompactionPriTest : public DBTestBase,
50055005
public testing::WithParamInterface<uint32_t> {
50065006
public:
50075007
CompactionPriTest()
5008-
: DBTestBase("/compaction_pri_test", /*env_do_fsync=*/true) {
5008+
: DBTestBase("compaction_pri_test", /*env_do_fsync=*/true) {
50095009
compaction_pri_ = GetParam();
50105010
}
50115011

db/db_dynamic_level_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace ROCKSDB_NAMESPACE {
2222
class DBTestDynamicLevel : public DBTestBase {
2323
public:
2424
DBTestDynamicLevel()
25-
: DBTestBase("/db_dynamic_level_test", /*env_do_fsync=*/true) {}
25+
: DBTestBase("db_dynamic_level_test", /*env_do_fsync=*/true) {}
2626
};
2727

2828
TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase) {

db/db_encryption_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace ROCKSDB_NAMESPACE {
1717
class DBEncryptionTest : public DBTestBase {
1818
public:
1919
DBEncryptionTest()
20-
: DBTestBase("/db_encryption_test", /*env_do_fsync=*/true) {}
20+
: DBTestBase("db_encryption_test", /*env_do_fsync=*/true) {}
2121
Env* GetTargetEnv() {
2222
if (encrypted_env_ != nullptr) {
2323
return (static_cast<EnvWrapper*>(encrypted_env_))->target();

db/db_flush_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static std::string NEW_VALUE = "NewValue";
3030

3131
class DBFlushTest : public DBTestBase {
3232
public:
33-
DBFlushTest() : DBTestBase("/db_flush_test", /*env_do_fsync=*/true) {}
33+
DBFlushTest() : DBTestBase("db_flush_test", /*env_do_fsync=*/true) {}
3434
};
3535

3636
class DBFlushDirectIOTest : public DBFlushTest,

db/db_inplace_update_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace ROCKSDB_NAMESPACE {
1414
class DBTestInPlaceUpdate : public DBTestBase {
1515
public:
1616
DBTestInPlaceUpdate()
17-
: DBTestBase("/db_inplace_update_test", /*env_do_fsync=*/true) {}
17+
: DBTestBase("db_inplace_update_test", /*env_do_fsync=*/true) {}
1818
};
1919

2020
TEST_F(DBTestInPlaceUpdate, InPlaceUpdate) {

db/db_io_failure_test.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ namespace ROCKSDB_NAMESPACE {
1515

1616
class DBIOFailureTest : public DBTestBase {
1717
public:
18-
DBIOFailureTest()
19-
: DBTestBase("/db_io_failure_test", /*env_do_fsync=*/true) {}
18+
DBIOFailureTest() : DBTestBase("db_io_failure_test", /*env_do_fsync=*/true) {}
2019
};
2120

2221
#ifndef ROCKSDB_LITE

db/db_iterator_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class DummyReadCallback : public ReadCallback {
3535
class DBIteratorTest : public DBTestBase,
3636
public testing::WithParamInterface<bool> {
3737
public:
38-
DBIteratorTest() : DBTestBase("/db_iterator_test", /*env_do_fsync=*/true) {}
38+
DBIteratorTest() : DBTestBase("db_iterator_test", /*env_do_fsync=*/true) {}
3939

4040
Iterator* NewIterator(const ReadOptions& read_options,
4141
ColumnFamilyHandle* column_family = nullptr) {

db/db_kv_checksum_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class DbKvChecksumTest
2929
public ::testing::WithParamInterface<std::tuple<WriteBatchOpType, char>> {
3030
public:
3131
DbKvChecksumTest()
32-
: DBTestBase("/db_kv_checksum_test", /*env_do_fsync=*/false) {
32+
: DBTestBase("db_kv_checksum_test", /*env_do_fsync=*/false) {
3333
op_type_ = std::get<0>(GetParam());
3434
corrupt_byte_addend_ = std::get<1>(GetParam());
3535
}

db/db_log_iter_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace ROCKSDB_NAMESPACE {
2121
class DBTestXactLogIterator : public DBTestBase {
2222
public:
2323
DBTestXactLogIterator()
24-
: DBTestBase("/db_log_iter_test", /*env_do_fsync=*/true) {}
24+
: DBTestBase("db_log_iter_test", /*env_do_fsync=*/true) {}
2525

2626
std::unique_ptr<TransactionLogIterator> OpenTransactionLogIter(
2727
const SequenceNumber seq) {

db/db_memtable_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace ROCKSDB_NAMESPACE {
1717

1818
class DBMemTableTest : public DBTestBase {
1919
public:
20-
DBMemTableTest() : DBTestBase("/db_memtable_test", /*env_do_fsync=*/true) {}
20+
DBMemTableTest() : DBTestBase("db_memtable_test", /*env_do_fsync=*/true) {}
2121
};
2222

2323
class MockMemTableRep : public MemTableRep {

db/db_merge_operand_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class LimitedStringAppendMergeOp : public StringAppendTESTOperator {
4444
class DBMergeOperandTest : public DBTestBase {
4545
public:
4646
DBMergeOperandTest()
47-
: DBTestBase("/db_merge_operand_test", /*env_do_fsync=*/true) {}
47+
: DBTestBase("db_merge_operand_test", /*env_do_fsync=*/true) {}
4848
};
4949

5050
TEST_F(DBMergeOperandTest, GetMergeOperandsBasic) {

db/db_merge_operator_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TestReadCallback : public ReadCallback {
3737
class DBMergeOperatorTest : public DBTestBase {
3838
public:
3939
DBMergeOperatorTest()
40-
: DBTestBase("/db_merge_operator_test", /*env_do_fsync=*/false) {}
40+
: DBTestBase("db_merge_operator_test", /*env_do_fsync=*/false) {}
4141

4242
std::string GetWithReadCallback(SnapshotChecker* snapshot_checker,
4343
const Slice& key,

db/db_options_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace ROCKSDB_NAMESPACE {
2727

2828
class DBOptionsTest : public DBTestBase {
2929
public:
30-
DBOptionsTest() : DBTestBase("/db_options_test", /*env_do_fsync=*/true) {}
30+
DBOptionsTest() : DBTestBase("db_options_test", /*env_do_fsync=*/true) {}
3131

3232
#ifndef ROCKSDB_LITE
3333
std::unordered_map<std::string, std::string> GetMutableDBOptionsMap(

db/db_properties_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace ROCKSDB_NAMESPACE {
2727
class DBPropertiesTest : public DBTestBase {
2828
public:
2929
DBPropertiesTest()
30-
: DBTestBase("/db_properties_test", /*env_do_fsync=*/false) {}
30+
: DBTestBase("db_properties_test", /*env_do_fsync=*/false) {}
3131
};
3232

3333
#ifndef ROCKSDB_LITE

db/db_range_del_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace ROCKSDB_NAMESPACE {
1414

1515
class DBRangeDelTest : public DBTestBase {
1616
public:
17-
DBRangeDelTest() : DBTestBase("/db_range_del_test", /*env_do_fsync=*/false) {}
17+
DBRangeDelTest() : DBTestBase("db_range_del_test", /*env_do_fsync=*/false) {}
1818

1919
std::string GetNumericStr(int key) {
2020
uint64_t uint64_key = static_cast<uint64_t>(key);

db/db_secondary_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace ROCKSDB_NAMESPACE {
2020
class DBSecondaryTest : public DBTestBase {
2121
public:
2222
DBSecondaryTest()
23-
: DBTestBase("/db_secondary_test", /*env_do_fsync=*/true),
23+
: DBTestBase("db_secondary_test", /*env_do_fsync=*/true),
2424
secondary_path_(),
2525
handles_secondary_(),
2626
db_secondary_(nullptr) {

db/db_sst_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace ROCKSDB_NAMESPACE {
1818

1919
class DBSSTTest : public DBTestBase {
2020
public:
21-
DBSSTTest() : DBTestBase("/db_sst_test", /*env_do_fsync=*/true) {}
21+
DBSSTTest() : DBTestBase("db_sst_test", /*env_do_fsync=*/true) {}
2222
};
2323

2424
#ifndef ROCKSDB_LITE
@@ -757,7 +757,7 @@ class DBWALTestWithParam
757757
public testing::WithParamInterface<std::tuple<std::string, bool>> {
758758
public:
759759
explicit DBWALTestWithParam()
760-
: DBTestBase("/db_wal_test_with_params", /*env_do_fsync=*/true) {
760+
: DBTestBase("db_wal_test_with_params", /*env_do_fsync=*/true) {
761761
wal_dir_ = std::get<0>(GetParam());
762762
wal_dir_same_as_dbname_ = std::get<1>(GetParam());
763763
}

db/db_statistics_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace ROCKSDB_NAMESPACE {
1616
class DBStatisticsTest : public DBTestBase {
1717
public:
1818
DBStatisticsTest()
19-
: DBTestBase("/db_statistics_test", /*env_do_fsync=*/true) {}
19+
: DBTestBase("db_statistics_test", /*env_do_fsync=*/true) {}
2020
};
2121

2222
TEST_F(DBStatisticsTest, CompressionStatsTest) {

db/db_table_properties_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class DBTablePropertiesTest : public DBTestBase,
5252
public testing::WithParamInterface<std::string> {
5353
public:
5454
DBTablePropertiesTest()
55-
: DBTestBase("/db_table_properties_test", /*env_do_fsync=*/false) {}
55+
: DBTestBase("db_table_properties_test", /*env_do_fsync=*/false) {}
5656
TablePropertiesCollection TestGetPropertiesOfTablesInRange(
5757
std::vector<Range> ranges, std::size_t* num_properties = nullptr,
5858
std::size_t* num_files = nullptr);
@@ -281,7 +281,7 @@ class DBTableHostnamePropertyTest
281281
public ::testing::WithParamInterface<std::tuple<int, std::string>> {
282282
public:
283283
DBTableHostnamePropertyTest()
284-
: DBTestBase("/db_table_hostname_property_test",
284+
: DBTestBase("db_table_hostname_property_test",
285285
/*env_do_fsync=*/false) {}
286286
};
287287

db/db_tailing_iter_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace ROCKSDB_NAMESPACE {
2121
class DBTestTailingIterator : public DBTestBase {
2222
public:
2323
DBTestTailingIterator()
24-
: DBTestBase("/db_tailing_iterator_test", /*env_do_fsync=*/true) {}
24+
: DBTestBase("db_tailing_iterator_test", /*env_do_fsync=*/true) {}
2525
};
2626

2727
TEST_F(DBTestTailingIterator, TailingIteratorSingle) {

db/db_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ namespace ROCKSDB_NAMESPACE {
7575
// If fsync needs to be covered in a test, put it in other places.
7676
class DBTest : public DBTestBase {
7777
public:
78-
DBTest() : DBTestBase("/db_test", /*env_do_fsync=*/false) {}
78+
DBTest() : DBTestBase("db_test", /*env_do_fsync=*/false) {}
7979
};
8080

8181
class DBTestWithParam

0 commit comments

Comments
 (0)