From aca00006bf9de45c1e45991316b8c92cb2b3c7e1 Mon Sep 17 00:00:00 2001 From: changyubi Date: Mon, 24 Oct 2022 20:32:25 -0700 Subject: [PATCH] clang format files under test_util/ (#10855) Summary: Ran `find . -iname '*.h' -o -iname '*.cc' | xargs clang-format -i` under test_util/. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10855 Test Plan: existing CI. Reviewed By: siying Differential Revision: D40652583 Pulled By: cbi42 fbshipit-source-id: ed0fbcfe17b6f9ec217a64b80d6d43dfbf1cc34e --- test_util/sync_point.cc | 26 ++++++++----------------- test_util/sync_point.h | 4 ++-- test_util/sync_point_impl.cc | 7 ++++--- test_util/sync_point_impl.h | 31 +++++++++++++----------------- test_util/testharness.cc | 3 +-- test_util/testutil.h | 13 ++++++------- test_util/transaction_test_util.cc | 7 +++---- test_util/transaction_test_util.h | 2 +- 8 files changed, 38 insertions(+), 55 deletions(-) diff --git a/test_util/sync_point.cc b/test_util/sync_point.cc index 067fc8234..bec02d4f6 100644 --- a/test_util/sync_point.cc +++ b/test_util/sync_point.cc @@ -21,22 +21,20 @@ SyncPoint* SyncPoint::GetInstance() { SyncPoint::SyncPoint() : impl_(new Data) {} -SyncPoint:: ~SyncPoint() { - delete impl_; -} +SyncPoint::~SyncPoint() { delete impl_; } void SyncPoint::LoadDependency(const std::vector& dependencies) { impl_->LoadDependency(dependencies); } void SyncPoint::LoadDependencyAndMarkers( - const std::vector& dependencies, - const std::vector& markers) { + const std::vector& dependencies, + const std::vector& markers) { impl_->LoadDependencyAndMarkers(dependencies, markers); } void SyncPoint::SetCallBack(const std::string& point, - const std::function& callback) { + const std::function& callback) { impl_->SetCallBack(point, callback); } @@ -44,21 +42,13 @@ void SyncPoint::ClearCallBack(const std::string& point) { impl_->ClearCallBack(point); } -void SyncPoint::ClearAllCallBacks() { - impl_->ClearAllCallBacks(); -} +void SyncPoint::ClearAllCallBacks() { impl_->ClearAllCallBacks(); } -void SyncPoint::EnableProcessing() { - impl_->EnableProcessing(); -} +void SyncPoint::EnableProcessing() { impl_->EnableProcessing(); } -void SyncPoint::DisableProcessing() { - impl_->DisableProcessing(); -} +void SyncPoint::DisableProcessing() { impl_->DisableProcessing(); } -void SyncPoint::ClearTrace() { - impl_->ClearTrace(); -} +void SyncPoint::ClearTrace() { impl_->ClearTrace(); } void SyncPoint::Process(const Slice& point, void* cb_arg) { impl_->Process(point, cb_arg); diff --git a/test_util/sync_point.h b/test_util/sync_point.h index 410176dc8..65f1239ec 100644 --- a/test_util/sync_point.h +++ b/test_util/sync_point.h @@ -138,9 +138,9 @@ class SyncPoint { struct Data; private: - // Singleton + // Singleton SyncPoint(); - Data* impl_; + Data* impl_; }; // Sets up sync points to mock direct IO instead of actually issuing direct IO diff --git a/test_util/sync_point_impl.cc b/test_util/sync_point_impl.cc index 4add49889..2a4bd3ccd 100644 --- a/test_util/sync_point_impl.cc +++ b/test_util/sync_point_impl.cc @@ -37,7 +37,8 @@ void KillPoint::TestKillRandom(std::string kill_point, int odds_weight, } } -void SyncPoint::Data::LoadDependency(const std::vector& dependencies) { +void SyncPoint::Data::LoadDependency( + const std::vector& dependencies) { std::lock_guard lock(mutex_); successors_.clear(); predecessors_.clear(); @@ -52,8 +53,8 @@ void SyncPoint::Data::LoadDependency(const std::vector& dependenc } void SyncPoint::Data::LoadDependencyAndMarkers( - const std::vector& dependencies, - const std::vector& markers) { + const std::vector& dependencies, + const std::vector& markers) { std::lock_guard lock(mutex_); successors_.clear(); predecessors_.clear(); diff --git a/test_util/sync_point_impl.h b/test_util/sync_point_impl.h index 526018040..64cc0445e 100644 --- a/test_util/sync_point_impl.h +++ b/test_util/sync_point_impl.h @@ -52,11 +52,11 @@ struct SyncPoint::Data { // successor/predecessor map loaded from LoadDependency std::unordered_map> successors_; std::unordered_map> predecessors_; - std::unordered_map > callbacks_; - std::unordered_map > markers_; + std::unordered_map> callbacks_; + std::unordered_map> markers_; std::unordered_map marked_thread_id_; - std::mutex mutex_; + std::mutex mutex_; std::condition_variable cv_; // sync points that have been passed through std::unordered_set cleared_points_; @@ -68,29 +68,24 @@ struct SyncPoint::Data { void LoadDependency(const std::vector& dependencies); void LoadDependencyAndMarkers(const std::vector& dependencies, - const std::vector& markers); + const std::vector& markers); bool PredecessorsAllCleared(const std::string& point); void SetCallBack(const std::string& point, - const std::function& callback) { - std::lock_guard lock(mutex_); - callbacks_[point] = callback; - point_filter_.Add(point); -} + const std::function& callback) { + std::lock_guard lock(mutex_); + callbacks_[point] = callback; + point_filter_.Add(point); + } void ClearCallBack(const std::string& point); void ClearAllCallBacks(); - void EnableProcessing() { - enabled_ = true; - } - void DisableProcessing() { - enabled_ = false; - } + void EnableProcessing() { enabled_ = true; } + void DisableProcessing() { enabled_ = false; } void ClearTrace() { std::lock_guard lock(mutex_); cleared_points_.clear(); } - bool DisabledByMarker(const std::string& point, - std::thread::id thread_id) { + bool DisabledByMarker(const std::string& point, std::thread::id thread_id) { auto marked_point_iter = marked_thread_id_.find(point); return marked_point_iter != marked_thread_id_.end() && thread_id != marked_point_iter->second; @@ -98,4 +93,4 @@ struct SyncPoint::Data { void Process(const Slice& point, void* cb_arg); }; } // namespace ROCKSDB_NAMESPACE -#endif // NDEBUG +#endif // NDEBUG diff --git a/test_util/testharness.cc b/test_util/testharness.cc index 32d8a07d7..3c7b835d2 100644 --- a/test_util/testharness.cc +++ b/test_util/testharness.cc @@ -28,8 +28,7 @@ std::string GetPidStr() { return std::to_string(getpid()); } if (s.ok()) { return ::testing::AssertionSuccess(); } else { - return ::testing::AssertionFailure() << s_expr << std::endl - << s.ToString(); + return ::testing::AssertionFailure() << s_expr << std::endl << s.ToString(); } } diff --git a/test_util/testutil.h b/test_util/testutil.h index dc02b84b1..1f43156ab 100644 --- a/test_util/testutil.h +++ b/test_util/testutil.h @@ -144,9 +144,8 @@ class StringSink : public FSWritableFile { if (reader_contents_ != nullptr) { assert(reader_contents_->size() <= last_flush_); size_t offset = last_flush_ - reader_contents_->size(); - *reader_contents_ = Slice( - contents_.data() + offset, - contents_.size() - offset); + *reader_contents_ = + Slice(contents_.data() + offset, contents_.size() - offset); last_flush_ = contents_.size(); } @@ -165,8 +164,8 @@ class StringSink : public FSWritableFile { void Drop(size_t bytes) { if (reader_contents_ != nullptr) { contents_.resize(contents_.size() - bytes); - *reader_contents_ = Slice( - reader_contents_->data(), reader_contents_->size() - bytes); + *reader_contents_ = + Slice(reader_contents_->data(), reader_contents_->size() - bytes); last_flush_ = contents_.size(); } } @@ -282,7 +281,7 @@ class StringSource : public FSRandomAccessFile { mmap_(mmap), total_reads_(0) {} - virtual ~StringSource() { } + virtual ~StringSource() {} uint64_t Size() const { return contents_.size(); } @@ -324,7 +323,7 @@ class StringSource : public FSRandomAccessFile { char* rid = id; rid = EncodeVarint64(rid, uniq_id_); rid = EncodeVarint64(rid, 0); - return static_cast(rid-id); + return static_cast(rid - id); } int total_reads() const { return total_reads_; } diff --git a/test_util/transaction_test_util.cc b/test_util/transaction_test_util.cc index b90534341..99286d836 100644 --- a/test_util/transaction_test_util.cc +++ b/test_util/transaction_test_util.cc @@ -13,14 +13,13 @@ #include #include +#include "db/dbformat.h" +#include "db/snapshot_impl.h" +#include "logging/logging.h" #include "rocksdb/db.h" #include "rocksdb/utilities/optimistic_transaction_db.h" #include "rocksdb/utilities/transaction.h" #include "rocksdb/utilities/transaction_db.h" - -#include "db/dbformat.h" -#include "db/snapshot_impl.h" -#include "logging/logging.h" #include "util/random.h" #include "util/string_util.h" diff --git a/test_util/transaction_test_util.h b/test_util/transaction_test_util.h index 175376f5f..7a38ab626 100644 --- a/test_util/transaction_test_util.h +++ b/test_util/transaction_test_util.h @@ -7,8 +7,8 @@ #ifndef ROCKSDB_LITE -#include "rocksdb/options.h" #include "port/port.h" +#include "rocksdb/options.h" #include "rocksdb/utilities/optimistic_transaction_db.h" #include "rocksdb/utilities/transaction_db.h" -- GitLab