Merge branch 'master' into docker

.asf.yaml

@@ -40,6 +40,7 @@ github:
         contexts:
           - Analyze (java)
           - CodeQL
+          - check-license
           - build (memory, 8)
           - build (memory, 11)
       required_pull_request_reviews:

.github/workflows/check-dependencies.yml

@@ -1,31 +1,48 @@
-name: third-party dependencies check
+name: "3rd-party"
 
 on:
   push:
     branches:
       - master
       - /^release-.*$/
   pull_request:
+
+permissions:
+  contents: read
 
 jobs:
-  build:
+  dependency-check:
     runs-on: ubuntu-latest
     env:
       SCRIPT_DEPENDENCY: hugegraph-dist/scripts/dependency
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'adopt'
       - name: mvn install
         run: |
-          mvn install -DskipTests=true
+          mvn install -DskipTests=true -ntp
       - name: generate current dependencies
         run: |
           bash $SCRIPT_DEPENDENCY/regenerate_known_dependencies.sh current-dependencies.txt
       - name: check third dependencies
         run: |
           bash $SCRIPT_DEPENDENCY/check_dependencies.sh
+
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v3
+        # Refer: https://github.com/actions/dependency-review-action
+        with:
+          fail-on-severity: low
+          # Action will fail if dependencies don't match the list
+          #allow-licenses: Apache-2.0, MIT
+          #deny-licenses: GPL-3.0, AGPL-1.0, AGPL-3.0, LGPL-2.0, CC-BY-3.0

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: hugegraph-ci
+name: "hugegraph-ci"
 
 on:
   push:
@@ -7,8 +7,6 @@ on:
       - 'release-*'
       - 'test-*'
   pull_request:
-    branches:
-      - '**'
 
 jobs:
   build:

.github/workflows/codeql-analysis.yml

@@ -1,10 +1,8 @@
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
 name: "CodeQL"
 
 on:
   push:
-    branches: [ master, release-*, v*.* ]
+    branches: [ master, release-* ]
   pull_request:
     # The branches below must be a subset of the branches above
     # branches: [ master ] # enable in all PR
@@ -33,7 +31,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '8'
+          java-version: '11'
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/licence-checker.yml

@@ -1,10 +1,10 @@
-name: License checker
+name: "License checker"
 
 on:
   push:
     branches:
       - master
-      - /^v[0-9]\..*$/
+      - 'release-*'
   pull_request:
 
 jobs:

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-name: Mark stale issues and pull requests
+name: "Mark stale issues and pull requests"
 
 on:
   schedule:

hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java

@@ -56,12 +56,13 @@
  * CassandraShard is used for cassandra scanning operations.
  * Each shard represents a range of tokens for a node.
  * Reading data from a given shard does not cross multiple nodes.
