refact(rocksdb): clean & reformat some code

also mark TODO in some gists
apache · Apr 17, 2023 · e7c7558 · e7c7558
1 parent 7b6a4bd
commit e7c7558
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 200 deletions.
diff --git a/...graph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/OpenedRocksDB.java b/...graph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/OpenedRocksDB.java
@@ -27,17 +27,16 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.hugegraph.backend.BackendException;
+import org.apache.hugegraph.backend.store.rocksdb.RocksDBIteratorPool.ReusedRocksIterator;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.Log;
 import org.rocksdb.Checkpoint;
 import org.rocksdb.ColumnFamilyHandle;
 import org.rocksdb.RocksDB;
 import org.rocksdb.SstFileManager;
 import org.slf4j.Logger;
 
-import org.apache.hugegraph.backend.BackendException;
-import org.apache.hugegraph.backend.store.rocksdb.RocksDBIteratorPool.ReusedRocksIterator;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
-
 public class OpenedRocksDB implements AutoCloseable {
 
     private static final Logger LOG = Log.logger(OpenedRocksDB.class);
@@ -118,8 +117,7 @@ public void createCheckpoint(String targetPath) {
                                                     tempFile, snapshotFile));
             }
         } catch (Exception e) {
-            throw new BackendException("Failed to create checkpoint at path %s",
-                                       e, targetPath);
+            throw new BackendException("Failed to create checkpoint at path %s", e, targetPath);
         }
     }
 
@@ -137,8 +135,7 @@ public CFHandle(RocksDB rocksdb, ColumnFamilyHandle handle) {
         }
 
         public synchronized ColumnFamilyHandle get() {
-            E.checkState(this.handle.isOwningHandle(),
-                         "It seems CF has been closed");
+            E.checkState(this.handle.isOwningHandle(), "It seems CF has been closed");
             assert this.refs.get() >= 1;
             return this.handle;
         }
