Reorg groot

.github/workflows/ci.yml

@@ -583,7 +583,7 @@ jobs:
 
     - name: gremlin-test
       run: |
-        cd interactive_engine/src/v2
+        cd interactive_engine/src/groot-server
         mvn test -Pgremlin-test
 
     - uses: actions/upload-artifact@v2
@@ -693,7 +693,7 @@ jobs:
         export NODE_IP=$(kubectl get nodes --namespace default -o jsonpath="{.items[0].status.addresses[0].address}")
         helm test ci --timeout 5m0s
         cd ${GITHUB_WORKSPACE}/python
-        sleep 30
+        sleep 120
         python3 -m pytest -s -vvv tests/kubernetes/test_store_service.py -k test_demo_after_restart
 
     - name: Clean

charts/graphscope-store/values.yaml

@@ -49,7 +49,7 @@ maxgraphLogbackFile: ""
 
 rpcMaxBytesMb: 4
 
-engineType: "pegasus"
+engineType: "maxgraph"
 
 discoveryMode: "file"
 

interactive_engine/distribution/pom.xml

@@ -1,61 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>maxgraph-parent</artifactId>
-        <groupId>com.alibaba.maxgraph</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>maxgraph-parent</artifactId>
+    <groupId>com.alibaba.maxgraph</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>distribution</artifactId>
+  <artifactId>distribution</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.alibaba.maxgraph</groupId>
-            <artifactId>v2</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.maxgraph</groupId>
-            <artifactId>maxgraph-executor</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.maxgraph</groupId>
-            <artifactId>data_load_tools</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>com.alibaba.maxgraph</groupId>-->
-            <!--<artifactId>gaia-adaptor</artifactId>-->
-            <!--<version>${project.parent.version}</version>-->
-        <!--</dependency>-->
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>com.alibaba.maxgraph</groupId>
+      <artifactId>groot-server</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba.maxgraph</groupId>
+      <artifactId>maxgraph-executor</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba.maxgraph</groupId>
+      <artifactId>data_load_tools</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>maxgraph</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>src/assembly/assembly.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <finalName>maxgraph</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+          <descriptors>
+            <descriptor>src/assembly/assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

interactive_engine/distribution/src/bin/store_ctl.sh

@@ -21,7 +21,6 @@ cat <<END
     max_node_gaia                       start max_node of gaia
     max_node_maxgraph                   start max_node of maxgraph
     maxgraph                            start maxgraph with v2
-    admin_tools                         start admin_tools of v2
     load_tools                          start load_tools of maxgraph
 END
 }
@@ -78,37 +77,13 @@ max_node() {
   type=$1; shift
   _setup_maxgraph_env
 
-  if [[ "${type}" == "gaia" ]]; then
-    java -server \
-         -Dlogback.configurationFile="${MAXGRAPH_LOGBACK_FILE}" \
-         -Dconfig.file="${MAXGRAPH_CONF_FILE}" \
-         -Dlog.dir="${LOG_DIR}" \
-         -Dlog.name="${LOG_NAME}" \
-         -cp "${libpath}" com.alibaba.graphscope.gaia.MaxNode \
-         "$@" > >(tee -a "${LOG_DIR}/${LOG_NAME}.out") 2> >(tee -a "${LOG_DIR}/${LOG_NAME}.err" >&2)
-  else
-    java -server \
-         -Dlogback.configurationFile="${MAXGRAPH_LOGBACK_FILE}" \
-         -Dconfig.file="${MAXGRAPH_CONF_FILE}" \
-         -Dlog.dir="${LOG_DIR}" \
-         -Dlog.name="${LOG_NAME}" \
-         -cp "${libpath}" com.alibaba.maxgraph.v2.MaxNode \
-         "$@" > >(tee -a "${LOG_DIR}/${LOG_NAME}.out") 2> >(tee -a "${LOG_DIR}/${LOG_NAME}.err" >&2)
-  fi
-}
-
-# start admin_tools of v2
-admin_tools() {
-  _setup_maxgraph_env
-
-  java_opt="-server ${MAXGRAPH_JAVA_OPTS}"
-  java ${java_opt} \
-      -Dlogback.configurationFile="${MAXGRAPH_LOGBACK_FILE}" \
-      -Dconfig.file="${MAXGRAPH_CONF_FILE}" \
-      -Dlog.dir="${LOG_DIR}" \
-      -Dlog.name="${LOG_NAME}" \
-      -cp "${libpath}" com.alibaba.maxgraph.v2.AdminTools \
-      "$@" > >(tee -a "${LOG_DIR}/${LOG_NAME}.out") 2> >(tee -a "${LOG_DIR}/${LOG_NAME}.err" >&2)
+  java -server \
+       -Dlogback.configurationFile="${MAXGRAPH_LOGBACK_FILE}" \
+       -Dconfig.file="${MAXGRAPH_CONF_FILE}" \
+       -Dlog.dir="${LOG_DIR}" \
+       -Dlog.name="${LOG_NAME}" \
+       -cp "${libpath}" com.alibaba.maxgraph.servers.MaxNode \
+       "$@" > >(tee -a "${LOG_DIR}/${LOG_NAME}.out") 2> >(tee -a "${LOG_DIR}/${LOG_NAME}.err" >&2)
 }
 
 load_tools() {
@@ -147,7 +122,7 @@ maxgraph() {
       -Dconfig.file="${MAXGRAPH_CONF_FILE}" \
       -Dlog.dir="${LOG_DIR}" \
       -Dlog.name="${LOG_NAME}" \
-      -cp "${libpath}" com.alibaba.maxgraph.groot.MaxGraph \
+      -cp "${libpath}" com.alibaba.maxgraph.servers.MaxGraph \
       "$@" > >(tee -a "${LOG_DIR}/${LOG_NAME}.out") 2> >(tee -a "${LOG_DIR}/${LOG_NAME}.err" >&2)
 }
 
@@ -159,7 +134,6 @@ while test $# -ne 0; do
     max_node_gaia) max_node "gaia" "$@"; exit;;
     max_node_maxgraph) max_node "maxgraph" "$@"; exit;;
     maxgraph) maxgraph "$@"; exit;;