+ * <p>
  * Refer to AbstractColumnFamilyInputFormat from:
  * <a href="https://github.com/2013Commons/hive-cassandra/">...</a>
  */
 public class CassandraShard {
 
-    /* The minimal shard size should >= 1M to prevent too many number of shards */
+    /** The minimal shard size should >= 1M to prevent too many number of shards */
     private static final int MIN_SHARD_SIZE = (int) Bytes.MB;
 
     private CassandraSessionPool.Session session;
@@ -228,7 +229,7 @@ private static Map<TokenRange, Long> describeSplits(
                                               tokenRange.getEnd().toString());
         Row row = resultSet.one();
 
-        long meanPartitionSize = 0L;
+        long meanPartitionSize;
         long partitionsCount = 0L;
         long splitCount = 0L;
 

hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java

@@ -56,7 +56,7 @@ public AnsjAnalyzer(String mode) {
 
     @Override
     public Set<String> segment(String text) {
-        Result terms = null;
+        Result terms;
         switch (this.analysis) {
             case "BaseAnalysis":
                 terms = BaseAnalysis.parse(text);

hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BytesBuffer.java

@@ -165,11 +165,11 @@ private void require(int size) {
         E.checkState(this.resize, "Can't resize for wrapped buffer");
 
         // Extra capacity as buffer
-        int newcapacity = size + this.buffer.limit() + DEFAULT_CAPACITY;
-        E.checkArgument(newcapacity <= MAX_BUFFER_CAPACITY,
+        int newCapacity = size + this.buffer.limit() + DEFAULT_CAPACITY;
+        E.checkArgument(newCapacity <= MAX_BUFFER_CAPACITY,
                         "Capacity exceeds max buffer capacity: %s",
                         MAX_BUFFER_CAPACITY);
-        ByteBuffer newBuffer = ByteBuffer.allocate(newcapacity);
+        ByteBuffer newBuffer = ByteBuffer.allocate(newCapacity);
         ((Buffer) this.buffer).flip();
         newBuffer.put(this.buffer);
         this.buffer = newBuffer;

hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java

@@ -53,10 +53,8 @@ public final class HugeScriptTraversal<S, E> extends DefaultTraversal<S, E> {
 
     private Object result;
 
-    public HugeScriptTraversal(TraversalSource traversalSource,
-                               String language, String script,
-                               Map<String, Object> bindings,
-                               Map<String, String> aliases) {
+    public HugeScriptTraversal(TraversalSource traversalSource, String language, String script,
+                               Map<String, Object> bindings, Map<String, String> aliases) {
         this.graph = traversalSource.getGraph();
         this.language = language;
         this.script = script;
@@ -75,8 +73,7 @@ public String script() {
 
     @Override
     public void applyStrategies() throws IllegalStateException {
-        ScriptEngine engine =
-                     SingleGremlinScriptEngineManager.get(this.language);
+        ScriptEngine engine = SingleGremlinScriptEngineManager.get(this.language);
 
         Bindings bindings = engine.createBindings();
         bindings.putAll(this.bindings);
@@ -94,9 +91,8 @@ public void applyStrategies() throws IllegalStateException {
         for (Map.Entry<String, String> entry : this.aliases.entrySet()) {
             Object value = bindings.get(entry.getValue());
             if (value == null) {
-                throw new IllegalArgumentException(String.format(
-                          "Invalid aliase '%s':'%s'",
-                          entry.getKey(), entry.getValue()));
+                throw new IllegalArgumentException(String.format("Invalid alias '%s':'%s'",
+                                                                 entry.getKey(), entry.getValue()));
             }
             bindings.put(entry.getKey(), value);
         }
@@ -105,7 +101,7 @@ public void applyStrategies() throws IllegalStateException {
             Object result = engine.eval(this.script, bindings);
 
             if (result instanceof Admin) {
-                @SuppressWarnings({ "unchecked", "resource" })
+                @SuppressWarnings({ "unchecked"})
                 Admin<S, E> traversal = (Admin<S, E>) result;
                 traversal.getSideEffects().mergeInto(this.sideEffects);
                 traversal.getSteps().forEach(this::addStep);

hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java

@@ -39,8 +39,8 @@ public enum Cardinality implements SerialEnum {
      */
     SET(3, "set");
 
-    private byte code = 0;
-    private String name = null;
+    private final byte code;
+    private final String name;
 
     static {
         SerialEnum.register(Cardinality.class);
@@ -78,8 +78,8 @@ public static Cardinality convert(VertexProperty.Cardinality cardinality) {
             case set:
                 return SET;
             default:
-                throw new AssertionError(String.format(
-                          "Unrecognized cardinality: '%s'", cardinality));
+                throw new AssertionError(String.format("Unrecognized cardinality: '%s'",
+                                                       cardinality));
         }
     }
 }

hugegraph-core/src/main/java/org/apache/hugegraph/util/LZ4Util.java

@@ -37,43 +37,36 @@ public static BytesBuffer compress(byte[] bytes, int blockSize) {
         return compress(bytes, blockSize, DEFAULT_BUFFER_RATIO);
     }
 
-    public static BytesBuffer compress(byte[] bytes, int blockSize,
-                                       float bufferRatio) {
+    public static BytesBuffer compress(byte[] bytes, int blockSize, float bufferRatio) {
         float ratio = bufferRatio <= 0.0F ? DEFAULT_BUFFER_RATIO : bufferRatio;
         LZ4Factory factory = LZ4Factory.fastestInstance();
         LZ4Compressor compressor = factory.fastCompressor();
         int initBufferSize = Math.round(bytes.length / ratio);
         BytesBuffer buf = new BytesBuffer(initBufferSize);
-        LZ4BlockOutputStream lz4Output = new LZ4BlockOutputStream(
-                                         buf, blockSize, compressor);
+        LZ4BlockOutputStream lz4Output = new LZ4BlockOutputStream(buf, blockSize, compressor);
         try {
             lz4Output.write(bytes);
             lz4Output.close();
         } catch (IOException e) {
             throw new BackendException("Failed to compress", e);
         }
-        /*
-         * If need to perform reading outside the method,
-         * remember to call forReadWritten()
-         */
+        // If we need to perform reading outside the method, remember to call forReadWritten()
         return buf;
     }
 
     public static BytesBuffer decompress(byte[] bytes, int blockSize) {
         return decompress(bytes, blockSize, DEFAULT_BUFFER_RATIO);
     }
 
-    public static BytesBuffer decompress(byte[] bytes, int blockSize,
-                                         float bufferRatio) {
+    public static BytesBuffer decompress(byte[] bytes, int blockSize, float bufferRatio) {
         float ratio = bufferRatio <= 0.0F ? DEFAULT_BUFFER_RATIO : bufferRatio;
         LZ4Factory factory = LZ4Factory.fastestInstance();
         LZ4FastDecompressor decompressor = factory.fastDecompressor();
         ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
         int initBufferSize = Math.min(Math.round(bytes.length * ratio),
                                       BytesBuffer.MAX_BUFFER_CAPACITY);
         BytesBuffer buf = new BytesBuffer(initBufferSize);
-        LZ4BlockInputStream lzInput = new LZ4BlockInputStream(bais,
-                                                              decompressor);
+        LZ4BlockInputStream lzInput = new LZ4BlockInputStream(bais, decompressor);
         int count;
         byte[] buffer = new byte[blockSize];
         try {
@@ -84,10 +77,7 @@ public static BytesBuffer decompress(byte[] bytes, int blockSize,
         } catch (IOException e) {
             throw new BackendException("Failed to decompress", e);
         }
-        /*
-         * If need to perform reading outside the method,
-         * remember to call forReadWritten()
-         */
+        // If we need to perform reading outside the method, remember to call forReadWritten()
         return buf;
     }
 }