@@ -163,7 +160,7 @@ public void close() {
 
         public synchronized ColumnFamilyHandle waitForDrop() {
             assert this.refs.get() >= 1;
-            // When entering this method, the refs won't increase any more
+            // When entering this method, the refs won't increase anymore
             final long timeout = TimeUnit.MINUTES.toMillis(30L);
             final long unit = 100L;
             for (long i = 1; this.refs.get() > 1; i++) {
@@ -173,8 +170,7 @@ public synchronized ColumnFamilyHandle waitForDrop() {
                     // 30s rest api timeout may cause InterruptedException
                 }
                 if (i * unit > timeout) {
-                    throw new BackendException("Timeout after %sms to drop CF",
-                                               timeout);
+                    throw new BackendException("Timeout after %sms to drop CF", timeout);
                 }
             }
             assert this.refs.get() == 1;

diff --git a/...aph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIngester.java b/...aph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIngester.java
@@ -27,15 +27,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.hugegraph.backend.BackendException;
+import org.apache.hugegraph.util.Log;
 import org.rocksdb.ColumnFamilyHandle;
 import org.rocksdb.IngestExternalFileOptions;
 import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 import org.slf4j.Logger;
 
-import org.apache.hugegraph.backend.BackendException;
-import org.apache.hugegraph.util.Log;
-
 public class RocksDBIngester {
 
     public static final String SST = ".sst";
@@ -52,8 +51,7 @@ public RocksDBIngester(RocksDB rocksdb) {
         this.options.setMoveFiles(true);
     }
 
-    public List<String> ingest(Path path, ColumnFamilyHandle cf)
-                               throws RocksDBException {
+    public List<String> ingest(Path path, ColumnFamilyHandle cf) throws RocksDBException {
         SuffixFileVisitor visitor = new SuffixFileVisitor(SST);
         try {
             Files.walkFileTree(path, visitor);
@@ -74,10 +72,8 @@ public List<String> ingest(Path path, ColumnFamilyHandle cf)
         return ssts;
     }
 
-    public void ingest(ColumnFamilyHandle cf, List<String> ssts)
-                       throws RocksDBException {
-        LOG.info("Ingest sst files to CF '{}': {}",
-                 RocksDBStdSessions.decode(cf.getName()), ssts);
+    public void ingest(ColumnFamilyHandle cf, List<String> ssts) throws RocksDBException {
+        LOG.info("Ingest sst files to CF '{}': {}", RocksDBStdSessions.decode(cf.getName()), ssts);
         if (!ssts.isEmpty()) {
             this.rocksdb.ingestExternalFile(cf, ssts, this.options);
         }

diff --git a/...rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIteratorPool.java b/...rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIteratorPool.java
@@ -20,17 +20,16 @@
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 
+import org.apache.hugegraph.backend.BackendException;
+import org.apache.hugegraph.config.CoreOptions;
+import org.apache.hugegraph.util.Log;
+import org.apache.hugegraph.util.StringEncoding;
 import org.rocksdb.ColumnFamilyHandle;
 import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 import org.rocksdb.RocksIterator;
 import org.slf4j.Logger;
 
-import org.apache.hugegraph.backend.BackendException;
-import org.apache.hugegraph.config.CoreOptions;
-import org.apache.hugegraph.util.Log;
-import org.apache.hugegraph.util.StringEncoding;
-
 public final class RocksDBIteratorPool implements AutoCloseable {
 
     private static final Logger LOG = Log.logger(RocksDBIteratorPool.class);
@@ -149,6 +148,7 @@ private void closeIterator(RocksIterator iter) {
 
     protected final class ReusedRocksIterator {
 
+        // TODO: is the typo "EREUSING_ENABLED" right? or should be "REUSING_ENABLED"?
         private static final boolean EREUSING_ENABLED = false;
         private final RocksIterator iterator;
         private boolean closed;

diff --git a/...raph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBMetrics.java b/...raph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBMetrics.java
@@ -24,6 +24,7 @@
 import org.apache.hugegraph.util.Bytes;
 import org.apache.hugegraph.util.InsertionOrderUtil;
 import org.apache.hugegraph.util.UnitUtil;
+
 import com.google.common.collect.ImmutableMap;
 
 public class RocksDBMetrics implements BackendMetrics {

diff --git a/...raph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBOptions.java b/...raph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBOptions.java
@@ -23,17 +23,17 @@
 import static org.apache.hugegraph.config.OptionChecker.rangeDouble;
 import static org.apache.hugegraph.config.OptionChecker.rangeInt;
 
-import org.rocksdb.CompactionStyle;
-import org.rocksdb.CompressionType;
-import org.rocksdb.DataBlockIndexType;
-import org.rocksdb.IndexType;
-
 import org.apache.hugegraph.config.ConfigConvOption;
 import org.apache.hugegraph.config.ConfigListConvOption;
 import org.apache.hugegraph.config.ConfigListOption;
 import org.apache.hugegraph.config.ConfigOption;
 import org.apache.hugegraph.config.OptionHolder;
 import org.apache.hugegraph.util.Bytes;
+import org.rocksdb.CompactionStyle;
+import org.rocksdb.CompressionType;
+import org.rocksdb.DataBlockIndexType;
+import org.rocksdb.IndexType;
+
 import com.google.common.collect.ImmutableList;
 
 public class RocksDBOptions extends OptionHolder {

diff --git a/...aph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBSessions.java b/...aph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBSessions.java
@@ -21,12 +21,11 @@
 import java.util.Set;
 
 import org.apache.commons.lang3.tuple.Pair;
-import org.rocksdb.RocksDBException;
-
 import org.apache.hugegraph.backend.store.BackendEntry.BackendColumnIterator;
 import org.apache.hugegraph.backend.store.BackendSession.AbstractBackendSession;
 import org.apache.hugegraph.backend.store.BackendSessionPool;
 import org.apache.hugegraph.config.HugeConfig;
+import org.rocksdb.RocksDBException;
 
 public abstract class RocksDBSessions extends BackendSessionPool {