fix(struct): Fix the classpath conflict between struct and server (#65)

* fix(server): add META in HugeType

* fix(server): Add enumerations to the struct

* fix(struct): remove hugegraph-struct/schema to hugegraph-struct/struct/schema

* fix(struct): Change the loading order of classes

* fix(struct): Change the loading order of classes

Author: Tsukilc

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/HugeType.java

@@ -121,7 +121,8 @@ public boolean isGraph() {
     }
 
     public boolean isVertex() {
-        return this == HugeType.VERTEX || this == HugeType.TASK || this == HugeType.SERVER;
+        return this == HugeType.VERTEX || this == HugeType.TASK || this == HugeType.SERVER ||
+               this == HugeType.VARIABLE;
     }
 
     public boolean isEdge() {
@@ -132,7 +133,6 @@ public boolean isEdgeLabel() {
         return this == EDGE_LABEL;
     }
 
-
     public boolean isIndex() {
         return this == VERTEX_LABEL_INDEX || this == EDGE_LABEL_INDEX ||
                this == SECONDARY_INDEX || this == SEARCH_INDEX ||

hugegraph-server/hugegraph-dist/src/assembly/static/bin/init-store.sh

@@ -54,7 +54,10 @@ fi
 
 echo "Initializing HugeGraph Store..."
 
-CP=$(find "${LIB}" "${PLUGINS}" -name "*.jar"  | tr "\n" ":")
+# Build classpath with hugegraph*.jar first to avoid class loading conflicts
+CP=$(find -L "${LIB}" -name 'hugegraph*.jar' | sort | tr '\n' ':')
+CP="$CP":$(find -L "${LIB}" -name '*.jar' \! -name 'hugegraph*' | sort | tr '\n' ':')
+CP="$CP":$(find -L "${PLUGINS}" -name '*.jar' | sort | tr '\n' ':')
 $JAVA -cp $CP ${DEFAULT_JAVA_OPTIONS} \
 org.apache.hugegraph.cmd.InitStore "${CONF}"/rest-server.properties
 

hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/business/DataManagerImpl.java

@@ -38,7 +38,6 @@
 import org.apache.hugegraph.pd.grpc.pulse.CleanType;
 import org.apache.hugegraph.rocksdb.access.RocksDBSession;
 import org.apache.hugegraph.rocksdb.access.ScanIterator;
-import org.apache.hugegraph.schema.IndexLabel;
 import org.apache.hugegraph.serializer.BinaryElementSerializer;
 import org.apache.hugegraph.store.HgStoreEngine;
 import org.apache.hugegraph.store.cmd.HgCmdClient;
@@ -51,6 +50,7 @@
 import org.apache.hugegraph.store.raft.RaftClosure;
 import org.apache.hugegraph.store.raft.RaftOperation;
 import org.apache.hugegraph.store.term.Bits;
+import org.apache.hugegraph.struct.schema.IndexLabel;
 import org.apache.hugegraph.structure.BaseEdge;
 import org.apache.hugegraph.structure.BaseElement;
 import org.apache.hugegraph.structure.BaseVertex;

hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/business/GraphStoreIterator.java

@@ -34,9 +34,6 @@
 import org.apache.hugegraph.id.Id;
 import org.apache.hugegraph.rocksdb.access.RocksDBSession;
 import org.apache.hugegraph.rocksdb.access.ScanIterator;
-import org.apache.hugegraph.schema.EdgeLabel;
-import org.apache.hugegraph.schema.PropertyKey;
-import org.apache.hugegraph.schema.VertexLabel;
 import org.apache.hugegraph.store.grpc.Graphpb;
 import org.apache.hugegraph.store.grpc.Graphpb.Edge;
 import org.apache.hugegraph.store.grpc.Graphpb.ScanPartitionRequest;
@@ -45,6 +42,9 @@
 import org.apache.hugegraph.store.grpc.Graphpb.Variant.Builder;
 import org.apache.hugegraph.store.grpc.Graphpb.VariantType;
 import org.apache.hugegraph.store.grpc.Graphpb.Vertex;
+import org.apache.hugegraph.struct.schema.EdgeLabel;
+import org.apache.hugegraph.struct.schema.PropertyKey;
+import org.apache.hugegraph.struct.schema.VertexLabel;
 import org.apache.hugegraph.structure.BaseEdge;
 import org.apache.hugegraph.structure.BaseElement;
 import org.apache.hugegraph.structure.BaseProperty;

hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/meta/GraphIdManager.java

@@ -41,7 +41,8 @@
 public class GraphIdManager extends PartitionMetaStore {
 
     protected static final String GRAPH_ID_PREFIX = "@GRAPH_ID@";
-    protected static int maxGraphID = 65535;
+    // FIXME: we need to ensure the right num & proper logic for it (IMPORTANT)
+    protected static int maxGraphID = 65535 - 1;
     static Object graphIdLock = new Object();
     static Object cidLock = new Object();
     final DBSessionBuilder sessionBuilder;

hugegraph-struct/src/main/java/org/apache/hugegraph/HugeGraphSupplier.java

@@ -23,55 +23,54 @@
 import java.util.List;
 
 import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.util.DateUtil;
-
 import org.apache.hugegraph.id.Id;
-import org.apache.hugegraph.schema.EdgeLabel;
-import org.apache.hugegraph.schema.IndexLabel;
-import org.apache.hugegraph.schema.PropertyKey;
-import org.apache.hugegraph.schema.VertexLabel;
+import org.apache.hugegraph.struct.schema.EdgeLabel;
+import org.apache.hugegraph.struct.schema.IndexLabel;
+import org.apache.hugegraph.struct.schema.PropertyKey;
+import org.apache.hugegraph.struct.schema.VertexLabel;
+import org.apache.hugegraph.util.DateUtil;
 
 /**
- * Acturally, it would be better if this interface be called
+ * Actually, it would be better if this interface be called
  * "HugeGraphSchemaSupplier".
  */
 public interface HugeGraphSupplier {
 
-    public List<String> mapPkId2Name(Collection<Id> ids);
+    List<String> mapPkId2Name(Collection<Id> ids);
 
-    public List<String> mapIlId2Name(Collection<Id> ids);
+    List<String> mapIlId2Name(Collection<Id> ids);
 
-    public PropertyKey propertyKey(Id key);
+    PropertyKey propertyKey(Id key);
 
-    public Collection<PropertyKey> propertyKeys();
+    Collection<PropertyKey> propertyKeys();
 
-    public VertexLabel vertexLabelOrNone(Id id);
+    VertexLabel vertexLabelOrNone(Id id);
 
-    public boolean existsLinkLabel(Id vertexLabel);
+    boolean existsLinkLabel(Id vertexLabel);
 
-    public VertexLabel vertexLabel(Id label);
+    VertexLabel vertexLabel(Id label);
 
-    public VertexLabel vertexLabel(String label);
+    VertexLabel vertexLabel(String label);
 
 
-    public default EdgeLabel edgeLabelOrNone(Id id) {
+    default EdgeLabel edgeLabelOrNone(Id id) {
         EdgeLabel el = this.edgeLabel(id);
         if (el == null) {
             el = EdgeLabel.undefined(this, id);
         }
         return el;
     }
-    public EdgeLabel edgeLabel(Id label);
+    EdgeLabel edgeLabel(Id label);
 
-    public EdgeLabel edgeLabel(String label);
+    EdgeLabel edgeLabel(String label);
 
-    public IndexLabel indexLabel(Id id);
+    IndexLabel indexLabel(Id id);
 
-    public Collection<IndexLabel> indexLabels();
+    Collection<IndexLabel> indexLabels();
 
-    public String name();
+    String name();
 
-    public HugeConfig configuration();
+    HugeConfig configuration();
 
     default long now() {
         return DateUtil.now().getTime();

hugegraph-struct/src/main/java/org/apache/hugegraph/SchemaDriver.java

@@ -30,12 +30,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-
 import org.apache.hugegraph.exception.HugeException;
 import org.apache.hugegraph.exception.NotAllowException;
 import org.apache.hugegraph.id.Id;
@@ -47,15 +41,20 @@
 import org.apache.hugegraph.pd.grpc.kv.WatchEvent;
 import org.apache.hugegraph.pd.grpc.kv.WatchResponse;
 import org.apache.hugegraph.pd.grpc.kv.WatchType;
-import org.apache.hugegraph.schema.EdgeLabel;
-import org.apache.hugegraph.schema.IndexLabel;
-import org.apache.hugegraph.schema.PropertyKey;
-import org.apache.hugegraph.schema.SchemaElement;
-import org.apache.hugegraph.schema.VertexLabel;
+import org.apache.hugegraph.struct.schema.EdgeLabel;
+import org.apache.hugegraph.struct.schema.IndexLabel;
+import org.apache.hugegraph.struct.schema.PropertyKey;
+import org.apache.hugegraph.struct.schema.SchemaElement;
+import org.apache.hugegraph.struct.schema.VertexLabel;
 import org.apache.hugegraph.type.HugeType;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.Log;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
 
 public class SchemaDriver {
-    private static Logger log = Log.logger(SchemaDriver.class);
+    private static final Logger log = Log.logger(SchemaDriver.class);
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public static final String DELIMITER = "-";
@@ -81,7 +80,7 @@ public class SchemaDriver {
     // Client for accessing PD
     private final KvClient<WatchResponse> client;
 
-    private SchemaCaches caches;
+    private final SchemaCaches caches;
 
     private SchemaDriver(PDConfig pdConfig, int cacheSize,
                          long expiration) {
@@ -731,7 +730,7 @@ private static final class SchemaCaches {
         private final long expiration;
         private final Timer timer;
 
-        private ConcurrentHashMap<String, ConcurrentHashMap<String,
+        private final ConcurrentHashMap<String, ConcurrentHashMap<String,
                 SchemaElement>> caches;
 
         public SchemaCaches(int limit, long expiration) {

hugegraph-struct/src/main/java/org/apache/hugegraph/SchemaGraph.java

@@ -19,28 +19,29 @@
 
 package org.apache.hugegraph;
 
-import org.apache.hugegraph.HugeGraphSupplier;
-import org.apache.hugegraph.SchemaDriver;
-import org.apache.hugegraph.id.Id;
-import org.apache.hugegraph.pd.client.PDConfig;
-import org.apache.hugegraph.schema.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.id.Id;
+import org.apache.hugegraph.pd.client.PDConfig;
+import org.apache.hugegraph.struct.schema.EdgeLabel;
+import org.apache.hugegraph.struct.schema.IndexLabel;
+import org.apache.hugegraph.struct.schema.PropertyKey;
+import org.apache.hugegraph.struct.schema.SchemaElement;
+import org.apache.hugegraph.struct.schema.VertexLabel;
 import org.apache.hugegraph.util.E;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 public class SchemaGraph implements HugeGraphSupplier {
 
     private final String graphSpace;
     private final String graph;
     private final PDConfig pdConfig;
-    private HugeConfig config;
+    private final HugeConfig config;
 
     private final SchemaDriver schemaDriver;
 

hugegraph-struct/src/main/java/org/apache/hugegraph/query/MatchedIndex.java

@@ -24,8 +24,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.hugegraph.schema.IndexLabel;
-import org.apache.hugegraph.schema.SchemaLabel;
+import org.apache.hugegraph.struct.schema.IndexLabel;
+import org.apache.hugegraph.struct.schema.SchemaLabel;
 
 public class MatchedIndex {
 

hugegraph-struct/src/main/java/org/apache/hugegraph/serializer/BinaryElementSerializer.java

@@ -19,7 +19,13 @@
 
 package org.apache.hugegraph.serializer;
 
-import com.google.common.primitives.Longs;
+import static org.apache.hugegraph.struct.schema.SchemaElement.UNDEF;
+
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.Map;
+
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.NotImplementedException;
 import org.apache.hugegraph.HugeGraphSupplier;
@@ -29,11 +35,15 @@
 import org.apache.hugegraph.id.EdgeId;
 import org.apache.hugegraph.id.Id;
 import org.apache.hugegraph.id.IdGenerator;
-import org.apache.hugegraph.schema.EdgeLabel;
-import org.apache.hugegraph.schema.PropertyKey;
-import org.apache.hugegraph.schema.SchemaElement;
-import org.apache.hugegraph.schema.VertexLabel;
-import org.apache.hugegraph.structure.*;
+import org.apache.hugegraph.struct.schema.EdgeLabel;
+import org.apache.hugegraph.struct.schema.PropertyKey;
+import org.apache.hugegraph.struct.schema.SchemaElement;
+import org.apache.hugegraph.struct.schema.VertexLabel;
+import org.apache.hugegraph.structure.BaseEdge;
+import org.apache.hugegraph.structure.BaseElement;
+import org.apache.hugegraph.structure.BaseProperty;
+import org.apache.hugegraph.structure.BaseVertex;
+import org.apache.hugegraph.structure.Index;
 import org.apache.hugegraph.type.HugeType;
 import org.apache.hugegraph.type.define.Cardinality;
 import org.apache.hugegraph.type.define.EdgeLabelType;
@@ -43,12 +53,7 @@
 import org.apache.hugegraph.util.StringEncoding;
 import org.slf4j.Logger;
 
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collection;
-import java.util.Map;
-
-import static org.apache.hugegraph.schema.SchemaElement.UNDEF;
+import com.google.common.primitives.Longs;
 
 public class BinaryElementSerializer {
     static final BinaryElementSerializer INSTANCE =