chore: rename Guard to HybridGuard

zz-jason · Dec 16, 2023 · 8a90c5c · 8a90c5c
1 parent 74b2876
commit 8a90c5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/source/storage/buffer-manager/BMPlainGuard.hpp b/source/storage/buffer-manager/BMPlainGuard.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "Config.hpp"
 #include "Units.hpp"
-#include "sync-primitives/Latch.hpp"
+#include "sync-primitives/HybridGuard.hpp"
 #include "utils/JumpMU.hpp"
 #include "utils/RandomGenerator.hpp"
 

diff --git a/source/storage/buffer-manager/BufferFrame.hpp b/source/storage/buffer-manager/BufferFrame.hpp
@@ -2,7 +2,7 @@
 
 #include "Swip.hpp"
 #include "Units.hpp"
-#include "sync-primitives/Latch.hpp"
+#include "sync-primitives/HybridGuard.hpp"
 #include "utils/JsonUtil.hpp"
 
 #include <glog/logging.h>

diff --git a/source/sync-primitives/Latch.hpp → source/sync-primitives/HybridGuard.hpp b/source/sync-primitives/Latch.hpp → source/sync-primitives/HybridGuard.hpp
@@ -26,8 +26,8 @@ enum class LATCH_FALLBACK_MODE : u8 {
   SHOULD_NOT_HAPPEN = 4
 };
 
-/// Like std::unique_lock, std::shared_lock, std::lock_guard, this HybridGuard is used
-/// together with HybridLatch to provide various lock mode.
+/// Like std::unique_lock, std::shared_lock, std::lock_guard, this HybridGuard
+/// is used together with HybridLatch to provide various lock mode.
 ///
 /// TODO(jian.z): should we unlock the guard when it's destroied?
 class HybridGuard {

diff --git a/source/sync-primitives/PageGuard.hpp b/source/sync-primitives/PageGuard.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Exceptions.hpp"
-#include "Latch.hpp"
+#include "HybridGuard.hpp"
 #include "concurrency-recovery/CRMG.hpp"
 #include "profiling/counters/WorkerCounters.hpp"
 #include "storage/buffer-manager/BufferManager.hpp"