-    admin_tools) admin_tools "$@"; exit;;
     load_tools) load_tools "$@"; exit;;
     *)
       echo "unrecognized option or command '${arg}'"

interactive_engine/distribution/src/conf/config.template

@@ -10,7 +10,7 @@ ingestor.node.count=2
 coordinator.node.count=1
 ingestor.queue.count=2
 partition.count=8
-engine.type=pegasus
+engine.type=maxgraph
 discovery.mode=zookeeper
 
 ## Ingestor Config
@@ -34,7 +34,6 @@ kafka.servers=graph_env:9092
 kafka.topic=graph_test
 
 ## Frontend Config
-graph.store.type=maxgraph
 gremlin.server.port=12312
 
 executor.worker.per.process=2

interactive_engine/src/v2/src/main/java/com/alibaba/maxgraph/groot/sdk/DataLoadTarget.java → interactive_engine/src/api/sdk-common/src/main/java/com/alibaba/maxgraph/sdkcommon/common/DataLoadTarget.java

@@ -1,21 +1,19 @@
 /**
  * Copyright 2020 Alibaba Group Holding Limited.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ *
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.maxgraph.groot.sdk;
+package com.alibaba.maxgraph.sdkcommon.common;
 
-import com.alibaba.maxgraph.proto.v2.DataLoadTargetPb;
+import com.alibaba.maxgraph.proto.DataLoadTargetPb;
 
 public class DataLoadTarget {
     private String label;
@@ -26,7 +24,13 @@ public class DataLoadTarget {
     private int srcLabelId;
     private int dstLabelId;
 
-    private DataLoadTarget(String label, String srcLabel, String dstLabel, int labelId, int srcLabelId, int dstLabelId) {
+    private DataLoadTarget(
+            String label,
+            String srcLabel,
+            String dstLabel,
+            int labelId,
+            int srcLabelId,
+            int dstLabelId) {
         this.label = label;
         this.srcLabel = srcLabel;
         this.dstLabel = dstLabel;
@@ -60,7 +64,7 @@ public int getDstLabelId() {
         return dstLabelId;
     }
 
-    public DataLoadTargetPb toProto(){
+    public DataLoadTargetPb toProto() {
         DataLoadTargetPb.Builder builder = DataLoadTargetPb.newBuilder();
         builder.setLabel(this.label);
         builder.setLabelId(this.labelId);
@@ -87,11 +91,17 @@ public static DataLoadTarget parseProto(DataLoadTargetPb proto) {
 
     @Override
     public String toString() {
-        return "DataLoadTarget{" +
-                "label='" + label + '\'' +
-                ", srcLabel='" + srcLabel + '\'' +
-                ", dstLabel='" + dstLabel + '\'' +
-                '}';
+        return "DataLoadTarget{"
+                + "label='"
+                + label
+                + '\''
+                + ", srcLabel='"
+                + srcLabel
+                + '\''
+                + ", dstLabel='"
+                + dstLabel
+                + '\''
+                + '}';
     }
 
     public static Builder newBuilder() {
@@ -111,9 +121,7 @@ public static class Builder {
         private String dstVertexLabel;
         private int dstVertexLabelId;
 
-        private Builder() {
-
-        }
+        private Builder() {}
 
         private Builder(DataLoadTarget target) {
             this.label = target.getLabel();
@@ -155,7 +163,12 @@ public Builder setDstLabelId(int dstVertexLabelId) {
         }
 
         public DataLoadTarget build() {
-            return new DataLoadTarget(label, srcVertexLabel, dstVertexLabel, labelId, srcVertexLabelId,
+            return new DataLoadTarget(
+                    label,
+                    srcVertexLabel,
+                    dstVertexLabel,
+                    labelId,
+                    srcVertexLabelId,
                     dstVertexLabelId);
         }
     }