[fix][ci] Fix loader compile error & adaptation apache loader/client

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
  env:
  TRAVIS_DIR: computer-dist/src/assembly/travis
  KUBERNETES_VERSION: 1.20.1
- HUGEGRAPH_SERVER_COMMIT_ID: 848b8fb17804ddc561af832dff0bdc3f6221c904
+ HUGEGRAPH_SERVER_COMMIT_ID: b1b12098feb726e46c781a2f171c77558db05fc1
 
  steps:
  - name: Checkout
@@ -32,6 +32,19 @@ jobs:
  uses: actions/setup-python@v4
  with:
  python-version: '3.8'
+
+ - name: Cache HDFS packages
+ uses: actions/cache@v3
+ id: hdfs-cache
+ with:
+ path: ~/hadoop-3.3.2.tar.gz
+ key: ${{ runner.os }}--hadoop
+ restore-keys: ${{ runner.os }}-hadoop
+
+ - name: Download HDFS
+ if: steps.hdfs-cache.outputs.cache-hit != 'true'
+ run: wget http://archive.apache.org/dist/hadoop/common/hadoop-3.3.2/hadoop-3.3.2.tar.gz -O ~/hadoop-3.3.2.tar.gz
+
  - name: Setup HDFS
  run: $TRAVIS_DIR/install-hdfs.sh
 
@@ -62,13 +75,13 @@ jobs:
  distribution: 'zulu'
 
  - name: Compile
- run: mvn clean compile -Dmaven.javadoc.skip=true | grep -v "Downloading\|Downloaded"
+ run: mvn clean compile -Dmaven.javadoc.skip=true -ntp
 
  - name: Integrate test
- run: mvn test -P integrate-test
+ run: mvn test -P integrate-test -ntp
 
  - name: Unit test
- run: mvn test -P unit-test
+ run: mvn test -P unit-test -ntp
 
  - name: Upload coverage to Codecov
  uses: codecov/codecov-action@v3.0.0

checkstyle.xml

@@ -19,7 +19,7 @@
  <module name="TreeWalker">
  <!--检查行长度-->
  <module name="LineLength">
- <property name="max" value="80"/>
+ <property name="max" value="100"/>
  <!--可以忽略的行-->
  <property name="ignorePattern"
  value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>

computer-algorithm/pom.xml

@@ -43,6 +43,16 @@
  <include>*:*</include>
  </includes>
  </artifactSet>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
  </configuration>
  </execution>
  </executions>

computer-algorithm/src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/betweenness/BetweennessCentrality.java

