downgrade sofa-rpc to 5.12.

apache · Oct 22, 2024 · 66c47cb · 66c47cb
1 parent aae62e0
commit 66c47cb
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 97 deletions.
diff --git a/hugegraph-commons/hugegraph-rpc/pom.xml b/hugegraph-commons/hugegraph-rpc/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-all</artifactId>
-            <version>5.13.1</version>
+            <version>5.12.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.jboss.resteasy</groupId>
@@ -100,38 +100,38 @@
                     <groupId>io.grpc</groupId>
                     <artifactId>grpc-core</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>io.grpc</groupId>
-                    <artifactId>grpc-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>bolt</artifactId>
-                    <groupId>com.alipay.sofa</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jackson-annotations</artifactId>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jackson-core</artifactId>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jackson-databind</artifactId>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>netty-all</artifactId>
-                    <groupId>io.netty</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-lang3</artifactId>
-                    <groupId>org.apache.commons</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>protobuf-java</artifactId>
-                    <groupId>com.google.protobuf</groupId>
-                </exclusion>
+<!--                <exclusion>-->
+<!--                    <groupId>io.grpc</groupId>-->
+<!--                    <artifactId>grpc-all</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>bolt</artifactId>-->
+<!--                    <groupId>com.alipay.sofa</groupId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>jackson-annotations</artifactId>-->
+<!--                    <groupId>com.fasterxml.jackson.core</groupId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>jackson-core</artifactId>-->
+<!--                    <groupId>com.fasterxml.jackson.core</groupId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>jackson-databind</artifactId>-->
+<!--                    <groupId>com.fasterxml.jackson.core</groupId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>netty-all</artifactId>-->
+<!--                    <groupId>io.netty</groupId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>commons-lang3</artifactId>-->
+<!--                    <groupId>org.apache.commons</groupId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>protobuf-java</artifactId>-->
+<!--                    <groupId>com.google.protobuf</groupId>-->
+<!--                </exclusion>-->
             </exclusions>
         </dependency>
         <dependency>

diff --git a/hugegraph-server/hugegraph-api/pom.xml b/hugegraph-server/hugegraph-api/pom.xml
@@ -39,6 +39,7 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
             <!-- Keep consistent with grpc dependency version (pd/store) -->
+<!--            <version>1.47.0</version>-->
             <version>1.39.0</version>
         </dependency>
 

diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraphParams.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraphParams.java
@@ -25,7 +25,6 @@
 import org.apache.hugegraph.backend.store.ram.RamTable;
 import org.apache.hugegraph.backend.tx.GraphTransaction;
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.config.HugeConfig;
 import org.apache.hugegraph.event.EventHub;
 import org.apache.hugegraph.job.EphemeralJob;

diff --git a/...egraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryBackendEntry.java b/...egraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryBackendEntry.java
@@ -49,7 +49,8 @@ public BinaryBackendEntry(HugeType type, byte[] bytes, boolean enablePartition)
     }
 
     // FIXME: `enablePartition` is unused here
