Define loading mode to speed up when loading data (#1188)

Change-Id: Ia9a93a3f0433c67353d89eb877a799ed5202fac1
apache · Sep 23, 2020 · ba30654 · ba30654
1 parent 2fceac9
commit ba30654
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/StandardHugeGraph.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/StandardHugeGraph.java
@@ -243,6 +243,7 @@ public GraphMode mode() {
 
     @Override
     public void mode(GraphMode mode) {
+        LOG.info("Graph {} will work in {} mode", this, mode);
         this.mode = mode;
     }
 

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftSharedContext.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftSharedContext.java
@@ -49,6 +49,7 @@
 import com.baidu.hugegraph.config.HugeConfig;
 import com.baidu.hugegraph.event.EventHub;
 import com.baidu.hugegraph.type.HugeType;
+import com.baidu.hugegraph.type.define.GraphMode;
 import com.baidu.hugegraph.util.Events;
 import com.baidu.hugegraph.util.Log;
 
@@ -216,6 +217,10 @@ public ExecutorService backendExecutor() {
         return this.backendExecutor;
     }
 
+    public GraphMode graphMode() {
+        return this.params.mode();
+    }
+
     private HugeConfig config() {
         return this.params.configuration();
     }

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreStateMachine.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreStateMachine.java
@@ -43,6 +43,7 @@
 import com.baidu.hugegraph.backend.store.BackendStore;
 import com.baidu.hugegraph.backend.store.raft.RaftBackendStore.IncrCounter;
 import com.baidu.hugegraph.type.HugeType;
+import com.baidu.hugegraph.type.define.GraphMode;
 import com.baidu.hugegraph.util.LZ4Util;
 import com.baidu.hugegraph.util.Log;
 
@@ -81,8 +82,10 @@ private void registerCommands() {
             this.store.beginTx();
             for (BackendMutation mutation : ms) {
                 this.store.mutate(mutation);
-                // update cache on follower
-                this.updateCacheIfNeeded(mutation);
+                // update cache on follower when graph run in general mode
+                if (this.context.graphMode() == GraphMode.NONE) {
+                    this.updateCacheIfNeeded(mutation);
+                }
             }
             this.store.commitTx();
             return null;

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java
@@ -320,7 +320,9 @@ protected void prepareAdditions(Map<Id, HugeVertex> addedVertices,
             v.committed();
             this.checkAggregateProperty(v);
             // Check whether passed all non-null properties
-            this.checkNonnullProperty(v);
+            if (!this.graphMode().loading()) {
+                this.checkNonnullProperty(v);
+            }
 
             // Add vertex entry
             this.doInsert(this.serializer.writeVertex(v));

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/GraphMode.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/GraphMode.java
@@ -40,7 +40,12 @@ public enum GraphMode {
      * 1. Not allowed create schema with specified id
      * 2. Support create vertex with id for AUTOMATIC id strategy
      */
-    MERGING(3, "merging");
+    MERGING(3, "merging"),
+
+    /*
+     * LOADING mode used to load data via hugegraph-loader.
+     */
+    LOADING(4, "loading");
 
     private final byte code;
     private final String name;
@@ -62,4 +67,8 @@ public String string() {
     public boolean maintaining() {
         return this == RESTORING || this == MERGING;
     }
+
+    public boolean loading() {
+        return this == LOADING;
+    }
 }