BREAKING CHANGE: release version 1.7.0 [server + pd + store]

.github/workflows/auto-pr-review.yml

@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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 limitations
+# under the License.
+
+name: "Auto PR Commenter"
+
+on:
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  add-review-comment:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Add review comment
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            @codecov-ai-reviewer review

.github/workflows/check-dependencies.yml

@@ -1,3 +1,4 @@
+
 name: "3rd-party"
 
 on:
@@ -32,7 +33,7 @@ jobs:
 
       - name: mvn install
         run: |
-          mvn install -Dmaven.test.skip=true -ntp
+          mvn install -Dmaven.test.skip=true -ntp --fail-at-end
       - name: generate current dependencies
         run: |
           bash $SCRIPT_DEPENDENCY/regenerate_known_dependencies.sh current-dependencies.txt

.github/workflows/pd-store-ci.yml

@@ -10,7 +10,50 @@ on:
 
 # TODO: consider merge to one ci.yml file
 jobs:
+  struct:
+    runs-on: ubuntu-latest
+    env:
+      USE_STAGE: 'false'
+    steps:
+      - name: Install JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'zulu'
+
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 5
+
+      - name: Use staged maven repo settings
+        run: |
+          cp $HOME/.m2/settings.xml /tmp/settings.xml || true
+          mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
+
+      - name: Resolve project revision
+        run: echo "REVISION=$(mvn -q -DforceStdout help:evaluate -Dexpression=revision -f pom.xml)" >> $GITHUB_ENV
+
+      - name: Build or fetch hugegraph-struct
+        run: |
+          if [ -f hugegraph-struct/pom.xml ]; then
+            echo "[INFO] Found hugegraph-struct source, building from source"
+            mvn -U -ntp -DskipTests -pl hugegraph-struct -am install
+          else
+            echo "[INFO] hugegraph-struct source not found, fetching artifact $REVISION"
+            if [ -z "$REVISION" ]; then echo "[ERROR] revision not resolved"; exit 1; fi
+            mvn -U -ntp dependency:get -Dartifact=org.apache.hugegraph:hugegraph-struct:$REVISION
+          fi
+
   pd:
+    needs: struct
     runs-on: ubuntu-latest
     env:
       # TODO: avoid duplicated env setup in pd & store
@@ -29,7 +72,7 @@ jobs:
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
-          path: ~/.m2
+          path: ~/.m2/repository
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
@@ -55,8 +98,9 @@ jobs:
       # The above tests do not require starting a PD instance.
 
       - name: Package
+        # todo remove --fail-at-end after test
         run: |
-          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
+          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp --fail-at-end
 
       - name: Prepare env and service
         run: |
