Memory lock in raft (#3926)

* init upload * type * address comments: remove some comments * ?? Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>
vesoft-inc · Apr 21, 2022 · cc24e82 · cc24e82
1 parent f4a2299
commit cc24e82
Show file tree

Hide file tree

Showing 22 changed files with 794 additions and 737 deletions.
diff --git a/src/kvstore/CMakeLists.txt b/src/kvstore/CMakeLists.txt
@@ -6,7 +6,6 @@ nebula_add_library(
     PartManager.cpp
     NebulaStore.cpp
     RocksEngineConfig.cpp
-    LogEncoder.cpp
     NebulaSnapshotManager.cpp
     RateLimiter.cpp
     plugins/elasticsearch/ESListener.cpp

diff --git a/src/kvstore/Common.h b/src/kvstore/Common.h
@@ -270,6 +270,16 @@ inline rocksdb::Slice toSlice(const folly::StringPiece& str) {
 using KVMap = std::unordered_map<std::string, std::string>;
 using KVArrayIterator = std::vector<KV>::const_iterator;
 
+class MergeableAtomicOpResult {
+ public:
+  nebula::cpp2::ErrorCode code;
+  std::string batch;  // batched result, like before.
+  std::list<std::string> readSet;
+  std::list<std::string> writeSet;
+};
+
+using MergeableAtomicOp = folly::Function<MergeableAtomicOpResult(void)>;
+
 }  // namespace kvstore
 }  // namespace nebula
 

diff --git a/src/kvstore/KVStore.h b/src/kvstore/KVStore.h
@@ -312,7 +312,7 @@ class KVStore {
    */
   virtual void asyncAtomicOp(GraphSpaceID spaceId,
                              PartitionID partId,
-                             raftex::AtomicOp op,
+                             MergeableAtomicOp op,
                              KVCallback cb) = 0;
 
   /**

diff --git a/src/kvstore/NebulaStore.cpp b/src/kvstore/NebulaStore.cpp
@@ -918,7 +918,7 @@ void NebulaStore::asyncRemoveRange(GraphSpaceID spaceId,
 
 void NebulaStore::asyncAtomicOp(GraphSpaceID spaceId,
                                 PartitionID partId,
-                                raftex::AtomicOp op,
+                                MergeableAtomicOp op,
                                 KVCallback cb) {
   auto ret = part(spaceId, partId);
   if (!ok(ret)) {

diff --git a/src/kvstore/NebulaStore.h b/src/kvstore/NebulaStore.h
@@ -415,7 +415,7 @@ class NebulaStore : public KVStore, public Handler {
    */
   void asyncAtomicOp(GraphSpaceID spaceId,
                      PartitionID partId,
-                     raftex::AtomicOp op,
+                     MergeableAtomicOp op,
                      KVCallback cb) override;
 
   /**

diff --git a/src/kvstore/Part.cpp b/src/kvstore/Part.cpp
@@ -115,7 +115,7 @@ void Part::sync(KVCallback cb) {
       [callback = std::move(cb)](nebula::cpp2::ErrorCode code) mutable { callback(code); });
 }
 
-void Part::asyncAtomicOp(raftex::AtomicOp op, KVCallback cb) {
+void Part::asyncAtomicOp(MergeableAtomicOp op, KVCallback cb) {
   atomicOpAsync(std::move(op))
       .thenValue(
           [callback = std::move(cb)](nebula::cpp2::ErrorCode code) mutable { callback(code); });

diff --git a/src/kvstore/Part.h b/src/kvstore/Part.h
@@ -124,7 +124,7 @@ class Part : public raftex::RaftPart {
    * @param op Atomic operation
    * @param cb Callback when has a result
    */
-  void asyncAtomicOp(raftex::AtomicOp op, KVCallback cb);
+  void asyncAtomicOp(MergeableAtomicOp op, KVCallback cb);
 
   /**
    * @brief Add a raft learner asynchronously by adding raft log

diff --git a/src/kvstore/raftex/CMakeLists.txt b/src/kvstore/raftex/CMakeLists.txt
@@ -5,6 +5,7 @@ nebula_add_library(
     RaftexService.cpp
     Host.cpp
     SnapshotManager.cpp
+    ../LogEncoder.cpp
 )
 
 nebula_add_subdirectory(test)