From 3b277252457d2bb1c5fb9a86fea36bb6d1f90ac3 Mon Sep 17 00:00:00 2001 From: Drewryz <313961317@qq.com> Date: Fri, 23 Jul 2021 08:37:27 -0700 Subject: [PATCH] Fix a minor issue with initializing the test path (#8555) Summary: The PerThreadDBPath has already specified a slash. It does not need to be specified when initializing the test path. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8555 Reviewed By: ajkr Differential Revision: D29758399 Pulled By: jay-zhuang fbshipit-source-id: 6d2b878523e3e8580536e2829cb25489844d9011 --- cache/lru_cache_test.cc | 2 +- db/blob/db_blob_basic_test.cc | 2 +- db/blob/db_blob_compaction_test.cc | 2 +- db/blob/db_blob_corruption_test.cc | 2 +- db/blob/db_blob_index_test.cc | 3 +-- db/db_basic_test.cc | 4 ++-- db/db_block_cache_test.cc | 4 ++-- db/db_bloom_filter_test.cc | 6 +++--- db/db_compaction_filter_test.cc | 2 +- db/db_compaction_test.cc | 8 ++++---- db/db_dynamic_level_test.cc | 2 +- db/db_encryption_test.cc | 2 +- db/db_flush_test.cc | 2 +- db/db_inplace_update_test.cc | 2 +- db/db_io_failure_test.cc | 3 +-- db/db_iterator_test.cc | 2 +- db/db_kv_checksum_test.cc | 2 +- db/db_log_iter_test.cc | 2 +- db/db_memtable_test.cc | 2 +- db/db_merge_operand_test.cc | 2 +- db/db_merge_operator_test.cc | 2 +- db/db_options_test.cc | 2 +- db/db_properties_test.cc | 2 +- db/db_range_del_test.cc | 2 +- db/db_secondary_test.cc | 2 +- db/db_sst_test.cc | 4 ++-- db/db_statistics_test.cc | 2 +- db/db_table_properties_test.cc | 4 ++-- db/db_tailing_iter_test.cc | 2 +- db/db_test.cc | 2 +- db/db_test2.cc | 12 ++++++------ db/db_universal_compaction_test.cc | 2 +- db/db_wal_test.cc | 2 +- db/db_with_timestamp_compaction_test.cc | 2 +- db/db_write_buffer_manager_test.cc | 2 +- db/db_write_test.cc | 2 +- db/deletefile_test.cc | 2 +- db/error_handler_fs_test.cc | 2 +- db/external_sst_file_basic_test.cc | 2 +- db/external_sst_file_test.cc | 4 ++-- db/import_column_family_test.cc | 2 +- db/listener_test.cc | 2 +- db/obsolete_files_test.cc | 2 +- db/periodic_work_scheduler_test.cc | 2 +- db/repair_test.cc | 2 +- file/prefetch_test.cc | 2 +- monitoring/stats_history_test.cc | 3 +-- util/file_reader_writer_test.cc | 2 +- .../option_change_migration_test.cc | 5 ++--- utilities/persistent_cache/persistent_cache_test.cc | 2 +- utilities/simulator_cache/sim_cache_test.cc | 2 +- 51 files changed, 67 insertions(+), 71 deletions(-) diff --git a/cache/lru_cache_test.cc b/cache/lru_cache_test.cc index a3688b8a2..404530fbe 100644 --- a/cache/lru_cache_test.cc +++ b/cache/lru_cache_test.cc @@ -378,7 +378,7 @@ class TestSecondaryCache : public SecondaryCache { class DBSecondaryCacheTest : public DBTestBase { public: DBSecondaryCacheTest() - : DBTestBase("/db_secondary_cache_test", /*env_do_fsync=*/true) { + : DBTestBase("db_secondary_cache_test", /*env_do_fsync=*/true) { fault_fs_.reset(new FaultInjectionTestFS(env_->GetFileSystem())); fault_env_.reset(new CompositeEnvWrapper(env_, fault_fs_)); } diff --git a/db/blob/db_blob_basic_test.cc b/db/blob/db_blob_basic_test.cc index feee834c5..6e45d160a 100644 --- a/db/blob/db_blob_basic_test.cc +++ b/db/blob/db_blob_basic_test.cc @@ -16,7 +16,7 @@ namespace ROCKSDB_NAMESPACE { class DBBlobBasicTest : public DBTestBase { protected: DBBlobBasicTest() - : DBTestBase("/db_blob_basic_test", /* env_do_fsync */ false) {} + : DBTestBase("db_blob_basic_test", /* env_do_fsync */ false) {} }; TEST_F(DBBlobBasicTest, GetBlob) { diff --git a/db/blob/db_blob_compaction_test.cc b/db/blob/db_blob_compaction_test.cc index 9038c93ff..b23b8ba1c 100644 --- a/db/blob/db_blob_compaction_test.cc +++ b/db/blob/db_blob_compaction_test.cc @@ -15,7 +15,7 @@ namespace ROCKSDB_NAMESPACE { class DBBlobCompactionTest : public DBTestBase { public: explicit DBBlobCompactionTest() - : DBTestBase("/db_blob_compaction_test", /*env_do_fsync=*/false) {} + : DBTestBase("db_blob_compaction_test", /*env_do_fsync=*/false) {} #ifndef ROCKSDB_LITE const std::vector& GetCompactionStats() { diff --git a/db/blob/db_blob_corruption_test.cc b/db/blob/db_blob_corruption_test.cc index 77f11b75a..63e33aacb 100644 --- a/db/blob/db_blob_corruption_test.cc +++ b/db/blob/db_blob_corruption_test.cc @@ -12,7 +12,7 @@ namespace ROCKSDB_NAMESPACE { class DBBlobCorruptionTest : public DBTestBase { protected: DBBlobCorruptionTest() - : DBTestBase("/db_blob_corruption_test", /* env_do_fsync */ false) {} + : DBTestBase("db_blob_corruption_test", /* env_do_fsync */ false) {} void Corrupt(FileType filetype, int offset, int bytes_to_corrupt) { // Pick file to corrupt diff --git a/db/blob/db_blob_index_test.cc b/db/blob/db_blob_index_test.cc index 34bcd9fb5..722c97ff8 100644 --- a/db/blob/db_blob_index_test.cc +++ b/db/blob/db_blob_index_test.cc @@ -41,8 +41,7 @@ class DBBlobIndexTest : public DBTestBase { Tier::kImmutableMemtables, Tier::kL0SstFile, Tier::kLnSstFile}; - DBBlobIndexTest() - : DBTestBase("/db_blob_index_test", /*env_do_fsync=*/true) {} + DBBlobIndexTest() : DBTestBase("db_blob_index_test", /*env_do_fsync=*/true) {} ColumnFamilyHandle* cfh() { return dbfull()->DefaultColumnFamily(); } diff --git a/db/db_basic_test.cc b/db/db_basic_test.cc index 34f27b809..f2d9f9bf7 100644 --- a/db/db_basic_test.cc +++ b/db/db_basic_test.cc @@ -31,7 +31,7 @@ namespace ROCKSDB_NAMESPACE { class DBBasicTest : public DBTestBase { public: - DBBasicTest() : DBTestBase("/db_basic_test", /*env_do_fsync=*/false) {} + DBBasicTest() : DBTestBase("db_basic_test", /*env_do_fsync=*/false) {} }; TEST_F(DBBasicTest, OpenWhenOpen) { @@ -2576,7 +2576,7 @@ class DBBasicTestTrackWal : public DBTestBase, public testing::WithParamInterface { public: DBBasicTestTrackWal() - : DBTestBase("/db_basic_test_track_wal", /*env_do_fsync=*/false) {} + : DBTestBase("db_basic_test_track_wal", /*env_do_fsync=*/false) {} int CountWalFiles() { VectorLogPtr log_files; diff --git a/db/db_block_cache_test.cc b/db/db_block_cache_test.cc index c6bca6acd..6c03dbf44 100644 --- a/db/db_block_cache_test.cc +++ b/db/db_block_cache_test.cc @@ -39,7 +39,7 @@ class DBBlockCacheTest : public DBTestBase { const size_t kValueSize = 100; DBBlockCacheTest() - : DBTestBase("/db_block_cache_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_block_cache_test", /*env_do_fsync=*/true) {} BlockBasedTableOptions GetTableOptions() { BlockBasedTableOptions table_options; @@ -1218,7 +1218,7 @@ class DBBlockCachePinningTest std::tuple> { public: DBBlockCachePinningTest() - : DBTestBase("/db_block_cache_test", /*env_do_fsync=*/false) {} + : DBTestBase("db_block_cache_test", /*env_do_fsync=*/false) {} void SetUp() override { partition_index_and_filters_ = std::get<0>(GetParam()); diff --git a/db/db_bloom_filter_test.cc b/db/db_bloom_filter_test.cc index 8fe58cba1..e4ef68597 100644 --- a/db/db_bloom_filter_test.cc +++ b/db/db_bloom_filter_test.cc @@ -28,7 +28,7 @@ using BFP = BloomFilterPolicy; class DBBloomFilterTest : public DBTestBase { public: DBBloomFilterTest() - : DBTestBase("/db_bloom_filter_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_bloom_filter_test", /*env_do_fsync=*/true) {} }; class DBBloomFilterTestWithParam : public DBTestBase, @@ -42,7 +42,7 @@ class DBBloomFilterTestWithParam : public DBTestBase, public: DBBloomFilterTestWithParam() - : DBTestBase("/db_bloom_filter_tests", /*env_do_fsync=*/true) {} + : DBTestBase("db_bloom_filter_tests", /*env_do_fsync=*/true) {} ~DBBloomFilterTestWithParam() override {} @@ -1094,7 +1094,7 @@ class DBBloomFilterTestVaryPrefixAndFormatVer public: DBBloomFilterTestVaryPrefixAndFormatVer() - : DBTestBase("/db_bloom_filter_tests", /*env_do_fsync=*/true) {} + : DBTestBase("db_bloom_filter_tests", /*env_do_fsync=*/true) {} ~DBBloomFilterTestVaryPrefixAndFormatVer() override {} diff --git a/db/db_compaction_filter_test.cc b/db/db_compaction_filter_test.cc index 904698912..abf8b6c8f 100644 --- a/db/db_compaction_filter_test.cc +++ b/db/db_compaction_filter_test.cc @@ -22,7 +22,7 @@ static std::string NEW_VALUE = "NewValue"; class DBTestCompactionFilter : public DBTestBase { public: DBTestCompactionFilter() - : DBTestBase("/db_compaction_filter_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_compaction_filter_test", /*env_do_fsync=*/true) {} }; // Param variant of DBTestBase::ChangeCompactOptions diff --git a/db/db_compaction_test.cc b/db/db_compaction_test.cc index c54476852..9c9c04f42 100644 --- a/db/db_compaction_test.cc +++ b/db/db_compaction_test.cc @@ -32,7 +32,7 @@ namespace ROCKSDB_NAMESPACE { class DBCompactionTest : public DBTestBase { public: DBCompactionTest() - : DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_compaction_test", /*env_do_fsync=*/true) {} }; class DBCompactionTestWithParam @@ -40,7 +40,7 @@ class DBCompactionTestWithParam public testing::WithParamInterface> { public: DBCompactionTestWithParam() - : DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) { + : DBTestBase("db_compaction_test", /*env_do_fsync=*/true) { max_subcompactions_ = std::get<0>(GetParam()); exclusive_manual_compaction_ = std::get<1>(GetParam()); } @@ -58,7 +58,7 @@ class DBCompactionTestWithBottommostParam public testing::WithParamInterface { public: DBCompactionTestWithBottommostParam() - : DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) { + : DBTestBase("db_compaction_test", /*env_do_fsync=*/true) { bottommost_level_compaction_ = GetParam(); } @@ -5005,7 +5005,7 @@ class CompactionPriTest : public DBTestBase, public testing::WithParamInterface { public: CompactionPriTest() - : DBTestBase("/compaction_pri_test", /*env_do_fsync=*/true) { + : DBTestBase("compaction_pri_test", /*env_do_fsync=*/true) { compaction_pri_ = GetParam(); } diff --git a/db/db_dynamic_level_test.cc b/db/db_dynamic_level_test.cc index 6e2f6a283..18221b4f4 100644 --- a/db/db_dynamic_level_test.cc +++ b/db/db_dynamic_level_test.cc @@ -22,7 +22,7 @@ namespace ROCKSDB_NAMESPACE { class DBTestDynamicLevel : public DBTestBase { public: DBTestDynamicLevel() - : DBTestBase("/db_dynamic_level_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_dynamic_level_test", /*env_do_fsync=*/true) {} }; TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase) { diff --git a/db/db_encryption_test.cc b/db/db_encryption_test.cc index c2ec3ec8a..b7000dd7a 100644 --- a/db/db_encryption_test.cc +++ b/db/db_encryption_test.cc @@ -17,7 +17,7 @@ namespace ROCKSDB_NAMESPACE { class DBEncryptionTest : public DBTestBase { public: DBEncryptionTest() - : DBTestBase("/db_encryption_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_encryption_test", /*env_do_fsync=*/true) {} Env* GetTargetEnv() { if (encrypted_env_ != nullptr) { return (static_cast(encrypted_env_))->target(); diff --git a/db/db_flush_test.cc b/db/db_flush_test.cc index 32fa2f17e..ed1665b68 100644 --- a/db/db_flush_test.cc +++ b/db/db_flush_test.cc @@ -30,7 +30,7 @@ static std::string NEW_VALUE = "NewValue"; class DBFlushTest : public DBTestBase { public: - DBFlushTest() : DBTestBase("/db_flush_test", /*env_do_fsync=*/true) {} + DBFlushTest() : DBTestBase("db_flush_test", /*env_do_fsync=*/true) {} }; class DBFlushDirectIOTest : public DBFlushTest, diff --git a/db/db_inplace_update_test.cc b/db/db_inplace_update_test.cc index 944ca24a7..450782c89 100644 --- a/db/db_inplace_update_test.cc +++ b/db/db_inplace_update_test.cc @@ -14,7 +14,7 @@ namespace ROCKSDB_NAMESPACE { class DBTestInPlaceUpdate : public DBTestBase { public: DBTestInPlaceUpdate() - : DBTestBase("/db_inplace_update_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_inplace_update_test", /*env_do_fsync=*/true) {} }; TEST_F(DBTestInPlaceUpdate, InPlaceUpdate) { diff --git a/db/db_io_failure_test.cc b/db/db_io_failure_test.cc index 232ae649c..da435a3b5 100644 --- a/db/db_io_failure_test.cc +++ b/db/db_io_failure_test.cc @@ -15,8 +15,7 @@ namespace ROCKSDB_NAMESPACE { class DBIOFailureTest : public DBTestBase { public: - DBIOFailureTest() - : DBTestBase("/db_io_failure_test", /*env_do_fsync=*/true) {} + DBIOFailureTest() : DBTestBase("db_io_failure_test", /*env_do_fsync=*/true) {} }; #ifndef ROCKSDB_LITE diff --git a/db/db_iterator_test.cc b/db/db_iterator_test.cc index 559f55570..03d9f37fe 100644 --- a/db/db_iterator_test.cc +++ b/db/db_iterator_test.cc @@ -35,7 +35,7 @@ class DummyReadCallback : public ReadCallback { class DBIteratorTest : public DBTestBase, public testing::WithParamInterface { public: - DBIteratorTest() : DBTestBase("/db_iterator_test", /*env_do_fsync=*/true) {} + DBIteratorTest() : DBTestBase("db_iterator_test", /*env_do_fsync=*/true) {} Iterator* NewIterator(const ReadOptions& read_options, ColumnFamilyHandle* column_family = nullptr) { diff --git a/db/db_kv_checksum_test.cc b/db/db_kv_checksum_test.cc index 244118119..49a341e09 100644 --- a/db/db_kv_checksum_test.cc +++ b/db/db_kv_checksum_test.cc @@ -29,7 +29,7 @@ class DbKvChecksumTest public ::testing::WithParamInterface> { public: DbKvChecksumTest() - : DBTestBase("/db_kv_checksum_test", /*env_do_fsync=*/false) { + : DBTestBase("db_kv_checksum_test", /*env_do_fsync=*/false) { op_type_ = std::get<0>(GetParam()); corrupt_byte_addend_ = std::get<1>(GetParam()); } diff --git a/db/db_log_iter_test.cc b/db/db_log_iter_test.cc index 9baf72037..ae7b4f6c6 100644 --- a/db/db_log_iter_test.cc +++ b/db/db_log_iter_test.cc @@ -21,7 +21,7 @@ namespace ROCKSDB_NAMESPACE { class DBTestXactLogIterator : public DBTestBase { public: DBTestXactLogIterator() - : DBTestBase("/db_log_iter_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_log_iter_test", /*env_do_fsync=*/true) {} std::unique_ptr OpenTransactionLogIter( const SequenceNumber seq) { diff --git a/db/db_memtable_test.cc b/db/db_memtable_test.cc index cc4aaeb81..62b50b60a 100644 --- a/db/db_memtable_test.cc +++ b/db/db_memtable_test.cc @@ -17,7 +17,7 @@ namespace ROCKSDB_NAMESPACE { class DBMemTableTest : public DBTestBase { public: - DBMemTableTest() : DBTestBase("/db_memtable_test", /*env_do_fsync=*/true) {} + DBMemTableTest() : DBTestBase("db_memtable_test", /*env_do_fsync=*/true) {} }; class MockMemTableRep : public MemTableRep { diff --git a/db/db_merge_operand_test.cc b/db/db_merge_operand_test.cc index 45bafb44c..ecbbae780 100644 --- a/db/db_merge_operand_test.cc +++ b/db/db_merge_operand_test.cc @@ -44,7 +44,7 @@ class LimitedStringAppendMergeOp : public StringAppendTESTOperator { class DBMergeOperandTest : public DBTestBase { public: DBMergeOperandTest() - : DBTestBase("/db_merge_operand_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_merge_operand_test", /*env_do_fsync=*/true) {} }; TEST_F(DBMergeOperandTest, GetMergeOperandsBasic) { diff --git a/db/db_merge_operator_test.cc b/db/db_merge_operator_test.cc index 4b819bd62..8e551d08d 100644 --- a/db/db_merge_operator_test.cc +++ b/db/db_merge_operator_test.cc @@ -37,7 +37,7 @@ class TestReadCallback : public ReadCallback { class DBMergeOperatorTest : public DBTestBase { public: DBMergeOperatorTest() - : DBTestBase("/db_merge_operator_test", /*env_do_fsync=*/false) {} + : DBTestBase("db_merge_operator_test", /*env_do_fsync=*/false) {} std::string GetWithReadCallback(SnapshotChecker* snapshot_checker, const Slice& key, diff --git a/db/db_options_test.cc b/db/db_options_test.cc index 08a274c43..676550a0d 100644 --- a/db/db_options_test.cc +++ b/db/db_options_test.cc @@ -27,7 +27,7 @@ namespace ROCKSDB_NAMESPACE { class DBOptionsTest : public DBTestBase { public: - DBOptionsTest() : DBTestBase("/db_options_test", /*env_do_fsync=*/true) {} + DBOptionsTest() : DBTestBase("db_options_test", /*env_do_fsync=*/true) {} #ifndef ROCKSDB_LITE std::unordered_map GetMutableDBOptionsMap( diff --git a/db/db_properties_test.cc b/db/db_properties_test.cc index 8945ee291..8ff4a30b0 100644 --- a/db/db_properties_test.cc +++ b/db/db_properties_test.cc @@ -27,7 +27,7 @@ namespace ROCKSDB_NAMESPACE { class DBPropertiesTest : public DBTestBase { public: DBPropertiesTest() - : DBTestBase("/db_properties_test", /*env_do_fsync=*/false) {} + : DBTestBase("db_properties_test", /*env_do_fsync=*/false) {} }; #ifndef ROCKSDB_LITE diff --git a/db/db_range_del_test.cc b/db/db_range_del_test.cc index 10720e758..8b7bba7cf 100644 --- a/db/db_range_del_test.cc +++ b/db/db_range_del_test.cc @@ -14,7 +14,7 @@ namespace ROCKSDB_NAMESPACE { class DBRangeDelTest : public DBTestBase { public: - DBRangeDelTest() : DBTestBase("/db_range_del_test", /*env_do_fsync=*/false) {} + DBRangeDelTest() : DBTestBase("db_range_del_test", /*env_do_fsync=*/false) {} std::string GetNumericStr(int key) { uint64_t uint64_key = static_cast(key); diff --git a/db/db_secondary_test.cc b/db/db_secondary_test.cc index e3a090d6e..ee270f7aa 100644 --- a/db/db_secondary_test.cc +++ b/db/db_secondary_test.cc @@ -20,7 +20,7 @@ namespace ROCKSDB_NAMESPACE { class DBSecondaryTest : public DBTestBase { public: DBSecondaryTest() - : DBTestBase("/db_secondary_test", /*env_do_fsync=*/true), + : DBTestBase("db_secondary_test", /*env_do_fsync=*/true), secondary_path_(), handles_secondary_(), db_secondary_(nullptr) { diff --git a/db/db_sst_test.cc b/db/db_sst_test.cc index 640b4f5a2..77984758f 100644 --- a/db/db_sst_test.cc +++ b/db/db_sst_test.cc @@ -18,7 +18,7 @@ namespace ROCKSDB_NAMESPACE { class DBSSTTest : public DBTestBase { public: - DBSSTTest() : DBTestBase("/db_sst_test", /*env_do_fsync=*/true) {} + DBSSTTest() : DBTestBase("db_sst_test", /*env_do_fsync=*/true) {} }; #ifndef ROCKSDB_LITE @@ -757,7 +757,7 @@ class DBWALTestWithParam public testing::WithParamInterface> { public: explicit DBWALTestWithParam() - : DBTestBase("/db_wal_test_with_params", /*env_do_fsync=*/true) { + : DBTestBase("db_wal_test_with_params", /*env_do_fsync=*/true) { wal_dir_ = std::get<0>(GetParam()); wal_dir_same_as_dbname_ = std::get<1>(GetParam()); } diff --git a/db/db_statistics_test.cc b/db/db_statistics_test.cc index 0874eb40b..6cd0440f4 100644 --- a/db/db_statistics_test.cc +++ b/db/db_statistics_test.cc @@ -16,7 +16,7 @@ namespace ROCKSDB_NAMESPACE { class DBStatisticsTest : public DBTestBase { public: DBStatisticsTest() - : DBTestBase("/db_statistics_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_statistics_test", /*env_do_fsync=*/true) {} }; TEST_F(DBStatisticsTest, CompressionStatsTest) { diff --git a/db/db_table_properties_test.cc b/db/db_table_properties_test.cc index 96cbe9f1a..4771f384d 100644 --- a/db/db_table_properties_test.cc +++ b/db/db_table_properties_test.cc @@ -52,7 +52,7 @@ class DBTablePropertiesTest : public DBTestBase, public testing::WithParamInterface { public: DBTablePropertiesTest() - : DBTestBase("/db_table_properties_test", /*env_do_fsync=*/false) {} + : DBTestBase("db_table_properties_test", /*env_do_fsync=*/false) {} TablePropertiesCollection TestGetPropertiesOfTablesInRange( std::vector ranges, std::size_t* num_properties = nullptr, std::size_t* num_files = nullptr); @@ -281,7 +281,7 @@ class DBTableHostnamePropertyTest public ::testing::WithParamInterface> { public: DBTableHostnamePropertyTest() - : DBTestBase("/db_table_hostname_property_test", + : DBTestBase("db_table_hostname_property_test", /*env_do_fsync=*/false) {} }; diff --git a/db/db_tailing_iter_test.cc b/db/db_tailing_iter_test.cc index d77168d96..c92628ad1 100644 --- a/db/db_tailing_iter_test.cc +++ b/db/db_tailing_iter_test.cc @@ -21,7 +21,7 @@ namespace ROCKSDB_NAMESPACE { class DBTestTailingIterator : public DBTestBase { public: DBTestTailingIterator() - : DBTestBase("/db_tailing_iterator_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_tailing_iterator_test", /*env_do_fsync=*/true) {} }; TEST_F(DBTestTailingIterator, TailingIteratorSingle) { diff --git a/db/db_test.cc b/db/db_test.cc index e34a41def..9dbc9ecd5 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -75,7 +75,7 @@ namespace ROCKSDB_NAMESPACE { // If fsync needs to be covered in a test, put it in other places. class DBTest : public DBTestBase { public: - DBTest() : DBTestBase("/db_test", /*env_do_fsync=*/false) {} + DBTest() : DBTestBase("db_test", /*env_do_fsync=*/false) {} }; class DBTestWithParam diff --git a/db/db_test2.cc b/db/db_test2.cc index 31854d4cd..533b61db9 100644 --- a/db/db_test2.cc +++ b/db/db_test2.cc @@ -25,7 +25,7 @@ namespace ROCKSDB_NAMESPACE { class DBTest2 : public DBTestBase { public: - DBTest2() : DBTestBase("/db_test2", /*env_do_fsync=*/true) {} + DBTest2() : DBTestBase("db_test2", /*env_do_fsync=*/true) {} }; #ifndef ROCKSDB_LITE @@ -91,7 +91,7 @@ class TestReadOnlyWithCompressedCache public testing::WithParamInterface> { public: TestReadOnlyWithCompressedCache() - : DBTestBase("/test_readonly_with_compressed_cache", + : DBTestBase("test_readonly_with_compressed_cache", /*env_do_fsync=*/true) { max_open_files_ = std::get<0>(GetParam()); use_mmap_ = std::get<1>(GetParam()); @@ -193,7 +193,7 @@ class PrefixFullBloomWithReverseComparator public ::testing::WithParamInterface { public: PrefixFullBloomWithReverseComparator() - : DBTestBase("/prefix_bloom_reverse", /*env_do_fsync=*/true) {} + : DBTestBase("prefix_bloom_reverse", /*env_do_fsync=*/true) {} void SetUp() override { if_cache_filter_ = GetParam(); } bool if_cache_filter_; }; @@ -333,7 +333,7 @@ class DBTestSharedWriteBufferAcrossCFs public testing::WithParamInterface> { public: DBTestSharedWriteBufferAcrossCFs() - : DBTestBase("/db_test_shared_write_buffer", /*env_do_fsync=*/true) {} + : DBTestBase("db_test_shared_write_buffer", /*env_do_fsync=*/true) {} void SetUp() override { use_old_interface_ = std::get<0>(GetParam()); cost_cache_ = std::get<1>(GetParam()); @@ -1413,7 +1413,7 @@ class PresetCompressionDictTest public testing::WithParamInterface> { public: PresetCompressionDictTest() - : DBTestBase("/db_test2", false /* env_do_fsync */), + : DBTestBase("db_test2", false /* env_do_fsync */), compression_type_(std::get<0>(GetParam())), bottommost_(std::get<1>(GetParam())) {} @@ -2041,7 +2041,7 @@ class PinL0IndexAndFilterBlocksTest public testing::WithParamInterface> { public: PinL0IndexAndFilterBlocksTest() - : DBTestBase("/db_pin_l0_index_bloom_test", /*env_do_fsync=*/true) {} + : DBTestBase("db_pin_l0_index_bloom_test", /*env_do_fsync=*/true) {} void SetUp() override { infinite_max_files_ = std::get<0>(GetParam()); disallow_preload_ = std::get<1>(GetParam()); diff --git a/db/db_universal_compaction_test.cc b/db/db_universal_compaction_test.cc index 38636bc9c..e7dceb812 100644 --- a/db/db_universal_compaction_test.cc +++ b/db/db_universal_compaction_test.cc @@ -45,7 +45,7 @@ class DBTestUniversalCompaction : public DBTestUniversalCompactionBase { class DBTestUniversalCompaction2 : public DBTestBase { public: DBTestUniversalCompaction2() - : DBTestBase("/db_universal_compaction_test2", /*env_do_fsync=*/false) {} + : DBTestBase("db_universal_compaction_test2", /*env_do_fsync=*/false) {} }; namespace { diff --git a/db/db_wal_test.cc b/db/db_wal_test.cc index dd632742e..85e4cd103 100644 --- a/db/db_wal_test.cc +++ b/db/db_wal_test.cc @@ -119,7 +119,7 @@ class EnrichedSpecialEnv : public SpecialEnv { class DBWALTestWithEnrichedEnv : public DBTestBase { public: DBWALTestWithEnrichedEnv() - : DBTestBase("/db_wal_test", /*env_do_fsync=*/true) { + : DBTestBase("db_wal_test", /*env_do_fsync=*/true) { enriched_env_ = new EnrichedSpecialEnv(env_->target()); auto options = CurrentOptions(); options.env = enriched_env_; diff --git a/db/db_with_timestamp_compaction_test.cc b/db/db_with_timestamp_compaction_test.cc index 6b74fa21f..de449e962 100644 --- a/db/db_with_timestamp_compaction_test.cc +++ b/db/db_with_timestamp_compaction_test.cc @@ -31,7 +31,7 @@ std::string Timestamp(uint64_t ts) { class TimestampCompatibleCompactionTest : public DBTestBase { public: TimestampCompatibleCompactionTest() - : DBTestBase("/ts_compatible_compaction_test", /*env_do_fsync=*/true) {} + : DBTestBase("ts_compatible_compaction_test", /*env_do_fsync=*/true) {} std::string Get(const std::string& key, uint64_t ts) { ReadOptions read_opts; diff --git a/db/db_write_buffer_manager_test.cc b/db/db_write_buffer_manager_test.cc index 0ae744752..7a1eb35b5 100644 --- a/db/db_write_buffer_manager_test.cc +++ b/db/db_write_buffer_manager_test.cc @@ -17,7 +17,7 @@ class DBWriteBufferManagerTest : public DBTestBase, public testing::WithParamInterface { public: DBWriteBufferManagerTest() - : DBTestBase("/db_write_buffer_manager_test", /*env_do_fsync=*/false) {} + : DBTestBase("db_write_buffer_manager_test", /*env_do_fsync=*/false) {} bool cost_cache_; }; diff --git a/db/db_write_test.cc b/db/db_write_test.cc index 4a8f90c2c..3b0453bfe 100644 --- a/db/db_write_test.cc +++ b/db/db_write_test.cc @@ -24,7 +24,7 @@ namespace ROCKSDB_NAMESPACE { // Test variations of WriteImpl. class DBWriteTest : public DBTestBase, public testing::WithParamInterface { public: - DBWriteTest() : DBTestBase("/db_write_test", /*env_do_fsync=*/true) {} + DBWriteTest() : DBTestBase("db_write_test", /*env_do_fsync=*/true) {} Options GetOptions() { return DBTestBase::GetOptions(GetParam()); } diff --git a/db/deletefile_test.cc b/db/deletefile_test.cc index 38bc49602..924d71e50 100644 --- a/db/deletefile_test.cc +++ b/db/deletefile_test.cc @@ -35,7 +35,7 @@ class DeleteFileTest : public DBTestBase { const std::string wal_dir_; DeleteFileTest() - : DBTestBase("/deletefile_test", /*env_do_fsync=*/true), + : DBTestBase("deletefile_test", /*env_do_fsync=*/true), numlevels_(7), wal_dir_(dbname_ + "/wal_files") {} diff --git a/db/error_handler_fs_test.cc b/db/error_handler_fs_test.cc index e0456a827..f360dc581 100644 --- a/db/error_handler_fs_test.cc +++ b/db/error_handler_fs_test.cc @@ -25,7 +25,7 @@ namespace ROCKSDB_NAMESPACE { class DBErrorHandlingFSTest : public DBTestBase { public: DBErrorHandlingFSTest() - : DBTestBase("/db_error_handling_fs_test", /*env_do_fsync=*/true) { + : DBTestBase("db_error_handling_fs_test", /*env_do_fsync=*/true) { fault_fs_.reset(new FaultInjectionTestFS(env_->GetFileSystem())); fault_env_.reset(new CompositeEnvWrapper(env_, fault_fs_)); } diff --git a/db/external_sst_file_basic_test.cc b/db/external_sst_file_basic_test.cc index 035cb3698..7bc3793d9 100644 --- a/db/external_sst_file_basic_test.cc +++ b/db/external_sst_file_basic_test.cc @@ -22,7 +22,7 @@ class ExternalSSTFileBasicTest public ::testing::WithParamInterface> { public: ExternalSSTFileBasicTest() - : DBTestBase("/external_sst_file_basic_test", /*env_do_fsync=*/true) { + : DBTestBase("external_sst_file_basic_test", /*env_do_fsync=*/true) { sst_files_dir_ = dbname_ + "/sst_files/"; fault_injection_test_env_.reset(new FaultInjectionTestEnv(env_)); DestroyAndRecreateExternalSSTFilesDir(); diff --git a/db/external_sst_file_test.cc b/db/external_sst_file_test.cc index 66850c0a2..633a0ddac 100644 --- a/db/external_sst_file_test.cc +++ b/db/external_sst_file_test.cc @@ -45,7 +45,7 @@ class ExternSSTFileLinkFailFallbackTest public ::testing::WithParamInterface> { public: ExternSSTFileLinkFailFallbackTest() - : DBTestBase("/external_sst_file_test", /*env_do_fsync=*/true), + : DBTestBase("external_sst_file_test", /*env_do_fsync=*/true), test_env_(new ExternalSSTTestEnv(env_, true)) { sst_files_dir_ = dbname_ + "/sst_files/"; EXPECT_EQ(DestroyDir(env_, sst_files_dir_), Status::OK()); @@ -74,7 +74,7 @@ class ExternalSSTFileTest public ::testing::WithParamInterface> { public: ExternalSSTFileTest() - : DBTestBase("/external_sst_file_test", /*env_do_fsync=*/true) { + : DBTestBase("external_sst_file_test", /*env_do_fsync=*/true) { sst_files_dir_ = dbname_ + "/sst_files/"; DestroyAndRecreateExternalSSTFilesDir(); } diff --git a/db/import_column_family_test.cc b/db/import_column_family_test.cc index 3e76db76c..e459e935e 100644 --- a/db/import_column_family_test.cc +++ b/db/import_column_family_test.cc @@ -14,7 +14,7 @@ namespace ROCKSDB_NAMESPACE { class ImportColumnFamilyTest : public DBTestBase { public: ImportColumnFamilyTest() - : DBTestBase("/import_column_family_test", /*env_do_fsync=*/true) { + : DBTestBase("import_column_family_test", /*env_do_fsync=*/true) { sst_files_dir_ = dbname_ + "/sst_files/"; export_files_dir_ = test::PerThreadDBPath(env_, "export"); DestroyAndRecreateExternalSSTFilesDir(); diff --git a/db/listener_test.cc b/db/listener_test.cc index 7c6eb9fe0..c2fb90b56 100644 --- a/db/listener_test.cc +++ b/db/listener_test.cc @@ -38,7 +38,7 @@ namespace ROCKSDB_NAMESPACE { class EventListenerTest : public DBTestBase { public: - EventListenerTest() : DBTestBase("/listener_test", /*env_do_fsync=*/true) {} + EventListenerTest() : DBTestBase("listener_test", /*env_do_fsync=*/true) {} static std::string BlobStr(uint64_t blob_file_number, uint64_t offset, uint64_t size) { diff --git a/db/obsolete_files_test.cc b/db/obsolete_files_test.cc index 6cff8b380..3d18196e6 100644 --- a/db/obsolete_files_test.cc +++ b/db/obsolete_files_test.cc @@ -34,7 +34,7 @@ namespace ROCKSDB_NAMESPACE { class ObsoleteFilesTest : public DBTestBase { public: ObsoleteFilesTest() - : DBTestBase("/obsolete_files_test", /*env_do_fsync=*/true), + : DBTestBase("obsolete_files_test", /*env_do_fsync=*/true), wal_dir_(dbname_ + "/wal_files") {} void AddKeys(int numkeys, int startkey) { diff --git a/db/periodic_work_scheduler_test.cc b/db/periodic_work_scheduler_test.cc index a92b8730f..acddad9f8 100644 --- a/db/periodic_work_scheduler_test.cc +++ b/db/periodic_work_scheduler_test.cc @@ -15,7 +15,7 @@ namespace ROCKSDB_NAMESPACE { class PeriodicWorkSchedulerTest : public DBTestBase { public: PeriodicWorkSchedulerTest() - : DBTestBase("/periodic_work_scheduler_test", /*env_do_fsync=*/true) { + : DBTestBase("periodic_work_scheduler_test", /*env_do_fsync=*/true) { mock_clock_ = std::make_shared(env_->GetSystemClock()); mock_env_.reset(new CompositeEnvWrapper(env_, mock_clock_)); } diff --git a/db/repair_test.cc b/db/repair_test.cc index 9ea2d9460..8e7551a98 100644 --- a/db/repair_test.cc +++ b/db/repair_test.cc @@ -22,7 +22,7 @@ namespace ROCKSDB_NAMESPACE { #ifndef ROCKSDB_LITE class RepairTest : public DBTestBase { public: - RepairTest() : DBTestBase("/repair_test", /*env_do_fsync=*/true) {} + RepairTest() : DBTestBase("repair_test", /*env_do_fsync=*/true) {} Status GetFirstSstPath(std::string* first_sst_path) { assert(first_sst_path != nullptr); diff --git a/file/prefetch_test.cc b/file/prefetch_test.cc index 79b56b944..ce4ac37ae 100644 --- a/file/prefetch_test.cc +++ b/file/prefetch_test.cc @@ -70,7 +70,7 @@ class PrefetchTest : public DBTestBase, public ::testing::WithParamInterface> { public: - PrefetchTest() : DBTestBase("/prefetch_test", true) {} + PrefetchTest() : DBTestBase("prefetch_test", true) {} }; INSTANTIATE_TEST_CASE_P(PrefetchTest, PrefetchTest, diff --git a/monitoring/stats_history_test.cc b/monitoring/stats_history_test.cc index 187bf6e9d..294b9ba68 100644 --- a/monitoring/stats_history_test.cc +++ b/monitoring/stats_history_test.cc @@ -32,8 +32,7 @@ namespace ROCKSDB_NAMESPACE { #ifndef ROCKSDB_LITE class StatsHistoryTest : public DBTestBase { public: - StatsHistoryTest() - : DBTestBase("/stats_history_test", /*env_do_fsync=*/true) { + StatsHistoryTest() : DBTestBase("stats_history_test", /*env_do_fsync=*/true) { mock_clock_ = std::make_shared(env_->GetSystemClock()); mock_env_.reset(new CompositeEnvWrapper(env_, mock_clock_)); } diff --git a/util/file_reader_writer_test.cc b/util/file_reader_writer_test.cc index a6e53223b..b7e1c2d41 100644 --- a/util/file_reader_writer_test.cc +++ b/util/file_reader_writer_test.cc @@ -237,7 +237,7 @@ TEST_F(WritableFileWriterTest, IncrementalBuffer) { class DBWritableFileWriterTest : public DBTestBase { public: DBWritableFileWriterTest() - : DBTestBase("/db_secondary_cache_test", /*env_do_fsync=*/true) { + : DBTestBase("db_secondary_cache_test", /*env_do_fsync=*/true) { fault_fs_.reset(new FaultInjectionTestFS(env_->GetFileSystem())); fault_env_.reset(new CompositeEnvWrapper(env_, fault_fs_)); } diff --git a/utilities/option_change_migration/option_change_migration_test.cc b/utilities/option_change_migration/option_change_migration_test.cc index 126bebea1..d508e7321 100644 --- a/utilities/option_change_migration/option_change_migration_test.cc +++ b/utilities/option_change_migration/option_change_migration_test.cc @@ -23,7 +23,7 @@ class DBOptionChangeMigrationTests std::tuple> { public: DBOptionChangeMigrationTests() - : DBTestBase("/db_option_change_migration_test", /*env_do_fsync=*/true) { + : DBTestBase("db_option_change_migration_test", /*env_do_fsync=*/true) { level1_ = std::get<0>(GetParam()); compaction_style1_ = std::get<1>(GetParam()); is_dynamic1_ = std::get<2>(GetParam()); @@ -376,8 +376,7 @@ INSTANTIATE_TEST_CASE_P( class DBOptionChangeMigrationTest : public DBTestBase { public: DBOptionChangeMigrationTest() - : DBTestBase("/db_option_change_migration_test2", /*env_do_fsync=*/true) { - } + : DBTestBase("db_option_change_migration_test2", /*env_do_fsync=*/true) {} }; TEST_F(DBOptionChangeMigrationTest, CompactedSrcToUniversal) { diff --git a/utilities/persistent_cache/persistent_cache_test.cc b/utilities/persistent_cache/persistent_cache_test.cc index defff0f21..5fd8a0d24 100644 --- a/utilities/persistent_cache/persistent_cache_test.cc +++ b/utilities/persistent_cache/persistent_cache_test.cc @@ -277,7 +277,7 @@ TEST_F(PersistentCacheTierTest, FactoryTest) { } PersistentCacheDBTest::PersistentCacheDBTest() - : DBTestBase("/cache_test", /*env_do_fsync=*/true) { + : DBTestBase("cache_test", /*env_do_fsync=*/true) { #ifdef OS_LINUX ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing(); ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack( diff --git a/utilities/simulator_cache/sim_cache_test.cc b/utilities/simulator_cache/sim_cache_test.cc index 3976c5583..ee01faf64 100644 --- a/utilities/simulator_cache/sim_cache_test.cc +++ b/utilities/simulator_cache/sim_cache_test.cc @@ -23,7 +23,7 @@ class SimCacheTest : public DBTestBase { const size_t kNumBlocks = 5; const size_t kValueSize = 1000; - SimCacheTest() : DBTestBase("/sim_cache_test", /*env_do_fsync=*/true) {} + SimCacheTest() : DBTestBase("sim_cache_test", /*env_do_fsync=*/true) {} BlockBasedTableOptions GetTableOptions() { BlockBasedTableOptions table_options;