@@ -35,7 +35,7 @@
 import com.baidu.hugegraph.computer.core.graph.vertex.Vertex;
 import com.baidu.hugegraph.computer.core.worker.Computation;
 import com.baidu.hugegraph.computer.core.worker.ComputationContext;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.util.Log;
 
 public class BetweennessCentrality implements Computation<BetweennessMessage> {
 

computer-algorithm/src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/betweenness/BetweennessMessage.java

@@ -28,7 +28,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.CustomizeValue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class BetweennessMessage implements CustomizeValue<BetweennessMessage> {
 

computer-algorithm/src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/closeness/ClosenessCentrality.java

@@ -32,8 +32,8 @@
 import com.baidu.hugegraph.computer.core.graph.vertex.Vertex;
 import com.baidu.hugegraph.computer.core.worker.Computation;
 import com.baidu.hugegraph.computer.core.worker.ComputationContext;
-import com.baidu.hugegraph.util.Log;
-import com.baidu.hugegraph.util.NumericUtil;
+import org.apache.hugegraph.util.Log;
+import org.apache.hugegraph.util.NumericUtil;
 
 public class ClosenessCentrality implements Computation<ClosenessMessage> {
 

computer-algorithm/src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java

@@ -33,7 +33,7 @@
 import com.baidu.hugegraph.computer.core.worker.Computation;
 import com.baidu.hugegraph.computer.core.worker.ComputationContext;
 import com.baidu.hugegraph.computer.core.worker.WorkerContext;
-import com.baidu.hugegraph.util.NumericUtil;
+import org.apache.hugegraph.util.NumericUtil;
 
 public class DegreeCentrality implements Computation<NullValue> {
 

computer-algorithm/src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/pagerank/PageRank4Master.java

@@ -29,7 +29,7 @@
 import com.baidu.hugegraph.computer.core.master.MasterComputation;
 import com.baidu.hugegraph.computer.core.master.MasterComputationContext;
 import com.baidu.hugegraph.computer.core.master.MasterContext;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.util.Log;
 
 public class PageRank4Master implements MasterComputation {
 

computer-algorithm/src/main/java/com/baidu/hugegraph/computer/algorithm/community/kcore/KcoreValue.java

@@ -28,7 +28,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.CustomizeValue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class KcoreValue implements CustomizeValue<Object> {
 

computer-algorithm/src/main/java/com/baidu/hugegraph/computer/algorithm/path/rings/filter/FilterDescribe.java

@@ -23,7 +23,7 @@
 
 import org.apache.commons.collections.CollectionUtils;
 
-import com.baidu.hugegraph.util.JsonUtil;
+import org.apache.hugegraph.util.JsonUtil;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;

computer-api/pom.xml

@@ -13,7 +13,7 @@
 
  <dependencies>
  <dependency>
- <groupId>com.baidu.hugegraph</groupId>
+ <groupId>org.apache.hugegraph</groupId>
  <artifactId>hugegraph-client</artifactId>
  </dependency>
  </dependencies>

computer-api/src/main/java/com/baidu/hugegraph/computer/algorithm/AlgorithmParams.java

@@ -23,8 +23,8 @@
 
 import org.slf4j.Logger;
 
-import com.baidu.hugegraph.config.ConfigOption;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.config.ConfigOption;
+import org.apache.hugegraph.util.Log;
 
 public interface AlgorithmParams {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/DoubleValueSumCombiner.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.combiner;
 
 import com.baidu.hugegraph.computer.core.graph.value.DoubleValue;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class DoubleValueSumCombiner implements Combiner<DoubleValue> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/FloatValueSumCombiner.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.combiner;
 
 import com.baidu.hugegraph.computer.core.graph.value.FloatValue;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class FloatValueSumCombiner implements Combiner<FloatValue> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/IntValueSumCombiner.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.combiner;
 
 import com.baidu.hugegraph.computer.core.graph.value.IntValue;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class IntValueSumCombiner implements Combiner<IntValue> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/LongValueSumCombiner.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.combiner;
 
 import com.baidu.hugegraph.computer.core.graph.value.LongValue;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class LongValueSumCombiner implements Combiner<LongValue> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/MergeNewPropertiesCombiner.java

@@ -23,7 +23,7 @@
 
 import com.baidu.hugegraph.computer.core.graph.properties.Properties;
 import com.baidu.hugegraph.computer.core.graph.value.Value;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class MergeNewPropertiesCombiner implements PropertiesCombiner {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/MergeOldPropertiesCombiner.java

@@ -23,7 +23,7 @@
 
 import com.baidu.hugegraph.computer.core.graph.properties.Properties;
 import com.baidu.hugegraph.computer.core.graph.value.Value;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class MergeOldPropertiesCombiner implements PropertiesCombiner {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/OverwriteCombiner.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.combiner;
 
 import com.baidu.hugegraph.computer.core.graph.value.Value;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class OverwriteCombiner<T extends Value> implements Combiner<T> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/OverwritePropertiesCombiner.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.combiner;
 
 import com.baidu.hugegraph.computer.core.graph.properties.Properties;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class OverwritePropertiesCombiner implements PropertiesCombiner {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/ValueMaxCombiner.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.combiner;
 
 import com.baidu.hugegraph.computer.core.graph.value.Value;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class ValueMaxCombiner<T extends Value> implements Combiner<T> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/combiner/ValueMinCombiner.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.combiner;
 
 import com.baidu.hugegraph.computer.core.graph.value.Value;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class ValueMinCombiner<T extends Value> implements Combiner<T> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/common/ComputerContext.java

@@ -22,7 +22,7 @@
 import com.baidu.hugegraph.computer.core.allocator.Allocator;
 import com.baidu.hugegraph.computer.core.config.Config;
 import com.baidu.hugegraph.computer.core.graph.GraphFactory;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public final class ComputerContext {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/common/Constants.java

@@ -19,7 +19,7 @@
 
 package com.baidu.hugegraph.computer.core.common;
 
-import com.baidu.hugegraph.util.Bytes;
+import org.apache.hugegraph.util.Bytes;
 
 public final class Constants {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/common/SerialEnum.java

@@ -20,7 +20,7 @@
 package com.baidu.hugegraph.computer.core.common;
 
 import com.baidu.hugegraph.computer.core.common.exception.ComputerException;
-import com.baidu.hugegraph.util.CollectionUtil;
+import org.apache.hugegraph.util.CollectionUtil;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/config/Config.java

@@ -19,9 +19,9 @@
 
 package com.baidu.hugegraph.computer.core.config;
 
-import com.baidu.hugegraph.config.ConfigOption;
-import com.baidu.hugegraph.config.HugeConfig;
-import com.baidu.hugegraph.config.TypedOption;
+import org.apache.hugegraph.config.ConfigOption;
+import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.config.TypedOption;
 
 public interface Config {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/config/Null.java

@@ -19,7 +19,7 @@
 
 package com.baidu.hugegraph.computer.core.config;
 
-import com.baidu.hugegraph.config.ConfigOption;
+import org.apache.hugegraph.config.ConfigOption;
 
 /**
  * Null is used in ConfigOption<Class> to indicate a null class option.

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/BooleanValue.java

@@ -24,7 +24,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.Tvalue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class BooleanValue implements Tvalue<Boolean> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/DoubleValue.java

@@ -24,7 +24,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.Tvalue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class DoubleValue extends Number implements Tvalue<Double> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/FloatValue.java

@@ -24,7 +24,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.Tvalue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class FloatValue extends Number implements Tvalue<Float> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/IntValue.java

@@ -24,7 +24,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.Tvalue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class IntValue extends Number implements Tvalue<Integer> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/ListValue.java

@@ -36,7 +36,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.Tvalue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class ListValue<T extends Tvalue<?>> implements Tvalue<List<Object>> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/LongValue.java

@@ -24,7 +24,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.Tvalue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class LongValue extends Number implements Tvalue<Long> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/NullValue.java

@@ -24,7 +24,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.Tvalue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class NullValue implements Tvalue<Void> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/StringValue.java

@@ -25,7 +25,7 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value.Tvalue;
 import com.baidu.hugegraph.computer.core.io.RandomAccessInput;
 import com.baidu.hugegraph.computer.core.io.RandomAccessOutput;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public class StringValue implements Tvalue<String> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/graph/value/Value.java

@@ -21,7 +21,7 @@
 
 import com.baidu.hugegraph.computer.core.io.Readable;
 import com.baidu.hugegraph.computer.core.io.Writable;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
 
 public interface Value extends Writable, Readable, Comparable<Value> {
 

computer-api/src/main/java/com/baidu/hugegraph/computer/core/input/InputFilter.java

@@ -19,8 +19,8 @@
 
 package com.baidu.hugegraph.computer.core.input;
 
-import com.baidu.hugegraph.structure.graph.Edge;
-import com.baidu.hugegraph.structure.graph.Vertex;
+import org.apache.hugegraph.structure.graph.Edge;
+import org.apache.hugegraph.structure.graph.Vertex;
 
 /**
  * Filter vertices or edges, user can filter vertices, edges and their

computer-api/src/main/java/com/baidu/hugegraph/computer/core/worker/FilterComputation.java

@@ -24,7 +24,7 @@
 
 import com.baidu.hugegraph.computer.core.graph.value.Value;
 import com.baidu.hugegraph.computer.core.graph.vertex.Vertex;
-import com.baidu.hugegraph.iterator.MapperIterator;
+import org.apache.hugegraph.iterator.MapperIterator;
 
 /**
  * FilterComputation is computation that can't combine the messages. When