-    public BinaryBackendEntry(HugeType type, byte[] bytes, boolean enablePartition, boolean isOlap) {
+    public BinaryBackendEntry(HugeType type, byte[] bytes, boolean enablePartition,
+                              boolean isOlap) {
         this(type, BytesBuffer.wrap(bytes).parseOlapId(type, isOlap));
     }
 

diff --git a/...ugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinarySerializer.java b/...ugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinarySerializer.java
@@ -17,6 +17,8 @@
 
 package org.apache.hugegraph.backend.serializer;
 
+import static org.apache.hugegraph.schema.SchemaElement.UNDEF;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
@@ -74,8 +76,6 @@
 import org.apache.hugegraph.util.StringEncoding;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 
-import static org.apache.hugegraph.schema.SchemaElement.UNDEF;
-
 public class BinarySerializer extends AbstractSerializer {
 
     /*
@@ -932,10 +932,10 @@ public BackendEntry parse(BackendEntry originEntry) {
         BytesBuffer buffer = BytesBuffer.allocate(BytesBuffer.BUF_EDGE_ID);
         buffer.write(parsedEntry.id().asBytes());
         buffer.write(bytes);
-        parsedEntry = new BinaryBackendEntry(originEntry.type(), new BinaryId(buffer.bytes(),
-                                                                              BytesBuffer.wrap(
-                                                                                                 buffer.bytes())
-                                                                                         .readEdgeId()));
+        parsedEntry = new BinaryBackendEntry(originEntry.type(),
+                                             new BinaryId(buffer.bytes(),
+                                                          BytesBuffer.wrap(buffer.bytes())
+                                                                     .readEdgeId()));
 
         for (BackendColumn col : originEntry.columns()) {
             parsedEntry.column(buffer.bytes(), col.value);

diff --git a/...server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphTransaction.java b/...server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphTransaction.java
@@ -34,8 +34,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.google.common.collect.Iterators;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.hugegraph.HugeException;
 import org.apache.hugegraph.HugeGraph;
@@ -103,6 +101,7 @@
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
 
 import jakarta.ws.rs.ForbiddenException;
 
@@ -1053,8 +1052,10 @@ protected Iterator<HugeEdge> queryEdgesFromBackend(Query query) {
         if (query instanceof ConditionQuery && !query.paging()) {
             // TODO: support: paging + parent label
             boolean supportIn = this.storeFeatures().supportsQueryWithInCondition();
-            // consider multi labels + properties, see org.apache.hugegraph.core.EdgeCoreTest.testQueryInEdgesOfVertexByLabels
-            Stream<ConditionQuery> flattenedQueries = ConditionQueryFlatten.flatten((ConditionQuery) query, supportIn).stream();
+            // consider multi labels + properties,
+            // see org.apache.hugegraph.core.EdgeCoreTest.testQueryInEdgesOfVertexByLabels
+            Stream<ConditionQuery> flattenedQueries =
+                    ConditionQueryFlatten.flatten((ConditionQuery) query, supportIn).stream();
 
             Stream<Iterator<HugeEdge>> edgeIterators = flattenedQueries.map(cq -> {
                 Id label = cq.condition(HugeKeys.LABEL);
@@ -1073,7 +1074,8 @@ protected Iterator<HugeEdge> queryEdgesFromBackend(Query query) {
                 }
             });
 
-            return edgeIterators.reduce(ExtendableIterator::concat).orElse(Collections.emptyIterator());
+            return edgeIterators.reduce(ExtendableIterator::concat)
+                                .orElse(Collections.emptyIterator());
         }
 
         return queryEdgesFromBackendInternal(query);
@@ -1640,7 +1642,8 @@ private Query optimizeQuery(ConditionQuery query) {
              */
             boolean byLabel = (label != null && query.conditionsSize() == 1);
             if (!byLabel || this.store().features().supportsQueryByLabel()) {
-                if (this.storeFeatures().supportsFatherAndSubEdgeLabel() && byLabel && query.resultType().isEdge()) {
+                if (this.storeFeatures().supportsFatherAndSubEdgeLabel() && byLabel &&
+                    query.resultType().isEdge()) {
                     // for memory backend
                     EdgeLabel edgeLabel = graph().edgeLabel(label);
                     if (edgeLabel.hasFather()) {

diff --git a/...ver/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/SchemaTransactionV2.java b/...ver/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/SchemaTransactionV2.java
@@ -626,7 +626,8 @@ public Id createOlapPk(PropertyKey propertyKey) {
         return asyncRun(this.graph(), propertyKey, job);
     }
 
-    // -- store related methods, divided into two categories: 1. olap table related 2. ID generation strategy
+    // -- store related methods, divided into two categories:
+    // 1. olap table related 2. ID generation strategy
     // - 1. olap table related
     public void createOlapPk(Id id) {
         this.graphParams().loadGraphStore().createOlapTable(id);

diff --git a/...c/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java b/...c/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java
@@ -26,7 +26,6 @@
 import org.apache.hugegraph.backend.query.Query;
 import org.apache.hugegraph.job.UserJob;
 import org.apache.hugegraph.job.algorithm.BfsTraverser;
-import org.apache.hugegraph.schema.SchemaLabel;
 import org.apache.hugegraph.structure.HugeVertex;
 import org.apache.hugegraph.traversal.algorithm.HugeTraverser;
 import org.apache.hugegraph.type.define.Directions;

diff --git a/...rver/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/EdgeLabelRemoveJob.java b/...rver/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/EdgeLabelRemoveJob.java
@@ -23,7 +23,6 @@
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.tx.GraphTransaction;
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.schema.EdgeLabel;
 import org.apache.hugegraph.type.define.SchemaStatus;
 import org.apache.hugegraph.util.LockUtil;

diff --git a/...er/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRebuildJob.java b/...er/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRebuildJob.java
@@ -25,7 +25,6 @@
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.tx.GraphTransaction;
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.schema.EdgeLabel;
 import org.apache.hugegraph.schema.IndexLabel;
 import org.apache.hugegraph.schema.SchemaElement;

diff --git a/...ver/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRemoveJob.java b/...ver/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRemoveJob.java
@@ -21,7 +21,6 @@
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.tx.GraphTransaction;
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.schema.IndexLabel;
 import org.apache.hugegraph.type.define.SchemaStatus;
 import org.apache.hugegraph.util.LockUtil;

diff --git a/...hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyClearJob.java b/...hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyClearJob.java
@@ -21,7 +21,6 @@
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.tx.GraphTransaction;
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.schema.IndexLabel;
 import org.apache.hugegraph.type.define.SchemaStatus;
 import org.apache.hugegraph.util.LockUtil;

diff --git a/...ugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyCreateJob.java b/...ugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyCreateJob.java
@@ -18,7 +18,6 @@
 package org.apache.hugegraph.job.schema;
 
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.schema.PropertyKey;
 
 public class OlapPropertyKeyCreateJob extends SchemaJob {

diff --git a/...ugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyRemoveJob.java b/...ugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyRemoveJob.java
@@ -19,7 +19,6 @@
 
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.schema.PropertyKey;
 
 public class OlapPropertyKeyRemoveJob extends OlapPropertyKeyClearJob {

diff --git a/...er/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/VertexLabelRemoveJob.java b/...er/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/VertexLabelRemoveJob.java
@@ -25,7 +25,6 @@
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.tx.GraphTransaction;
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.schema.EdgeLabel;
 import org.apache.hugegraph.schema.VertexLabel;
 import org.apache.hugegraph.type.define.SchemaStatus;

diff --git a/...er/hugegraph-core/src/main/java/org/apache/hugegraph/masterelection/GlobalMasterInfo.java b/...er/hugegraph-core/src/main/java/org/apache/hugegraph/masterelection/GlobalMasterInfo.java
@@ -25,7 +25,7 @@
 // TODO: rename to GlobalNodeRoleInfo
 public final class GlobalMasterInfo {
 
-    private final static NodeInfo NO_MASTER = new NodeInfo(false, "");
+    private static final NodeInfo NO_MASTER = new NodeInfo(false, "");
 
     private volatile boolean supportElection;
     private volatile NodeInfo masterNodeInfo;

diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/meta/MetaDriver.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/meta/MetaDriver.java
@@ -25,21 +25,21 @@
 
 public interface MetaDriver {
 
-    public void put(String key, String value);
+    void put(String key, String value);
 
-    public String get(String key);
+    String get(String key);
 
-    public void delete(String key);
+    void delete(String key);
 
-    public void deleteWithPrefix(String prefix);
+    void deleteWithPrefix(String prefix);
 
-    public Map<String, String> scanWithPrefix(String prefix);
+    Map<String, String> scanWithPrefix(String prefix);
 
-    public <T> void listen(String key, Consumer<T> consumer);
+    <T> void listen(String key, Consumer<T> consumer);
 
-    public <T> void listenPrefix(String prefix, Consumer<T> consumer);
+    <T> void listenPrefix(String prefix, Consumer<T> consumer);
 
-    public <T> List<String> extractValuesFromResponse(T response);
+    <T> List<String> extractValuesFromResponse(T response);
 
     /**
      * Extract K-V pairs of response
@@ -48,19 +48,19 @@ public interface MetaDriver {
      * @param response
      * @return
      */
-    public <T> Map<String, String> extractKVFromResponse(T response);
+    <T> Map<String, String> extractKVFromResponse(T response);
 
-    public LockResult tryLock(String key, long ttl, long timeout);
+    LockResult tryLock(String key, long ttl, long timeout);
 
     /**
      * return if the key is Locked.
      *
      * @param key
      * @return bool
      */
-    public boolean isLocked(String key);
+    boolean isLocked(String key);
 
-    public void unlock(String key, LockResult lockResult);
+    void unlock(String key, LockResult lockResult);
 
     /**
      * keepAlive of current lease
@@ -69,5 +69,5 @@ public interface MetaDriver {
      * @param lease
      * @return next leaseId
      */
-    public long keepAlive(String key, long lease);
+    long keepAlive(String key, long lease);
 }
diff --git a/...rver/hugegraph-core/src/main/java/org/apache/hugegraph/meta/lock/EtcdDistributedLock.java b/...rver/hugegraph-core/src/main/java/org/apache/hugegraph/meta/lock/EtcdDistributedLock.java
@@ -44,11 +44,12 @@ public class EtcdDistributedLock {
     private final Lease leaseClient;
 
     private static final int poolSize = 8;
-    private final ScheduledExecutorService service = new ScheduledThreadPoolExecutor(poolSize, r -> {
-        Thread t = new Thread(r, "keepalive");
-        t.setDaemon(true);
-        return t;
-    });
+    private final ScheduledExecutorService service =
+            new ScheduledThreadPoolExecutor(poolSize, r -> {
+                Thread t = new Thread(r, "keepalive");
+                t.setDaemon(true);
+                return t;
+            });
 
     private EtcdDistributedLock(Client client) {
         this.kvClient = client.getKVClient();

diff --git a/.../hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/PropertyKeyBuilder.java b/.../hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/PropertyKeyBuilder.java
@@ -25,7 +25,6 @@
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.id.IdGenerator;
 import org.apache.hugegraph.backend.tx.ISchemaTransaction;
-import org.apache.hugegraph.backend.tx.SchemaTransaction;
 import org.apache.hugegraph.config.CoreOptions;
 import org.apache.hugegraph.exception.ExistedException;
 import org.apache.hugegraph.exception.NotAllowException;
@@ -42,17 +41,16 @@
 import org.apache.hugegraph.type.define.WriteType;
 import org.apache.hugegraph.util.E;
 
-public class PropertyKeyBuilder extends AbstractBuilder
-        implements PropertyKey.Builder {
+public class PropertyKeyBuilder extends AbstractBuilder implements PropertyKey.Builder {
 
     private Id id;
-    private String name;
+    private final String name;
     private DataType dataType;
     private Cardinality cardinality;
     private AggregateType aggregateType;
     private WriteType writeType;
     private boolean checkExist;
-    private Userdata userdata;
+    private final Userdata userdata;
 
     public PropertyKeyBuilder(ISchemaTransaction transaction,
                               HugeGraph graph, String name) {