@@ -76,7 +120,7 @@ jobs:
           file: ${{ env.REPORT_DIR }}/*.xml
 
   store:
-    # TODO: avoid duplicated env setup
+    needs: struct
     runs-on: ubuntu-latest
     env:
       USE_STAGE: 'false' # Whether to include the stage repository.
@@ -94,7 +138,7 @@ jobs:
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
-          path: ~/.m2
+          path: ~/.m2/repository
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
@@ -110,8 +154,9 @@ jobs:
           mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
 
       - name: Package
+        # todo remove --fail-at-end after test
         run: |
-          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
+          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp --fail-at-end
 
       - name: Prepare env and service
         run: |
@@ -148,7 +193,7 @@ jobs:
           file: ${{ env.REPORT_DIR }}/*.xml
 
   hstore:
-    # TODO: avoid duplicated env setup
+    needs: struct
     runs-on: ubuntu-latest
     env:
       USE_STAGE: 'false' # Whether to include the stage repository.
@@ -167,7 +212,7 @@ jobs:
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
-          path: ~/.m2
+          path: ~/.m2/repository
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
@@ -183,8 +228,9 @@ jobs:
           mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
 
       - name: Package
+        # todo remove --fail-at-end after test
         run: |
-          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
+          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp --fail-at-end
 
       - name: Prepare env and service
         run: |

.licenserc.yaml

@@ -100,6 +100,8 @@ header: # `header` section is configurations for source codes license header.
     - 'hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureBasicSuite.java'
     - 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java'
     - 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java'
+    - 'hugegraph-struct/src/main/java/org/apache/hugegraph/type/define/Cardinality.java'
+    - 'hugegraph-struct/src/main/java/org/apache/hugegraph/type/Namifiable.java'
   comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
 
   # license-location-threshold specifies the index threshold where the license header can be located,

LICENSE

@@ -216,3 +216,5 @@ hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/C
 hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java from https://github.com/JanusGraph/janusgraph
 hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java from https://github.com/opencypher/cypher-for-gremlin
 hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java from https://github.com/opencypher/cypher-for-gremlin
+hugegraph-struct/src/main/java/org/apache/hugegraph/type/define/Cardinality.java from https://github.com/JanusGraph/janusgraph
+hugegraph-struct/src/main/java/org/apache/hugegraph/type/Namifiable.java from https://github.com/JanusGraph/janusgraph

hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/rest/RestResult.java

@@ -18,13 +18,15 @@
 package org.apache.hugegraph.rest;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
 import lombok.SneakyThrows;
 import okhttp3.Response;
@@ -33,6 +35,11 @@ public class RestResult {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
+    static {
+        MAPPER.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        MAPPER.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"));
+    }
+
     private final int status;
     private final RestHeaders headers;
     private final String content;

hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/util/DateUtil.java

@@ -22,6 +22,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.hugegraph.date.SafeDateFormat;
+
 import com.google.common.collect.ImmutableMap;
 
 public final class DateUtil {
@@ -46,7 +47,7 @@ public static Date parse(String value) {
             }
         }
         throw new IllegalArgumentException(String.format(
-                  "Expected date format is: %s, but got '%s'", VALID_DFS.values(), value));
+                "Expected date format is: %s, but got '%s'", VALID_DFS.values(), value));
     }
 
     public static Date parse(String value, String df) {

hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/util/JsonUtilCommon.java

@@ -18,13 +18,15 @@
 package org.apache.hugegraph.util;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 
 import org.apache.hugegraph.rest.SerializeException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
 /**
  * Utility class for JSON operations.
@@ -36,6 +38,11 @@ public final class JsonUtilCommon {
      */
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
+    static {
+        MAPPER.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        MAPPER.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"));
+    }
+
     /**
      * Registers a module with the ObjectMapper.
      *

hugegraph-commons/hugegraph-dist/scripts/dependency/known-dependencies.txt

@@ -1,4 +1,7 @@
+animal-sniffer-annotations-1.18.jar
 annotations-13.0.jar
+annotations-4.1.1.4.jar
+bolt-1.6.2.jar
 checker-qual-3.5.0.jar
 commons-beanutils-1.9.4.jar
 commons-codec-1.13.jar
@@ -10,14 +13,25 @@ commons-lang-2.6.jar
 commons-lang3-3.12.0.jar
 commons-logging-1.1.1.jar
 commons-text-1.9.jar
+disruptor-3.3.7.jar
 error_prone_annotations-2.3.4.jar
 failureaccess-1.0.1.jar
+grpc-api-1.28.1.jar
+grpc-context-1.28.1.jar
+grpc-core-1.28.1.jar
+grpc-netty-shaded-1.28.0.jar
+grpc-protobuf-1.28.0.jar
+grpc-protobuf-lite-1.28.0.jar
+grpc-stub-1.28.0.jar
+gson-2.8.6.jar
 guava-30.0-jre.jar
 hamcrest-core-1.3.jar
+hessian-3.3.7.jar
 j2objc-annotations-1.3.jar
 jackson-annotations-2.14.0-rc1.jar
 jackson-core-2.14.0-rc1.jar
 jackson-databind-2.14.0-rc1.jar
+jackson-dataformat-yaml-2.9.3.jar
 jackson-jaxrs-base-2.14.0-rc1.jar
 jackson-jaxrs-json-provider-2.14.0-rc1.jar
 jackson-module-jaxb-annotations-2.14.0-rc1.jar
@@ -39,7 +53,23 @@ log4j-api-2.18.0.jar
 log4j-core-2.18.0.jar
 log4j-slf4j-impl-2.18.0.jar
 logging-interceptor-4.10.0.jar
-lombok-1.18.8.jar
+lookout-api-1.4.1.jar
+netty-all-4.1.42.Final.jar
 okhttp-4.10.0.jar
 okio-jvm-3.0.0.jar
+opentracing-api-0.22.0.jar
+opentracing-mock-0.22.0.jar
+opentracing-noop-0.22.0.jar
+opentracing-util-0.22.0.jar
+perfmark-api-0.19.0.jar
+proto-google-common-protos-1.17.0.jar
+protobuf-java-3.11.0.jar
 slf4j-api-1.7.25.jar
+snakeyaml-1.18.jar
+sofa-common-tools-1.0.12.jar
+sofa-rpc-all-5.7.6.jar
+swagger-annotations-1.5.18.jar
+swagger-core-1.5.18.jar
+swagger-models-1.5.18.jar
+tracer-core-3.0.8.jar
+validation-api-1.1.0.Final.jar