diff options
author | yuzhangyu@fb.com <yuzhangyu@fb.com> | 2024-03-04 10:08:32 -0800 |
---|---|---|
committer | Facebook GitHub Bot <facebook-github-bot@users.noreply.github.com> | 2024-03-04 10:08:32 -0800 |
commit | 1cfdece85ddc9450d24c3007222195e46e1cc0a8 (patch) | |
tree | 476a0be6d7d66d75bb141f83b1f57c81273a31b7 /cache | |
parent | d7b875697669e1a92b28fcdab6416275b95da4b9 (diff) |
Run internal cpp modernizer on RocksDB repo (#12398)
Summary:
When internal cpp modernizer attempts to format rocksdb code, it will replace macro `ROCKSDB_NAMESPACE` with its default definition `rocksdb` when collapsing nested namespace. We filed a feedback for the tool T180254030 and the team filed a bug for this: https://github.com/llvm/llvm-project/issues/83452. At the same time, they suggested us to run the modernizer tool ourselves so future auto codemod attempts will be smaller. This diff contains:
Running
`xplat/scripts/codemod_service/cpp_modernizer.sh`
in fbcode/internal_repo_rocksdb/repo (excluding some directories in utilities/transactions/lock/range/range_tree/lib that has a non meta copyright comment)
without swapping out the namespace macro `ROCKSDB_NAMESPACE`
Followed by RocksDB's own
`make format`
Pull Request resolved: https://github.com/facebook/rocksdb/pull/12398
Test Plan: Auto tests
Reviewed By: hx235
Differential Revision: D54382532
Pulled By: jowlyzhang
fbshipit-source-id: e7d5b40f9b113b60e5a503558c181f080b9d02fa
Diffstat (limited to 'cache')
-rw-r--r-- | cache/cache_bench_tool.cc | 4 | ||||
-rw-r--r-- | cache/cache_test.cc | 8 | ||||
-rw-r--r-- | cache/compressed_secondary_cache.cc | 2 | ||||
-rw-r--r-- | cache/compressed_secondary_cache_test.cc | 2 | ||||
-rw-r--r-- | cache/lru_cache_test.cc | 6 | ||||
-rw-r--r-- | cache/tiered_secondary_cache_test.cc | 34 |
6 files changed, 29 insertions, 27 deletions
diff --git a/cache/cache_bench_tool.cc b/cache/cache_bench_tool.cc index 07cd1a1f6..041bf34bc 100644 --- a/cache/cache_bench_tool.cc +++ b/cache/cache_bench_tool.cc @@ -194,7 +194,7 @@ class SharedState { : cv_(&mu_), cache_bench_(cache_bench) {} - ~SharedState() {} + ~SharedState() = default; port::Mutex* GetMutex() { return &mu_; } @@ -425,7 +425,7 @@ class CacheBench { } } - ~CacheBench() {} + ~CacheBench() = default; void PopulateCache() { Random64 rnd(FLAGS_seed); diff --git a/cache/cache_test.cc b/cache/cache_test.cc index f21efc47a..adc354a8f 100644 --- a/cache/cache_test.cc +++ b/cache/cache_test.cc @@ -106,7 +106,7 @@ class CacheTest : public testing::Test, type_ = GetParam(); } - ~CacheTest() override {} + ~CacheTest() override = default; // These functions encode/decode keys in tests cases that use // int keys. @@ -766,7 +766,9 @@ TEST_P(CacheTest, OverCapacity) { std::string key = EncodeKey(i + 1); auto h = cache.Lookup(key); ASSERT_TRUE(h != nullptr); - if (h) cache.Release(h); + if (h) { + cache.Release(h); + } } // the cache is over capacity since nothing could be evicted @@ -777,7 +779,7 @@ TEST_P(CacheTest, OverCapacity) { if (IsHyperClock()) { // Make sure eviction is triggered. - ASSERT_OK(cache.Insert(EncodeKey(-1), nullptr, 1, &handles[0])); + ASSERT_OK(cache.Insert(EncodeKey(-1), nullptr, 1, handles.data())); // cache is under capacity now since elements were released ASSERT_GE(n, cache.get()->GetUsage()); diff --git a/cache/compressed_secondary_cache.cc b/cache/compressed_secondary_cache.cc index 9e6cd7b5e..ef2417f8d 100644 --- a/cache/compressed_secondary_cache.cc +++ b/cache/compressed_secondary_cache.cc @@ -26,7 +26,7 @@ CompressedSecondaryCache::CompressedSecondaryCache( cache_))), disable_cache_(opts.capacity == 0) {} -CompressedSecondaryCache::~CompressedSecondaryCache() {} +CompressedSecondaryCache::~CompressedSecondaryCache() = default; std::unique_ptr<SecondaryCacheResultHandle> CompressedSecondaryCache::Lookup( const Slice& key, const Cache::CacheItemHelper* helper, diff --git a/cache/compressed_secondary_cache_test.cc b/cache/compressed_secondary_cache_test.cc index 15eb05d5e..058a80dd7 100644 --- a/cache/compressed_secondary_cache_test.cc +++ b/cache/compressed_secondary_cache_test.cc @@ -33,7 +33,7 @@ const std::string key3 = "____ ____key3"; class CompressedSecondaryCacheTestBase : public testing::Test, public WithCacheType { public: - CompressedSecondaryCacheTestBase() {} + CompressedSecondaryCacheTestBase() = default; ~CompressedSecondaryCacheTestBase() override = default; protected: diff --git a/cache/lru_cache_test.cc b/cache/lru_cache_test.cc index 587fbfd2c..13cb52f4a 100644 --- a/cache/lru_cache_test.cc +++ b/cache/lru_cache_test.cc @@ -32,7 +32,7 @@ namespace ROCKSDB_NAMESPACE { class LRUCacheTest : public testing::Test { public: - LRUCacheTest() {} + LRUCacheTest() = default; ~LRUCacheTest() override { DeleteCache(); } void DeleteCache() { @@ -378,7 +378,7 @@ class ClockCacheTest : public testing::Test { using Table = typename Shard::Table; using TableOpts = typename Table::Opts; - ClockCacheTest() {} + ClockCacheTest() = default; ~ClockCacheTest() override { DeleteShard(); } void DeleteShard() { @@ -1976,7 +1976,7 @@ TEST_P(BasicSecondaryCacheTest, BasicWaitAllTest) { ah.priority = Cache::Priority::LOW; cache->StartAsyncLookup(ah); } - cache->WaitAll(&async_handles[0], async_handles.size()); + cache->WaitAll(async_handles.data(), async_handles.size()); for (size_t i = 0; i < async_handles.size(); ++i) { SCOPED_TRACE("i = " + std::to_string(i)); Cache::Handle* result = async_handles[i].Result(); diff --git a/cache/tiered_secondary_cache_test.cc b/cache/tiered_secondary_cache_test.cc index 28a393325..6a43b6dd5 100644 --- a/cache/tiered_secondary_cache_test.cc +++ b/cache/tiered_secondary_cache_test.cc @@ -386,7 +386,7 @@ TEST_F(DBTieredSecondaryCacheTest, BasicMultiGetTest) { keys.push_back(Key(8)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 3u); @@ -400,7 +400,7 @@ TEST_F(DBTieredSecondaryCacheTest, BasicMultiGetTest) { keys.push_back(Key(20)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -414,7 +414,7 @@ TEST_F(DBTieredSecondaryCacheTest, BasicMultiGetTest) { keys.push_back(Key(8)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -428,7 +428,7 @@ TEST_F(DBTieredSecondaryCacheTest, BasicMultiGetTest) { keys.push_back(Key(8)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -442,7 +442,7 @@ TEST_F(DBTieredSecondaryCacheTest, BasicMultiGetTest) { keys.push_back(Key(8)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -456,7 +456,7 @@ TEST_F(DBTieredSecondaryCacheTest, BasicMultiGetTest) { keys.push_back(Key(20)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -470,7 +470,7 @@ TEST_F(DBTieredSecondaryCacheTest, BasicMultiGetTest) { keys.push_back(Key(20)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -484,7 +484,7 @@ TEST_F(DBTieredSecondaryCacheTest, BasicMultiGetTest) { keys.push_back(Key(20)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -528,7 +528,7 @@ TEST_F(DBTieredSecondaryCacheTest, WaitAllTest) { keys.push_back(Key(8)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 3u); @@ -542,7 +542,7 @@ TEST_F(DBTieredSecondaryCacheTest, WaitAllTest) { keys.push_back(Key(20)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -561,7 +561,7 @@ TEST_F(DBTieredSecondaryCacheTest, WaitAllTest) { keys.push_back(Key(36)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 10u); @@ -582,7 +582,7 @@ TEST_F(DBTieredSecondaryCacheTest, WaitAllTest) { keys.push_back(Key(8)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 10u); @@ -629,7 +629,7 @@ TEST_F(DBTieredSecondaryCacheTest, ReadyBeforeWaitAllTest) { keys.push_back(Key(8)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 3u); @@ -644,7 +644,7 @@ TEST_F(DBTieredSecondaryCacheTest, ReadyBeforeWaitAllTest) { keys.push_back(Key(20)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -659,7 +659,7 @@ TEST_F(DBTieredSecondaryCacheTest, ReadyBeforeWaitAllTest) { keys.push_back(Key(8)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u); @@ -676,7 +676,7 @@ TEST_F(DBTieredSecondaryCacheTest, ReadyBeforeWaitAllTest) { keys.push_back(Key(36)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 8u); @@ -691,7 +691,7 @@ TEST_F(DBTieredSecondaryCacheTest, ReadyBeforeWaitAllTest) { keys.push_back(Key(36)); values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true); ASSERT_EQ(values.size(), keys.size()); - for (auto value : values) { + for (const auto& value : values) { ASSERT_EQ(1007, value.size()); } ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 8u); |