Refactor some code in RocksDBStdSessions

Change-Id: I0561be1a71322644465e745ded9ca1636bff078a
apache · Mar 26, 2021 · fcb5860 · fcb5860
1 parent 060f190
commit fcb5860
Show file tree

Hide file tree

Showing 7 changed files with 209 additions and 205 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreSnapshotFile.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreSnapshotFile.java
@@ -159,9 +159,9 @@ private String writeManifest(SnapshotWriter writer,
         // Write all backend compressed snapshot file path to manifest
         String jraftSnapshotPath = Paths.get(writerPath, SNAPSHOT_DIR)
                                         .toString();
-        File snapshotManifest = new File(jraftSnapshotPath, MANIFEST);
+        File snapshotManifestFile = new File(jraftSnapshotPath, MANIFEST);
         try {
-            FileUtils.writeLines(snapshotManifest, snapshotFiles);
+            FileUtils.writeLines(snapshotManifestFile, snapshotFiles);
         } catch (IOException e) {
             done.run(new Status(RaftError.EIO,
                                 "Failed to write backend snapshot file path " +

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java
@@ -95,6 +95,11 @@ public class HugeSecurityManager extends SecurityManager {
             ImmutableSet.of("execute")
     );
 
+    private static final Map<String, Set<String>> ROCKSDB_SNAPSHOT = ImmutableMap.of(
+            "com.baidu.hugegraph.backend.store.rocksdb.RocksDBStore",
+            ImmutableSet.of("createSnapshot", "resumeSnapshot")
+    );
+
     private static final Set<String> HBASE_CLASSES = ImmutableSet.of(
             // Fixed #758
             "com.baidu.hugegraph.backend.store.hbase.HbaseStore",
@@ -103,10 +108,6 @@ public class HugeSecurityManager extends SecurityManager {
             "com.baidu.hugegraph.backend.store.hbase.HbaseSessions$RowIterator"
     );
 
-    private static final Set<String> ROCKSDB_CLASSES = ImmutableSet.of(
-            "com.baidu.hugegraph.backend.store.rocksdb.RocksDBStore"
-    );
-
     private static final Set<String> RAFT_CLASSES = ImmutableSet.of(
             "com.baidu.hugegraph.backend.store.raft.RaftNode",
             "com.baidu.hugegraph.backend.store.raft.StoreStateMachine",
@@ -451,7 +452,7 @@ private static boolean callFromBackendHbase() {
     }
 
     private static boolean callFromBackendRocksDB() {
-        return callFromWorkerWithClass(ROCKSDB_CLASSES);
+        return callFromMethods(ROCKSDB_SNAPSHOT);
     }
 
     private static boolean callFromRaft() {

diff --git a/...raph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBSessions.java b/...raph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBSessions.java
@@ -19,13 +19,13 @@
 
 package com.baidu.hugegraph.backend.store.rocksdb;
 
-import java.nio.file.Path;
 import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.rocksdb.RocksDBException;
 
+import com.alipay.sofa.jraft.storage.snapshot.remote.Session;
 import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumnIterator;
 import com.baidu.hugegraph.backend.store.BackendSession.AbstractBackendSession;
 import com.baidu.hugegraph.backend.store.BackendSessionPool;
@@ -52,10 +52,10 @@ public abstract RocksDBSessions copy(HugeConfig config,
 
     public abstract void resumeSnapshot(String snapshotPath);
 
-    public abstract Path buildSnapshotPath(Path originDataPath,
-                                           String snapshotPrefix,
-                                           boolean deleteSnapshot)
-                                           throws RocksDBException;
+    public abstract String buildSnapshotPath(String snapshotPrefix);
+
+    public abstract String hardLinkSnapshot(String snapshotPath)
+                                            throws RocksDBException;
 
     public abstract void reloadRocksDB() throws RocksDBException;