diff --git a/hg-pd-client/pom.xml b/hg-pd-client/pom.xml index 124830a7a..9e1c81694 100644 --- a/hg-pd-client/pom.xml +++ b/hg-pd-client/pom.xml @@ -41,14 +41,14 @@ 2.17.0 - com.baidu.hugegraph + org.apache.hugegraph hg-pd-grpc - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hg-pd-common - ${project.version} + ${revision} compile diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java index cd83f16fc..65dad1080 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java @@ -26,14 +26,14 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; import java.util.stream.Stream; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.PDGrpc; -import com.baidu.hugegraph.pd.grpc.PDGrpc.PDBlockingStub; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.Pdpb.GetMembersRequest; -import com.baidu.hugegraph.pd.grpc.Pdpb.GetMembersResponse; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.PDGrpc; +import org.apache.hugegraph.pd.grpc.PDGrpc.PDBlockingStub; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.Pdpb.GetMembersRequest; +import org.apache.hugegraph.pd.grpc.Pdpb.GetMembersResponse; import io.grpc.Channel; import io.grpc.ClientCall; diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/Discoverable.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/Discoverable.java index c2daa5c55..dfdcfa2cc 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/Discoverable.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/Discoverable.java @@ -17,8 +17,8 @@ package org.apache.hugegraph.pd.client; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfos; -import com.baidu.hugegraph.pd.grpc.discovery.Query; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfos; +import org.apache.hugegraph.pd.grpc.discovery.Query; /** * @author zhangyingjie diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClient.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClient.java index ef2c18c06..287cb75d6 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClient.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClient.java @@ -27,12 +27,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Consumer; import java.util.function.Function; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.discovery.DiscoveryServiceGrpc; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfo; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfos; -import com.baidu.hugegraph.pd.grpc.discovery.Query; -import com.baidu.hugegraph.pd.grpc.discovery.RegisterInfo; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.discovery.DiscoveryServiceGrpc; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfo; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfos; +import org.apache.hugegraph.pd.grpc.discovery.Query; +import org.apache.hugegraph.pd.grpc.discovery.RegisterInfo; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClientImpl.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClientImpl.java index 0b1e1d389..b5e04f757 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClientImpl.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClientImpl.java @@ -20,8 +20,8 @@ package org.apache.hugegraph.pd.client; import java.util.Map; import java.util.function.Consumer; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfo; -import com.baidu.hugegraph.pd.grpc.discovery.RegisterType; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfo; +import org.apache.hugegraph.pd.grpc.discovery.RegisterType; /** * @author zhangyingjie diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/KvClient.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/KvClient.java index 5c5e1bc1c..8270e78f2 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/KvClient.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/KvClient.java @@ -27,22 +27,22 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.BiConsumer; import java.util.function.Consumer; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.kv.K; -import com.baidu.hugegraph.pd.grpc.kv.KResponse; -import com.baidu.hugegraph.pd.grpc.kv.Kv; -import com.baidu.hugegraph.pd.grpc.kv.KvResponse; -import com.baidu.hugegraph.pd.grpc.kv.KvServiceGrpc; -import com.baidu.hugegraph.pd.grpc.kv.LockRequest; -import com.baidu.hugegraph.pd.grpc.kv.LockResponse; -import com.baidu.hugegraph.pd.grpc.kv.ScanPrefixResponse; -import com.baidu.hugegraph.pd.grpc.kv.TTLRequest; -import com.baidu.hugegraph.pd.grpc.kv.TTLResponse; -import com.baidu.hugegraph.pd.grpc.kv.WatchEvent; -import com.baidu.hugegraph.pd.grpc.kv.WatchKv; -import com.baidu.hugegraph.pd.grpc.kv.WatchRequest; -import com.baidu.hugegraph.pd.grpc.kv.WatchResponse; -import com.baidu.hugegraph.pd.grpc.kv.WatchType; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.kv.K; +import org.apache.hugegraph.pd.grpc.kv.KResponse; +import org.apache.hugegraph.pd.grpc.kv.Kv; +import org.apache.hugegraph.pd.grpc.kv.KvResponse; +import org.apache.hugegraph.pd.grpc.kv.KvServiceGrpc; +import org.apache.hugegraph.pd.grpc.kv.LockRequest; +import org.apache.hugegraph.pd.grpc.kv.LockResponse; +import org.apache.hugegraph.pd.grpc.kv.ScanPrefixResponse; +import org.apache.hugegraph.pd.grpc.kv.TTLRequest; +import org.apache.hugegraph.pd.grpc.kv.TTLResponse; +import org.apache.hugegraph.pd.grpc.kv.WatchEvent; +import org.apache.hugegraph.pd.grpc.kv.WatchKv; +import org.apache.hugegraph.pd.grpc.kv.WatchRequest; +import org.apache.hugegraph.pd.grpc.kv.WatchResponse; +import org.apache.hugegraph.pd.grpc.kv.WatchType; import io.grpc.stub.AbstractBlockingStub; import io.grpc.stub.AbstractStub; @@ -186,17 +186,7 @@ public class KvClient extends AbstractClient implements WatchRequest k = WatchRequest.newBuilder().setClientId(clientId.get()).setKey(prefix).build(); streamingCall(KvServiceGrpc.getWatchPrefixMethod(), k, observer, 1); - } BiConsumer listenWrapper = (key, consumer) -> { - try { - listen(key, consumer); - } catch (PDException e) { - try { - log.warn("start listen with warning:", e); - Thread.sleep(1000); - } catch (InterruptedException ex) { - } - } - }; + } private void acquire() { if (clientId.get() == 0L) { @@ -209,7 +199,17 @@ public class KvClient extends AbstractClient implements log.error("get semaphore with error:", e); } } - } + } BiConsumer listenWrapper = (key, consumer) -> { + try { + listen(key, consumer); + } catch (PDException e) { + try { + log.warn("start listen with warning:", e); + Thread.sleep(1000); + } catch (InterruptedException ex) { + } + } + }; public List getWatchList(T response) { List values = new LinkedList<>(); @@ -237,17 +237,7 @@ public class KvClient extends AbstractClient implements values.put(key, value); } return values; - } BiConsumer prefixListenWrapper = (key, consumer) -> { - try { - listenPrefix(key, consumer); - } catch (PDException e) { - try { - log.warn("start listenPrefix with warning:", e); - Thread.sleep(1000); - } catch (InterruptedException ex) { - } - } - }; + } public LockResponse lock(String key, long ttl) throws PDException { acquire(); @@ -269,7 +259,17 @@ public class KvClient extends AbstractClient implements clientId.compareAndSet(0L, response.getClientId()); assert clientId.get() == response.getClientId(); return response; - } + } BiConsumer prefixListenWrapper = (key, consumer) -> { + try { + listenPrefix(key, consumer); + } catch (PDException e) { + try { + log.warn("start listenPrefix with warning:", e); + Thread.sleep(1000); + } catch (InterruptedException ex) { + } + } + }; public LockResponse isLocked(String key) throws PDException { LockRequest k = LockRequest.newBuilder().setKey(key).setClientId(clientId.get()).build(); diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/LicenseClient.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/LicenseClient.java index ce20c0aa0..5dcad36ff 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/LicenseClient.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/LicenseClient.java @@ -17,9 +17,10 @@ package org.apache.hugegraph.pd.client; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.grpc.PDGrpc; -import com.baidu.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.grpc.PDGrpc; +import org.apache.hugegraph.pd.grpc.Pdpb; + import com.google.protobuf.ByteString; import io.grpc.stub.AbstractBlockingStub; diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDClient.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDClient.java index 9a8fc21e7..703a23779 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDClient.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDClient.java @@ -23,18 +23,18 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.common.PartitionCache; +import org.apache.hugegraph.pd.common.PartitionUtils; +import org.apache.hugegraph.pd.grpc.MetaTask; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.PDGrpc; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; import org.apache.hugegraph.pd.watch.NodeEvent; import org.apache.hugegraph.pd.watch.PartitionEvent; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.common.PartitionCache; -import com.baidu.hugegraph.pd.common.PartitionUtils; -import com.baidu.hugegraph.pd.grpc.MetaTask; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.PDGrpc; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; import com.google.protobuf.ByteString; import io.grpc.ManagedChannel; diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulse.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulse.java index ca01327cb..8b5ac3904 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulse.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulse.java @@ -20,11 +20,10 @@ package org.apache.hugegraph.pd.client; import java.io.Closeable; import java.util.function.Consumer; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; import org.apache.hugegraph.pd.pulse.PulseServerNotice; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; - /** * Bidirectional communication interface of pd-client and pd-server * diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulseImpl.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulseImpl.java index 4dd00c0d2..8b85bc911 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulseImpl.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulseImpl.java @@ -20,16 +20,17 @@ package org.apache.hugegraph.pd.client; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import com.baidu.hugegraph.pd.grpc.pulse.HgPdPulseGrpc; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; -import com.baidu.hugegraph.pd.grpc.pulse.PulseAckRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PulseCreateRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PulseNoticeRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PulseRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PulseResponse; -import com.baidu.hugegraph.pd.grpc.pulse.PulseType; -import com.baidu.hugegraph.pd.pulse.PartitionNotice; +import org.apache.hugegraph.pd.grpc.pulse.HgPdPulseGrpc; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; +import org.apache.hugegraph.pd.grpc.pulse.PulseAckRequest; +import org.apache.hugegraph.pd.grpc.pulse.PulseCreateRequest; +import org.apache.hugegraph.pd.grpc.pulse.PulseNoticeRequest; +import org.apache.hugegraph.pd.grpc.pulse.PulseRequest; +import org.apache.hugegraph.pd.grpc.pulse.PulseResponse; +import org.apache.hugegraph.pd.grpc.pulse.PulseType; +import org.apache.hugegraph.pd.pulse.PartitionNotice; + import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.grpc.ManagedChannel; diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatch.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatch.java index 3dfb7de65..b068ea018 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatch.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatch.java @@ -20,11 +20,10 @@ package org.apache.hugegraph.pd.client; import java.io.Closeable; import java.util.function.Consumer; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; import org.apache.hugegraph.pd.watch.NodeEvent; import org.apache.hugegraph.pd.watch.PartitionEvent; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; - /** * @author lynn.bond@hotmail.com created on 2021/11/4 */ diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatchImpl.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatchImpl.java index e9ca7757c..0e6d0ad4b 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatchImpl.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatchImpl.java @@ -19,15 +19,15 @@ package org.apache.hugegraph.pd.client; import java.util.function.Supplier; -import com.baidu.hugegraph.pd.grpc.watch.HgPdWatchGrpc; -import com.baidu.hugegraph.pd.grpc.watch.WatchCreateRequest; -import com.baidu.hugegraph.pd.grpc.watch.WatchNodeResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchPartitionResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchRequest; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchType; -import com.baidu.hugegraph.pd.watch.NodeEvent; -import com.baidu.hugegraph.pd.watch.PartitionEvent; +import org.apache.hugegraph.pd.grpc.watch.HgPdWatchGrpc; +import org.apache.hugegraph.pd.grpc.watch.WatchCreateRequest; +import org.apache.hugegraph.pd.grpc.watch.WatchNodeResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchPartitionResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchRequest; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchType; +import org.apache.hugegraph.pd.watch.NodeEvent; +import org.apache.hugegraph.pd.watch.PartitionEvent; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/pulse/PartitionNotice.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/pulse/PartitionNotice.java index e7226b898..af9403b72 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/pulse/PartitionNotice.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/pulse/PartitionNotice.java @@ -19,7 +19,7 @@ package org.apache.hugegraph.pd.pulse; import java.util.function.Consumer; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; /** * @author lynn.bond@hotmail.com created on 2022/2/13 diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/NodeEvent.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/NodeEvent.java index 508fa12ef..5cf00e5d1 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/NodeEvent.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/NodeEvent.java @@ -19,7 +19,7 @@ package org.apache.hugegraph.pd.watch; import java.util.Objects; -import com.baidu.hugegraph.pd.grpc.watch.NodeEventType; +import org.apache.hugegraph.pd.grpc.watch.NodeEventType; /** * @author lynn.bond@hotmail.com created on 2021/11/4 diff --git a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/PartitionEvent.java b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/PartitionEvent.java index 6241ac3e6..4b4d04497 100644 --- a/hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/PartitionEvent.java +++ b/hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/PartitionEvent.java @@ -19,7 +19,7 @@ package org.apache.hugegraph.pd.watch; import java.util.Objects; -import com.baidu.hugegraph.pd.grpc.watch.WatchChangeType; +import org.apache.hugegraph.pd.grpc.watch.WatchChangeType; /** * @author lynn.bond@hotmail.com created on 2021/11/4 diff --git a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/PartitionCacheTest.java b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/PartitionCacheTest.java index 56040389c..af855451b 100644 --- a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/PartitionCacheTest.java +++ b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/PartitionCacheTest.java @@ -22,9 +22,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PartitionCache; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PartitionCache; +import org.apache.hugegraph.pd.grpc.Metapb; + import com.google.common.collect.Range; import com.google.common.collect.RangeMap; import com.google.common.collect.TreeRangeMap; diff --git a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/StoreRegisterTest.java b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/StoreRegisterTest.java index 34e001385..95e51b977 100644 --- a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/StoreRegisterTest.java +++ b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/StoreRegisterTest.java @@ -23,16 +23,15 @@ import java.util.List; import org.apache.hugegraph.pd.client.PDClient; import org.apache.hugegraph.pd.client.PDConfig; import org.apache.hugegraph.pd.client.PDPulse; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; import org.apache.hugegraph.pd.pulse.PulseServerNotice; import org.junit.Assert; import org.junit.BeforeClass; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; - public class StoreRegisterTest { private static PDClient pdClient; private final String storeAddr = "localhost"; diff --git a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/DiscoveryClientImplTest.java b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/DiscoveryClientImplTest.java index 692bfa216..09e5a90dd 100644 --- a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/DiscoveryClientImplTest.java +++ b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/DiscoveryClientImplTest.java @@ -23,11 +23,10 @@ import java.util.Vector; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfos; +import org.apache.hugegraph.pd.grpc.discovery.Query; import org.junit.Assert; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfos; -import com.baidu.hugegraph.pd.grpc.discovery.Query; - /** * @author zhangyingjie * @date 2021/12/21 diff --git a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/LicenseClientImplTest.java b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/LicenseClientImplTest.java index 34d403caa..b7991b525 100644 --- a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/LicenseClientImplTest.java +++ b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/LicenseClientImplTest.java @@ -23,12 +23,11 @@ import java.util.Map; import java.util.Properties; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.kv.KResponse; +import org.apache.hugegraph.pd.grpc.kv.KvResponse; import org.yaml.snakeyaml.Yaml; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.kv.KResponse; -import com.baidu.hugegraph.pd.grpc.kv.KvResponse; - import lombok.extern.slf4j.Slf4j; /** diff --git a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/PDPulseTest.java b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/PDPulseTest.java index 6a087ae96..cdeb60ef9 100644 --- a/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/PDPulseTest.java +++ b/hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/PDPulseTest.java @@ -21,11 +21,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.apache.hugegraph.pd.client.test.HgPDTestUtil; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; import org.apache.hugegraph.pd.pulse.PulseServerNotice; import org.junit.BeforeClass; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; - /** * @author lynn.bond@hotmail.com created on 2021/11/8 */ diff --git a/hg-pd-clitools/pom.xml b/hg-pd-clitools/pom.xml index 524ae5aff..fa9054bf3 100644 --- a/hg-pd-clitools/pom.xml +++ b/hg-pd-clitools/pom.xml @@ -29,7 +29,7 @@ hg-pd-clitools - com.baidu.hugegraph + org.apache.hugegraph hg-pd-client 3.6.5-SNAPSHOT diff --git a/hg-pd-clitools/src/main/java/org/apache/hugegraph/pd/clitools/Main.java b/hg-pd-clitools/src/main/java/org/apache/hugegraph/pd/clitools/Main.java index cb05a8db7..beb1a1723 100644 --- a/hg-pd-clitools/src/main/java/org/apache/hugegraph/pd/clitools/Main.java +++ b/hg-pd-clitools/src/main/java/org/apache/hugegraph/pd/clitools/Main.java @@ -17,10 +17,10 @@ package org.apache.hugegraph.pd.clitools; -import com.baidu.hugegraph.pd.client.PDClient; -import com.baidu.hugegraph.pd.client.PDConfig; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.client.PDClient; +import org.apache.hugegraph.pd.client.PDConfig; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; public class Main { diff --git a/hg-pd-clitools/src/test/java/org/apache/hugegraph/pd/clitools/MainTest.java b/hg-pd-clitools/src/test/java/org/apache/hugegraph/pd/clitools/MainTest.java index 65f21ed91..4fa7eaebb 100644 --- a/hg-pd-clitools/src/test/java/org/apache/hugegraph/pd/clitools/MainTest.java +++ b/hg-pd-clitools/src/test/java/org/apache/hugegraph/pd/clitools/MainTest.java @@ -20,7 +20,7 @@ package org.apache.hugegraph.pd.clitools; import java.util.Arrays; import java.util.List; -import com.baidu.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.common.PDException; public class MainTest { public static boolean test2sup(List arrays, int tail, int res) { diff --git a/hg-pd-common/pom.xml b/hg-pd-common/pom.xml index 715cec30c..2e6b24ab9 100644 --- a/hg-pd-common/pom.xml +++ b/hg-pd-common/pom.xml @@ -35,9 +35,9 @@ - com.baidu.hugegraph + org.apache.hugegraph hg-pd-grpc - ${project.version} + ${revision} \ No newline at end of file diff --git a/hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PDException.java b/hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PDException.java index 629989bc2..3efc7d138 100644 --- a/hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PDException.java +++ b/hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PDException.java @@ -18,7 +18,8 @@ package org.apache.hugegraph.pd.common; public class PDException extends Exception { - private int errorCode = 0; + + private final int errorCode; public PDException(int error) { super(String.format("Error code = %d", error)); diff --git a/hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PartitionCache.java b/hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PartitionCache.java index e12278808..a829dd656 100644 --- a/hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PartitionCache.java +++ b/hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PartitionCache.java @@ -27,7 +27,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; + import com.google.common.collect.Range; import com.google.common.collect.RangeMap; import com.google.common.collect.TreeRangeMap; diff --git a/hg-pd-core/pom.xml b/hg-pd-core/pom.xml index 55ed09e1a..e4c0aaa42 100644 --- a/hg-pd-core/pom.xml +++ b/hg-pd-core/pom.xml @@ -50,7 +50,7 @@ 6.29.5 - com.baidu.hugegraph + org.apache.hugegraph hg-pd-grpc @@ -58,7 +58,7 @@ spring-context - com.baidu.hugegraph + org.apache.hugegraph hg-pd-common @@ -81,9 +81,9 @@ - com.baidu.hugegraph + org.apache.hugegraph hg-store-grpc - ${project.version} + ${revision} \ No newline at end of file diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java index eadee3c26..197e15510 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java @@ -19,14 +19,13 @@ package org.apache.hugegraph.pd; import java.util.List; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; import org.apache.hugegraph.pd.meta.ConfigMetaStore; import org.apache.hugegraph.pd.meta.MetadataFactory; import org.apache.hugegraph.pd.raft.RaftStateListener; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/IdService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/IdService.java index d808b9749..2e4a63603 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/IdService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/IdService.java @@ -17,12 +17,11 @@ package org.apache.hugegraph.pd; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; import org.apache.hugegraph.pd.meta.IdMetaStore; import org.apache.hugegraph.pd.meta.MetadataFactory; -import com.baidu.hugegraph.pd.common.PDException; - public class IdService { private final IdMetaStore meta; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/KvService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/KvService.java index 4166f3b22..fa972ab23 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/KvService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/KvService.java @@ -23,15 +23,15 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.kv.Kv; +import org.apache.hugegraph.pd.grpc.kv.V; import org.apache.hugegraph.pd.meta.MetadataKeyHelper; import org.apache.hugegraph.pd.meta.MetadataRocksDBStore; import org.apache.hugegraph.pd.store.KV; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.kv.Kv; -import com.baidu.hugegraph.pd.grpc.kv.V; import com.google.protobuf.InvalidProtocolBufferException; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/LogService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/LogService.java index 520b6ad4e..b493c8256 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/LogService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/LogService.java @@ -19,13 +19,13 @@ package org.apache.hugegraph.pd; import java.util.List; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; import org.apache.hugegraph.pd.meta.LogMeta; import org.apache.hugegraph.pd.meta.MetadataFactory; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; import com.google.protobuf.Any; import com.google.protobuf.GeneratedMessageV3; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionInstructionListener.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionInstructionListener.java index 893a7e995..4b7184f4b 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionInstructionListener.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionInstructionListener.java @@ -17,15 +17,15 @@ package org.apache.hugegraph.pd; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.pulse.ChangeShard; -import com.baidu.hugegraph.pd.grpc.pulse.CleanPartition; -import com.baidu.hugegraph.pd.grpc.pulse.DbCompaction; -import com.baidu.hugegraph.pd.grpc.pulse.MovePartition; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionKeyRange; -import com.baidu.hugegraph.pd.grpc.pulse.SplitPartition; -import com.baidu.hugegraph.pd.grpc.pulse.TransferLeader; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.pulse.ChangeShard; +import org.apache.hugegraph.pd.grpc.pulse.CleanPartition; +import org.apache.hugegraph.pd.grpc.pulse.DbCompaction; +import org.apache.hugegraph.pd.grpc.pulse.MovePartition; +import org.apache.hugegraph.pd.grpc.pulse.PartitionKeyRange; +import org.apache.hugegraph.pd.grpc.pulse.SplitPartition; +import org.apache.hugegraph.pd.grpc.pulse.TransferLeader; /** * 分区命令监听 diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionService.java index 9b65783cb..daa2d3159 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionService.java @@ -28,28 +28,27 @@ import java.util.Optional; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.common.PartitionUtils; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.MetaTask; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.pulse.ChangeShard; +import org.apache.hugegraph.pd.grpc.pulse.CleanPartition; +import org.apache.hugegraph.pd.grpc.pulse.CleanType; +import org.apache.hugegraph.pd.grpc.pulse.ConfChangeType; +import org.apache.hugegraph.pd.grpc.pulse.DbCompaction; +import org.apache.hugegraph.pd.grpc.pulse.MovePartition; +import org.apache.hugegraph.pd.grpc.pulse.PartitionKeyRange; +import org.apache.hugegraph.pd.grpc.pulse.SplitPartition; +import org.apache.hugegraph.pd.grpc.pulse.TransferLeader; import org.apache.hugegraph.pd.meta.MetadataFactory; import org.apache.hugegraph.pd.meta.PartitionMeta; import org.apache.hugegraph.pd.meta.TaskInfoMeta; import org.apache.hugegraph.pd.raft.RaftStateListener; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.common.PartitionUtils; -import com.baidu.hugegraph.pd.grpc.MetaTask; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.pulse.ChangeShard; -import com.baidu.hugegraph.pd.grpc.pulse.CleanPartition; -import com.baidu.hugegraph.pd.grpc.pulse.CleanType; -import com.baidu.hugegraph.pd.grpc.pulse.ConfChangeType; -import com.baidu.hugegraph.pd.grpc.pulse.DbCompaction; -import com.baidu.hugegraph.pd.grpc.pulse.MovePartition; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionKeyRange; -import com.baidu.hugegraph.pd.grpc.pulse.SplitPartition; -import com.baidu.hugegraph.pd.grpc.pulse.TransferLeader; - import lombok.extern.slf4j.Slf4j; /** diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionStatusListener.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionStatusListener.java index f5aeaec89..78ad1b6bf 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionStatusListener.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionStatusListener.java @@ -17,7 +17,7 @@ package org.apache.hugegraph.pd; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; /** * 分区状态监听 diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/RegistryService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/RegistryService.java index 4a599ae4d..ed02d37cc 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/RegistryService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/RegistryService.java @@ -17,15 +17,14 @@ package org.apache.hugegraph.pd; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfo; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfos; +import org.apache.hugegraph.pd.grpc.discovery.Query; import org.apache.hugegraph.pd.meta.DiscoveryMetaStore; import org.apache.hugegraph.pd.meta.MetadataFactory; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfo; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfos; -import com.baidu.hugegraph.pd.grpc.discovery.Query; - /** * @author zhangyingjie * @date 2022/1/14 diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ShardGroupStatusListener.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ShardGroupStatusListener.java index 86b952cc9..5f206291f 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ShardGroupStatusListener.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ShardGroupStatusListener.java @@ -15,9 +15,9 @@ * under the License. */ -package com.baidu.hugegraph.pd; +package org.apache.hugegraph.pd; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; public interface ShardGroupStatusListener { void onShardListChanged(Metapb.ShardGroup shardGroup, Metapb.ShardGroup newShardGroup); diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreMonitorDataService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreMonitorDataService.java index 77dfb913b..e6a5ec1d7 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreMonitorDataService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreMonitorDataService.java @@ -28,13 +28,12 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; import org.apache.hugegraph.pd.meta.MetadataKeyHelper; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; - import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreNodeService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreNodeService.java index 97c06953d..fa064410c 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreNodeService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreNodeService.java @@ -28,21 +28,20 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb.GraphMode; +import org.apache.hugegraph.pd.grpc.Metapb.GraphModeReason; +import org.apache.hugegraph.pd.grpc.Metapb.GraphState; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.pulse.ConfChangeType; import org.apache.hugegraph.pd.meta.MetadataFactory; import org.apache.hugegraph.pd.meta.MetadataKeyHelper; import org.apache.hugegraph.pd.meta.StoreInfoMeta; import org.apache.hugegraph.pd.meta.TaskInfoMeta; -import com.baidu.hugegraph.pd.ShardGroupStatusListener; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Metapb.GraphMode; -import com.baidu.hugegraph.pd.grpc.Metapb.GraphModeReason; -import com.baidu.hugegraph.pd.grpc.Metapb.GraphState; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.pulse.ConfChangeType; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreStatusListener.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreStatusListener.java index ec7c2eabf..68042ac08 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreStatusListener.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreStatusListener.java @@ -17,7 +17,7 @@ package org.apache.hugegraph.pd; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; public interface StoreStatusListener { diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/TaskScheduleService.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/TaskScheduleService.java index 4816f4731..883327d8e 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/TaskScheduleService.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/TaskScheduleService.java @@ -32,16 +32,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.MetaTask; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.meta.TaskInfoMeta; import org.apache.hugegraph.pd.raft.RaftEngine; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.MetaTask; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; - import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/ConfigMetaStore.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/ConfigMetaStore.java index a53c13632..c1e92ada4 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/ConfigMetaStore.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/ConfigMetaStore.java @@ -20,10 +20,9 @@ package org.apache.hugegraph.pd.meta; import java.util.List; import java.util.Optional; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; - -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; public class ConfigMetaStore extends MetadataRocksDBStore { diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/DiscoveryMetaStore.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/DiscoveryMetaStore.java index 52b548a73..ae810c213 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/DiscoveryMetaStore.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/DiscoveryMetaStore.java @@ -22,12 +22,11 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; - -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfo; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfos; -import com.baidu.hugegraph.pd.grpc.discovery.Query; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfo; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfos; +import org.apache.hugegraph.pd.grpc.discovery.Query; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/IdMetaStore.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/IdMetaStore.java index c37c2e5c1..c224dc971 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/IdMetaStore.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/IdMetaStore.java @@ -25,10 +25,10 @@ import java.nio.charset.Charset; import java.util.List; import java.util.concurrent.ConcurrentHashMap; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; import org.apache.hugegraph.pd.store.KV; -import com.baidu.hugegraph.pd.common.PDException; import com.caucho.hessian.io.Hessian2Input; import com.caucho.hessian.io.Hessian2Output; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/LogMeta.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/LogMeta.java index f97529f17..4fea518b8 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/LogMeta.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/LogMeta.java @@ -19,10 +19,9 @@ package org.apache.hugegraph.pd.meta; import java.util.List; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; - -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; /** * @author zhangyingjie diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataKeyHelper.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataKeyHelper.java index 226a75209..a8866a221 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataKeyHelper.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataKeyHelper.java @@ -20,8 +20,7 @@ package org.apache.hugegraph.pd.meta; import java.nio.charset.Charset; import org.apache.commons.lang3.StringUtils; - -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; public class MetadataKeyHelper { diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataRocksDBStore.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataRocksDBStore.java index 8c84ea68a..6b591483e 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataRocksDBStore.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataRocksDBStore.java @@ -22,12 +22,12 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.ArrayUtils; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.store.HgKVStore; import org.apache.hugegraph.pd.store.KV; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Pdpb; import com.google.protobuf.Parser; /** diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataStoreBase.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataStoreBase.java index f27600c07..3502ecb89 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataStoreBase.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataStoreBase.java @@ -23,10 +23,10 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.store.KV; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Pdpb; import com.google.protobuf.Parser; public abstract class MetadataStoreBase { diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/PartitionMeta.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/PartitionMeta.java index b04138c9e..38cce28b0 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/PartitionMeta.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/PartitionMeta.java @@ -20,11 +20,10 @@ package org.apache.hugegraph.pd.meta; import java.util.ArrayList; import java.util.List; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.common.PartitionCache; import org.apache.hugegraph.pd.config.PDConfig; - -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.common.PartitionCache; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/QueueStore.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/QueueStore.java index 2568e5a06..7d31e8551 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/QueueStore.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/QueueStore.java @@ -19,11 +19,10 @@ package org.apache.hugegraph.pd.meta; import java.util.List; +import org.apache.hugegraph.pd.common.HgAssert; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; - -import com.baidu.hugegraph.pd.common.HgAssert; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; /** * @author lynn.bond@hotmail.com on 2022/2/10 diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/StoreInfoMeta.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/StoreInfoMeta.java index c15b0e420..dfe709dfd 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/StoreInfoMeta.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/StoreInfoMeta.java @@ -21,10 +21,9 @@ import java.util.LinkedList; import java.util.List; import java.util.ListIterator; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; - -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Metapb; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/TaskInfoMeta.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/TaskInfoMeta.java index 5632a7b9c..cdbc022dd 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/TaskInfoMeta.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/TaskInfoMeta.java @@ -19,13 +19,12 @@ package org.apache.hugegraph.pd.meta; import java.util.List; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; - -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.MetaTask; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.pulse.MovePartition; -import com.baidu.hugegraph.pd.grpc.pulse.SplitPartition; +import org.apache.hugegraph.pd.grpc.MetaTask; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.pulse.MovePartition; +import org.apache.hugegraph.pd.grpc.pulse.SplitPartition; /** * 任务管理 diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/KVStoreClosure.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/KVStoreClosure.java index e78be0b28..db13f0ceb 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/KVStoreClosure.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/KVStoreClosure.java @@ -17,8 +17,9 @@ package org.apache.hugegraph.pd.raft; +import org.apache.hugegraph.pd.grpc.Pdpb; + import com.alipay.sofa.jraft.Closure; -import com.baidu.hugegraph.pd.grpc.Pdpb; public interface KVStoreClosure extends Closure { diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java index 0b45380bc..e6bd7b0c9 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java @@ -25,7 +25,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; import com.alipay.sofa.jraft.JRaftUtils; import com.alipay.sofa.jraft.Node; @@ -42,9 +45,6 @@ import com.alipay.sofa.jraft.rpc.RaftRpcServerFactory; import com.alipay.sofa.jraft.rpc.RpcServer; import com.alipay.sofa.jraft.util.Endpoint; import com.alipay.sofa.jraft.util.internal.ThrowUtil; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftStateMachine.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftStateMachine.java index 1567a6188..6b3815d6c 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftStateMachine.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftStateMachine.java @@ -26,6 +26,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.zip.Checksum; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.springframework.util.CollectionUtils; import com.alipay.sofa.jraft.Closure; @@ -41,8 +43,6 @@ import com.alipay.sofa.jraft.storage.snapshot.SnapshotReader; import com.alipay.sofa.jraft.storage.snapshot.SnapshotWriter; import com.alipay.sofa.jraft.util.CRC64; import com.alipay.sofa.jraft.util.Utils; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Pdpb; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftTaskHandler.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftTaskHandler.java index 28dfc975b..310cf0fba 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftTaskHandler.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftTaskHandler.java @@ -17,7 +17,7 @@ package org.apache.hugegraph.pd.raft; -import com.baidu.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.common.PDException; /** * 接收raft发送的数据 diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/BaseKVStoreClosure.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/BaseKVStoreClosure.java index 9adcd3213..14c5c3a13 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/BaseKVStoreClosure.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/BaseKVStoreClosure.java @@ -17,10 +17,9 @@ package org.apache.hugegraph.pd.store; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.raft.KVStoreClosure; -import com.baidu.hugegraph.pd.grpc.Pdpb; - public abstract class BaseKVStoreClosure implements KVStoreClosure { private Pdpb.Error error; private Object data; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStore.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStore.java index ee35a0cd4..d8cf954f0 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStore.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStore.java @@ -20,10 +20,9 @@ package org.apache.hugegraph.pd.store; import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.common.PDException; - public interface HgKVStore { void init(PDConfig config); diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStoreImpl.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStoreImpl.java index 00b5e14e8..f24d68c82 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStoreImpl.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStoreImpl.java @@ -32,7 +32,10 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.discovery.RegisterInfo; import org.rocksdb.Checkpoint; import org.rocksdb.Options; import org.rocksdb.ReadOptions; @@ -42,9 +45,6 @@ import org.rocksdb.RocksIterator; import org.rocksdb.Slice; import com.alipay.sofa.jraft.util.Utils; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.discovery.RegisterInfo; import com.google.common.cache.CacheBuilder; import com.google.common.primitives.Bytes; diff --git a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/RaftKVStore.java b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/RaftKVStore.java index 15d431155..ca86a5aac 100644 --- a/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/RaftKVStore.java +++ b/hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/RaftKVStore.java @@ -22,7 +22,9 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.raft.KVOperation; import org.apache.hugegraph.pd.raft.KVStoreClosure; import org.apache.hugegraph.pd.raft.RaftEngine; @@ -32,8 +34,6 @@ import org.apache.hugegraph.pd.raft.RaftTaskHandler; import com.alipay.sofa.jraft.Status; import com.alipay.sofa.jraft.entity.Task; import com.alipay.sofa.jraft.error.RaftError; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Pdpb; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/MonitorServiceTest.java b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/MonitorServiceTest.java index 4aa8a298f..2b8d708df 100644 --- a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/MonitorServiceTest.java +++ b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/MonitorServiceTest.java @@ -19,13 +19,12 @@ package org.apache.hugegraph.pd; import java.util.concurrent.ExecutionException; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; import org.junit.Assert; import org.junit.BeforeClass; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; - // import org.junit.Test; public class MonitorServiceTest { diff --git a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/PartitionServiceTest.java b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/PartitionServiceTest.java index 6214f4e79..5a501f6bb 100644 --- a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/PartitionServiceTest.java +++ b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/PartitionServiceTest.java @@ -21,10 +21,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.hugegraph.pd.grpc.Metapb; import org.junit.Test; -import com.baidu.hugegraph.pd.grpc.Metapb; - public class PartitionServiceTest { @Test public void testPartitionHeartbeat() { diff --git a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/StoreNodeServiceTest.java b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/StoreNodeServiceTest.java index a00effcde..2e6e06fc9 100644 --- a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/StoreNodeServiceTest.java +++ b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/StoreNodeServiceTest.java @@ -25,20 +25,19 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.pulse.ChangeShard; +import org.apache.hugegraph.pd.grpc.pulse.CleanPartition; +import org.apache.hugegraph.pd.grpc.pulse.DbCompaction; +import org.apache.hugegraph.pd.grpc.pulse.MovePartition; +import org.apache.hugegraph.pd.grpc.pulse.PartitionKeyRange; +import org.apache.hugegraph.pd.grpc.pulse.SplitPartition; +import org.apache.hugegraph.pd.grpc.pulse.TransferLeader; import org.junit.Assert; import org.junit.BeforeClass; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.pulse.ChangeShard; -import com.baidu.hugegraph.pd.grpc.pulse.CleanPartition; -import com.baidu.hugegraph.pd.grpc.pulse.DbCompaction; -import com.baidu.hugegraph.pd.grpc.pulse.MovePartition; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionKeyRange; -import com.baidu.hugegraph.pd.grpc.pulse.SplitPartition; -import com.baidu.hugegraph.pd.grpc.pulse.TransferLeader; - public class StoreNodeServiceTest { static PDConfig pdConfig; diff --git a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java index 46fde5ec6..7a13791bd 100644 --- a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java +++ b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java @@ -21,7 +21,7 @@ package org.apache.hugegraph.pd.common; import java.nio.charset.StandardCharsets; -import com.baidu.hugegraph.pd.common.PartitionUtils; +import org.apache.hugegraph.pd.common.PartitionUtils; public class PartitionUtilsTest { diff --git a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/store/HgKVStoreImplTest.java b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/store/HgKVStoreImplTest.java index 833313454..5b27ff757 100644 --- a/hg-pd-core/src/test/java/org/apache/hugegraph/pd/store/HgKVStoreImplTest.java +++ b/hg-pd-core/src/test/java/org/apache/hugegraph/pd/store/HgKVStoreImplTest.java @@ -22,12 +22,11 @@ import java.io.IOException; import java.nio.file.Paths; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; import org.junit.Assert; import org.junit.BeforeClass; -import com.baidu.hugegraph.pd.common.PDException; - public class HgKVStoreImplTest { static final String testPath = "tmp/test"; static PDConfig pdConfig; diff --git a/hg-pd-core/src/test/resources/log4j2.xml b/hg-pd-core/src/test/resources/log4j2.xml index 125b8ea9f..a26fe62d9 100644 --- a/hg-pd-core/src/test/resources/log4j2.xml +++ b/hg-pd-core/src/test/resources/log4j2.xml @@ -131,7 +131,7 @@ - + diff --git a/hg-pd-dist/pom.xml b/hg-pd-dist/pom.xml index b3089d080..16be298fe 100644 --- a/hg-pd-dist/pom.xml +++ b/hg-pd-dist/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph-pd-root - com.baidu.hugegraph + org.apache.hugegraph 3.6.5-SNAPSHOT 4.0.0 @@ -40,9 +40,9 @@ - com.baidu.hugegraph + org.apache.hugegraph hugegraph-pd - ${project.version} + ${revision} diff --git a/hg-pd-dist/src/assembly/descriptor/server-assembly.xml b/hg-pd-dist/src/assembly/descriptor/server-assembly.xml index a72509338..7aed34c2d 100644 --- a/hg-pd-dist/src/assembly/descriptor/server-assembly.xml +++ b/hg-pd-dist/src/assembly/descriptor/server-assembly.xml @@ -49,7 +49,7 @@ runtime false - com.baidu.hugegraph:${executable.jar.name}:jar:* + org.apache.hugegraph:${executable.jar.name}:jar:* diff --git a/hg-pd-dist/src/assembly/static/conf/log4j2.xml b/hg-pd-dist/src/assembly/static/conf/log4j2.xml index d68438f89..96fae99a3 100644 --- a/hg-pd-dist/src/assembly/static/conf/log4j2.xml +++ b/hg-pd-dist/src/assembly/static/conf/log4j2.xml @@ -127,7 +127,7 @@ - + diff --git a/hg-pd-grpc/src/main/proto/discovery.proto b/hg-pd-grpc/src/main/proto/discovery.proto index 1c716059b..f3f0e2a9e 100644 --- a/hg-pd-grpc/src/main/proto/discovery.proto +++ b/hg-pd-grpc/src/main/proto/discovery.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package discovery; import "pdpb.proto"; -option java_package = "com.baidu.hugegraph.pd.grpc.discovery"; +option java_package = "org.apache.hugegraph.pd.grpc.discovery"; option java_multiple_files = true; diff --git a/hg-pd-grpc/src/main/proto/kv.proto b/hg-pd-grpc/src/main/proto/kv.proto index 402b356ce..5f88b2ee1 100644 --- a/hg-pd-grpc/src/main/proto/kv.proto +++ b/hg-pd-grpc/src/main/proto/kv.proto @@ -3,7 +3,7 @@ package kv; import "pdpb.proto"; import "metapb.proto"; -option java_package = "com.baidu.hugegraph.pd.grpc.kv"; +option java_package = "org.apache.hugegraph.pd.grpc.kv"; option java_multiple_files = true; diff --git a/hg-pd-grpc/src/main/proto/metaTask.proto b/hg-pd-grpc/src/main/proto/metaTask.proto index 47cc9cd5d..ff6fc679d 100644 --- a/hg-pd-grpc/src/main/proto/metaTask.proto +++ b/hg-pd-grpc/src/main/proto/metaTask.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package metaTask; import "metapb.proto"; import "pd_pulse.proto"; -option java_package = "com.baidu.hugegraph.pd.grpc"; +option java_package = "org.apache.hugegraph.pd.grpc"; enum TaskType { Unknown = 0; diff --git a/hg-pd-grpc/src/main/proto/metapb.proto b/hg-pd-grpc/src/main/proto/metapb.proto index 7f11d093b..b6fd8c27c 100644 --- a/hg-pd-grpc/src/main/proto/metapb.proto +++ b/hg-pd-grpc/src/main/proto/metapb.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package metapb; -option java_package = "com.baidu.hugegraph.pd.grpc"; +option java_package = "org.apache.hugegraph.pd.grpc"; import "google/protobuf/any.proto"; enum ClusterState{ diff --git a/hg-pd-grpc/src/main/proto/pd_common.proto b/hg-pd-grpc/src/main/proto/pd_common.proto index c5724e011..9c2dfe617 100644 --- a/hg-pd-grpc/src/main/proto/pd_common.proto +++ b/hg-pd-grpc/src/main/proto/pd_common.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -option java_package = "com.baidu.hugegraph.pd.grpc.common"; +option java_package = "org.apache.hugegraph.pd.grpc.common"; option java_outer_classname = "HgPdCommonProto"; message RequestHeader { diff --git a/hg-pd-grpc/src/main/proto/pd_pulse.proto b/hg-pd-grpc/src/main/proto/pd_pulse.proto index 31c8d1e2f..d4684eb89 100644 --- a/hg-pd-grpc/src/main/proto/pd_pulse.proto +++ b/hg-pd-grpc/src/main/proto/pd_pulse.proto @@ -4,7 +4,7 @@ import "metapb.proto"; import "pd_common.proto"; option java_multiple_files = true; -option java_package = "com.baidu.hugegraph.pd.grpc.pulse"; +option java_package = "org.apache.hugegraph.pd.grpc.pulse"; option java_outer_classname = "HgPdPulseProto"; service HgPdPulse { diff --git a/hg-pd-grpc/src/main/proto/pd_watch.proto b/hg-pd-grpc/src/main/proto/pd_watch.proto index 38e4af4ed..249592509 100644 --- a/hg-pd-grpc/src/main/proto/pd_watch.proto +++ b/hg-pd-grpc/src/main/proto/pd_watch.proto @@ -3,7 +3,7 @@ syntax = "proto3"; import "metapb.proto"; option java_multiple_files = true; -option java_package = "com.baidu.hugegraph.pd.grpc.watch"; +option java_package = "org.apache.hugegraph.pd.grpc.watch"; option java_outer_classname = "HgPdWatchProto"; service HgPdWatch { diff --git a/hg-pd-grpc/src/main/proto/pdpb.proto b/hg-pd-grpc/src/main/proto/pdpb.proto index 1535bb266..3a7432ecd 100644 --- a/hg-pd-grpc/src/main/proto/pdpb.proto +++ b/hg-pd-grpc/src/main/proto/pdpb.proto @@ -4,7 +4,7 @@ package pdpb; import "metapb.proto"; import "metaTask.proto"; -option java_package = "com.baidu.hugegraph.pd.grpc"; +option java_package = "org.apache.hugegraph.pd.grpc"; service PD { // 注册store，首次注册会生成新的store_id， store_id是store唯一标识 diff --git a/hg-pd-service/pom.xml b/hg-pd-service/pom.xml index 75e5c2a66..38906fdf6 100644 --- a/hg-pd-service/pom.xml +++ b/hg-pd-service/pom.xml @@ -34,7 +34,7 @@ - com.baidu.hugegraph + org.apache.hugegraph hg-pd-grpc @@ -45,9 +45,9 @@ - com.baidu.hugegraph + org.apache.hugegraph hg-pd-core - ${project.version} + ${revision} @@ -110,7 +110,7 @@ 3.17.2 - com.baidu.hugegraph + org.apache.hugegraph hugegraph-common 1.8.12 diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/boot/HugePDServer.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/boot/HugePDServer.java index e64e99b8d..452f95a46 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/boot/HugePDServer.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/boot/HugePDServer.java @@ -26,7 +26,7 @@ import com.alipay.remoting.util.StringUtils; /** * PD服务启动类 */ -@ComponentScan(basePackages = {"com.baidu.hugegraph.pd"}) +@ComponentScan(basePackages = {"org.apache.hugegraph.pd"}) @SpringBootApplication public class HugePDServer { public static void main(String[] args) { diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifierService.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifierService.java index bc371ca95..ca0582209 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifierService.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifierService.java @@ -32,20 +32,20 @@ import java.util.concurrent.CountDownLatch; import java.util.prefs.Preferences; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.license.ExtraParam; +import org.apache.hugegraph.license.LicenseVerifyParam; +import org.apache.hugegraph.license.MachineInfo; +import org.apache.hugegraph.pd.KvService; +import org.apache.hugegraph.pd.common.PDRuntimeException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.kv.KvServiceGrpc; +import org.apache.hugegraph.pd.grpc.kv.TTLRequest; +import org.apache.hugegraph.pd.grpc.kv.TTLResponse; +import org.apache.hugegraph.pd.raft.RaftEngine; import org.springframework.stereotype.Service; import org.springframework.util.Base64Utils; -import com.baidu.hugegraph.license.ExtraParam; -import com.baidu.hugegraph.license.LicenseVerifyParam; -import com.baidu.hugegraph.license.MachineInfo; -import com.baidu.hugegraph.pd.KvService; -import com.baidu.hugegraph.pd.common.PDRuntimeException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.kv.KvServiceGrpc; -import com.baidu.hugegraph.pd.grpc.kv.TTLRequest; -import com.baidu.hugegraph.pd.grpc.kv.TTLResponse; -import com.baidu.hugegraph.pd.raft.RaftEngine; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifyManager.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifyManager.java index 5f54b2d6b..ab207898b 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifyManager.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifyManager.java @@ -20,10 +20,11 @@ package org.apache.hugegraph.pd.license; import java.io.IOException; import java.util.List; -import com.baidu.hugegraph.license.CommonLicenseManager; -import com.baidu.hugegraph.license.ExtraParam; -import com.baidu.hugegraph.pd.common.PDRuntimeException; -import com.baidu.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.license.CommonLicenseManager; +import org.apache.hugegraph.license.ExtraParam; +import org.apache.hugegraph.pd.common.PDRuntimeException; +import org.apache.hugegraph.pd.grpc.Pdpb; + import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/metrics/PDMetrics.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/metrics/PDMetrics.java index 0c8fb55be..064bbb001 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/metrics/PDMetrics.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/metrics/PDMetrics.java @@ -21,13 +21,12 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; import org.apache.hugegraph.pd.service.PDService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; - import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RegistryRestResponse.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RegistryRestResponse.java index 0517645fa..ddf8d7dd9 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RegistryRestResponse.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RegistryRestResponse.java @@ -19,7 +19,7 @@ package org.apache.hugegraph.pd.model; import java.io.Serializable; -import com.baidu.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.Pdpb; import lombok.Data; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RestApiResponse.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RestApiResponse.java index 4b25fe023..5136bc5fe 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RestApiResponse.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RestApiResponse.java @@ -19,7 +19,7 @@ package org.apache.hugegraph.pd.model; import java.util.HashMap; -import com.baidu.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.Pdpb; import lombok.Data; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/notice/NoticeBroadcaster.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/notice/NoticeBroadcaster.java index 679d36841..53bcfee35 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/notice/NoticeBroadcaster.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/notice/NoticeBroadcaster.java @@ -20,7 +20,7 @@ package org.apache.hugegraph.pd.notice; import java.util.function.Function; import java.util.function.Supplier; -import com.baidu.hugegraph.pd.common.HgAssert; +import org.apache.hugegraph.pd.common.HgAssert; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/AbstractObserverSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/AbstractObserverSubject.java index e153fc727..e8e099554 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/AbstractObserverSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/AbstractObserverSubject.java @@ -25,10 +25,10 @@ import java.util.function.Function; import javax.annotation.concurrent.ThreadSafe; -import com.baidu.hugegraph.pd.grpc.pulse.PulseNoticeRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PulseResponse; -import com.baidu.hugegraph.pd.grpc.pulse.PulseType; -import com.baidu.hugegraph.pd.util.IdUtil; +import org.apache.hugegraph.pd.grpc.pulse.PulseNoticeRequest; +import org.apache.hugegraph.pd.grpc.pulse.PulseResponse; +import org.apache.hugegraph.pd.grpc.pulse.PulseType; +import org.apache.hugegraph.pd.util.IdUtil; import io.grpc.Status; import io.grpc.stub.StreamObserver; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PDPulseSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PDPulseSubject.java index 536fdcdcd..e2fbdae72 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PDPulseSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PDPulseSubject.java @@ -17,7 +17,7 @@ package org.apache.hugegraph.pd.pulse; -import static com.baidu.hugegraph.pd.common.HgAssert.isArgumentNotNull; +import static org.apache.hugegraph.pd.common.HgAssert.isArgumentNotNull; import java.util.Collections; import java.util.List; @@ -33,12 +33,12 @@ import java.util.stream.Collectors; import javax.annotation.concurrent.ThreadSafe; +import org.apache.hugegraph.pd.common.HgAssert; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.pulse.*; import org.apache.hugegraph.pd.notice.NoticeBroadcaster; import org.apache.hugegraph.pd.util.IdUtil; -import com.baidu.hugegraph.pd.common.HgAssert; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.pulse.*; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Parser; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PartitionHeartbeatSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PartitionHeartbeatSubject.java index c19685c51..9fb4ad7c2 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PartitionHeartbeatSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PartitionHeartbeatSubject.java @@ -19,7 +19,7 @@ package org.apache.hugegraph.pd.pulse; import java.util.function.Function; -import com.baidu.hugegraph.pd.grpc.pulse.*; +import org.apache.hugegraph.pd.grpc.pulse.*; /** * @author lynn.bond@hotmail.com created on 2021/11/9 diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/API.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/API.java index 6d7680a2e..9af59f7d7 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/API.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/API.java @@ -21,7 +21,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.common.PDException; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphAPI.java index 184b65b93..78d24be5c 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphAPI.java @@ -27,6 +27,9 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.model.GraphRestRequest; import org.apache.hugegraph.pd.model.RestApiResponse; import org.apache.hugegraph.pd.service.PDRestService; @@ -40,10 +43,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; - import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphSpaceAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphSpaceAPI.java index 8adf3c758..1bb4f183a 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphSpaceAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphSpaceAPI.java @@ -23,6 +23,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; import org.apache.hugegraph.pd.model.GraphSpaceRestRequest; import org.apache.hugegraph.pd.service.PDRestService; import org.springframework.beans.factory.annotation.Autowired; @@ -34,9 +36,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; - import lombok.extern.slf4j.Slf4j; @RestController diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java index 40b8dfcbe..f86642ca7 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java @@ -22,7 +22,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.model.RestApiResponse; +import org.apache.hugegraph.pd.raft.RaftEngine; import org.apache.hugegraph.pd.service.PDRestService; import org.apache.hugegraph.pd.service.PDService; import org.springframework.beans.factory.annotation.Autowired; @@ -32,11 +36,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.raft.RaftEngine; - import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/MemberAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/MemberAPI.java index 1154d6cd7..dec8ffe2a 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/MemberAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/MemberAPI.java @@ -31,8 +31,11 @@ import java.util.concurrent.TimeoutException; import javax.servlet.http.HttpServletRequest; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.model.PeerRestRequest; import org.apache.hugegraph.pd.model.RestApiResponse; +import org.apache.hugegraph.pd.raft.RaftEngine; import org.apache.hugegraph.pd.service.PDService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -43,10 +46,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.raft.RaftEngine; - import io.grpc.stub.CallStreamObserver; import io.grpc.stub.StreamObserver; import lombok.Data; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/PartitionAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/PartitionAPI.java index 8ccf0774b..5bc5cdfae 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/PartitionAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/PartitionAPI.java @@ -26,6 +26,9 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.model.RestApiResponse; import org.apache.hugegraph.pd.model.TimeRangeRequest; import org.apache.hugegraph.pd.service.PDRestService; @@ -39,9 +42,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; import com.google.protobuf.util.JsonFormat; import lombok.Data; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/RegistryAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/RegistryAPI.java index 64e5eb4d5..b0ac0b36d 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/RegistryAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/RegistryAPI.java @@ -26,6 +26,13 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.common.PDRuntimeException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.Pdpb.GetMembersResponse; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfo; +import org.apache.hugegraph.pd.grpc.discovery.Query; import org.apache.hugegraph.pd.license.LicenseVerifierService; import org.apache.hugegraph.pd.model.RegistryQueryRestRequest; import org.apache.hugegraph.pd.model.RegistryRestRequest; @@ -42,14 +49,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.common.PDRuntimeException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.Pdpb.GetMembersResponse; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfo; -import com.baidu.hugegraph.pd.grpc.discovery.Query; - import lombok.extern.slf4j.Slf4j; /** diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/ShardAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/ShardAPI.java index 0a17a3f3f..53249b943 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/ShardAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/ShardAPI.java @@ -22,6 +22,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.model.RestApiResponse; import org.apache.hugegraph.pd.service.PDRestService; import org.apache.hugegraph.pd.service.PDService; @@ -32,10 +35,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; - import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/StoreAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/StoreAPI.java index 9f812c7a1..f288ef877 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/StoreAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/StoreAPI.java @@ -24,6 +24,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.model.RestApiResponse; import org.apache.hugegraph.pd.model.StoreRestRequest; import org.apache.hugegraph.pd.model.TimeRangeRequest; @@ -40,9 +43,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; import com.google.protobuf.util.JsonFormat; import lombok.Data; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TaskAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TaskAPI.java index 3ff711760..d1419d2dd 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TaskAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TaskAPI.java @@ -20,6 +20,9 @@ package org.apache.hugegraph.pd.rest; import java.util.List; import java.util.Map; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; import org.apache.hugegraph.pd.service.PDRestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -28,10 +31,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; - import lombok.extern.slf4j.Slf4j; @RestController diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TestAPI.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TestAPI.java index 856e8149a..75c90f16b 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TestAPI.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TestAPI.java @@ -21,6 +21,15 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hugegraph.pd.RegistryService; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.discovery.Query; +import org.apache.hugegraph.pd.grpc.pulse.ChangeShard; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; +import org.apache.hugegraph.pd.meta.MetadataFactory; +import org.apache.hugegraph.pd.meta.QueueStore; import org.apache.hugegraph.pd.pulse.PDPulseSubject; import org.apache.hugegraph.pd.watch.PDWatchSubject; import org.springframework.beans.factory.annotation.Autowired; @@ -32,15 +41,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.pd.RegistryService; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.discovery.Query; -import com.baidu.hugegraph.pd.grpc.pulse.ChangeShard; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; -import com.baidu.hugegraph.pd.meta.MetadataFactory; -import com.baidu.hugegraph.pd.meta.QueueStore; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Parser; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/DiscoveryService.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/DiscoveryService.java index f279188ba..a22239b97 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/DiscoveryService.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/DiscoveryService.java @@ -23,25 +23,24 @@ import java.util.concurrent.atomic.AtomicLong; import javax.annotation.PostConstruct; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.pd.RegistryService; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.common.PDRuntimeException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.discovery.DiscoveryServiceGrpc; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfo; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfos; +import org.apache.hugegraph.pd.grpc.discovery.Query; +import org.apache.hugegraph.pd.grpc.discovery.RegisterInfo; import org.apache.hugegraph.pd.license.LicenseVerifierService; import org.apache.hugegraph.pd.pulse.PDPulseSubject; +import org.apache.hugegraph.pd.raft.RaftEngine; +import org.apache.hugegraph.pd.raft.RaftStateListener; import org.apache.hugegraph.pd.watch.PDWatchSubject; import org.lognet.springboot.grpc.GRpcService; import org.springframework.beans.factory.annotation.Autowired; -import com.baidu.hugegraph.pd.RegistryService; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.common.PDRuntimeException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.discovery.DiscoveryServiceGrpc; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfo; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfos; -import com.baidu.hugegraph.pd.grpc.discovery.Query; -import com.baidu.hugegraph.pd.grpc.discovery.RegisterInfo; -import com.baidu.hugegraph.pd.raft.RaftEngine; -import com.baidu.hugegraph.pd.raft.RaftStateListener; - import io.grpc.CallOptions; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/KvServiceGrpcImpl.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/KvServiceGrpcImpl.java index 9eac62e24..b9ec00b8d 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/KvServiceGrpcImpl.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/KvServiceGrpcImpl.java @@ -27,31 +27,30 @@ import java.util.concurrent.atomic.AtomicLong; import javax.annotation.PostConstruct; +import org.apache.hugegraph.pd.KvService; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.kv.K; +import org.apache.hugegraph.pd.grpc.kv.KResponse; +import org.apache.hugegraph.pd.grpc.kv.Kv; +import org.apache.hugegraph.pd.grpc.kv.KvResponse; +import org.apache.hugegraph.pd.grpc.kv.KvServiceGrpc; +import org.apache.hugegraph.pd.grpc.kv.LockRequest; +import org.apache.hugegraph.pd.grpc.kv.LockResponse; +import org.apache.hugegraph.pd.grpc.kv.ScanPrefixResponse; +import org.apache.hugegraph.pd.grpc.kv.TTLRequest; +import org.apache.hugegraph.pd.grpc.kv.TTLResponse; +import org.apache.hugegraph.pd.grpc.kv.WatchKv; +import org.apache.hugegraph.pd.grpc.kv.WatchRequest; +import org.apache.hugegraph.pd.grpc.kv.WatchResponse; +import org.apache.hugegraph.pd.grpc.kv.WatchState; +import org.apache.hugegraph.pd.grpc.kv.WatchType; +import org.apache.hugegraph.pd.raft.RaftEngine; +import org.apache.hugegraph.pd.raft.RaftStateListener; import org.apache.hugegraph.pd.watch.KvWatchSubject; import org.lognet.springboot.grpc.GRpcService; import org.springframework.beans.factory.annotation.Autowired; -import com.baidu.hugegraph.pd.KvService; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.kv.K; -import com.baidu.hugegraph.pd.grpc.kv.KResponse; -import com.baidu.hugegraph.pd.grpc.kv.Kv; -import com.baidu.hugegraph.pd.grpc.kv.KvResponse; -import com.baidu.hugegraph.pd.grpc.kv.KvServiceGrpc; -import com.baidu.hugegraph.pd.grpc.kv.LockRequest; -import com.baidu.hugegraph.pd.grpc.kv.LockResponse; -import com.baidu.hugegraph.pd.grpc.kv.ScanPrefixResponse; -import com.baidu.hugegraph.pd.grpc.kv.TTLRequest; -import com.baidu.hugegraph.pd.grpc.kv.TTLResponse; -import com.baidu.hugegraph.pd.grpc.kv.WatchKv; -import com.baidu.hugegraph.pd.grpc.kv.WatchRequest; -import com.baidu.hugegraph.pd.grpc.kv.WatchResponse; -import com.baidu.hugegraph.pd.grpc.kv.WatchState; -import com.baidu.hugegraph.pd.grpc.kv.WatchType; -import com.baidu.hugegraph.pd.raft.RaftEngine; -import com.baidu.hugegraph.pd.raft.RaftStateListener; - import io.grpc.ManagedChannel; import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDPulseService.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDPulseService.java index b6a194a7d..8dbc22153 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDPulseService.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDPulseService.java @@ -22,19 +22,18 @@ import java.util.List; import java.util.function.Function; import java.util.function.Supplier; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.pulse.HgPdPulseGrpc; +import org.apache.hugegraph.pd.grpc.pulse.PulseRequest; +import org.apache.hugegraph.pd.grpc.pulse.PulseResponse; +import org.apache.hugegraph.pd.meta.MetadataFactory; +import org.apache.hugegraph.pd.meta.QueueStore; import org.apache.hugegraph.pd.pulse.PDPulseSubject; +import org.apache.hugegraph.pd.raft.RaftEngine; import org.lognet.springboot.grpc.GRpcService; import org.springframework.beans.factory.annotation.Autowired; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.pulse.HgPdPulseGrpc; -import com.baidu.hugegraph.pd.grpc.pulse.PulseRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PulseResponse; -import com.baidu.hugegraph.pd.meta.MetadataFactory; -import com.baidu.hugegraph.pd.meta.QueueStore; -import com.baidu.hugegraph.pd.raft.RaftEngine; - import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDRestService.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDRestService.java index bc08d8f29..27d672366 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDRestService.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDRestService.java @@ -23,28 +23,27 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; +import org.apache.hugegraph.pd.ConfigService; +import org.apache.hugegraph.pd.LogService; +import org.apache.hugegraph.pd.PartitionService; +import org.apache.hugegraph.pd.StoreMonitorDataService; +import org.apache.hugegraph.pd.StoreNodeService; +import org.apache.hugegraph.pd.TaskScheduleService; +import org.apache.hugegraph.pd.common.HgAssert; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfo; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfos; +import org.apache.hugegraph.pd.grpc.discovery.Query; +import org.apache.hugegraph.pd.grpc.discovery.RegisterInfo; import org.apache.hugegraph.pd.model.RegistryRestRequest; import org.apache.hugegraph.pd.model.RegistryRestResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.pd.ConfigService; -import com.baidu.hugegraph.pd.LogService; -import com.baidu.hugegraph.pd.PartitionService; -import com.baidu.hugegraph.pd.StoreMonitorDataService; -import com.baidu.hugegraph.pd.StoreNodeService; -import com.baidu.hugegraph.pd.TaskScheduleService; -import com.baidu.hugegraph.pd.common.HgAssert; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfo; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfos; -import com.baidu.hugegraph.pd.grpc.discovery.Query; -import com.baidu.hugegraph.pd.grpc.discovery.RegisterInfo; - import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDService.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDService.java index 0450daee5..5fa8c40ef 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDService.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDService.java @@ -26,9 +26,43 @@ import java.util.Map; import javax.annotation.PostConstruct; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.pd.ConfigService; +import org.apache.hugegraph.pd.IdService; +import org.apache.hugegraph.pd.LogService; +import org.apache.hugegraph.pd.PartitionInstructionListener; +import org.apache.hugegraph.pd.PartitionService; +import org.apache.hugegraph.pd.PartitionStatusListener; +import org.apache.hugegraph.pd.ShardGroupStatusListener; +import org.apache.hugegraph.pd.StoreMonitorDataService; +import org.apache.hugegraph.pd.StoreNodeService; +import org.apache.hugegraph.pd.StoreStatusListener; +import org.apache.hugegraph.pd.TaskScheduleService; +import org.apache.hugegraph.pd.common.KVPair; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.PDGrpc; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.Pdpb.PutLicenseRequest; +import org.apache.hugegraph.pd.grpc.Pdpb.PutLicenseResponse; +import org.apache.hugegraph.pd.grpc.pulse.ChangeShard; +import org.apache.hugegraph.pd.grpc.pulse.CleanPartition; +import org.apache.hugegraph.pd.grpc.pulse.DbCompaction; +import org.apache.hugegraph.pd.grpc.pulse.MovePartition; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; +import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; +import org.apache.hugegraph.pd.grpc.pulse.PartitionKeyRange; +import org.apache.hugegraph.pd.grpc.pulse.SplitPartition; +import org.apache.hugegraph.pd.grpc.pulse.TransferLeader; +import org.apache.hugegraph.pd.grpc.watch.NodeEventType; +import org.apache.hugegraph.pd.grpc.watch.WatchGraphResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchType; import org.apache.hugegraph.pd.license.LicenseVerifierService; import org.apache.hugegraph.pd.pulse.PDPulseSubject; import org.apache.hugegraph.pd.pulse.PulseListener; +import org.apache.hugegraph.pd.raft.RaftEngine; +import org.apache.hugegraph.pd.raft.RaftStateListener; import org.apache.hugegraph.pd.util.grpc.StreamObserverUtil; import org.apache.hugegraph.pd.watch.PDWatchSubject; import org.lognet.springboot.grpc.GRpcService; @@ -36,40 +70,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import com.alipay.sofa.jraft.Status; -import com.baidu.hugegraph.pd.ConfigService; -import com.baidu.hugegraph.pd.IdService; -import com.baidu.hugegraph.pd.LogService; -import com.baidu.hugegraph.pd.PartitionInstructionListener; -import com.baidu.hugegraph.pd.PartitionService; -import com.baidu.hugegraph.pd.PartitionStatusListener; -import com.baidu.hugegraph.pd.ShardGroupStatusListener; -import com.baidu.hugegraph.pd.StoreMonitorDataService; -import com.baidu.hugegraph.pd.StoreNodeService; -import com.baidu.hugegraph.pd.StoreStatusListener; -import com.baidu.hugegraph.pd.TaskScheduleService; -import com.baidu.hugegraph.pd.common.KVPair; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.PDGrpc; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.Pdpb.PutLicenseRequest; -import com.baidu.hugegraph.pd.grpc.Pdpb.PutLicenseResponse; -import com.baidu.hugegraph.pd.grpc.pulse.ChangeShard; -import com.baidu.hugegraph.pd.grpc.pulse.CleanPartition; -import com.baidu.hugegraph.pd.grpc.pulse.DbCompaction; -import com.baidu.hugegraph.pd.grpc.pulse.MovePartition; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionHeartbeatResponse; -import com.baidu.hugegraph.pd.grpc.pulse.PartitionKeyRange; -import com.baidu.hugegraph.pd.grpc.pulse.SplitPartition; -import com.baidu.hugegraph.pd.grpc.pulse.TransferLeader; -import com.baidu.hugegraph.pd.grpc.watch.NodeEventType; -import com.baidu.hugegraph.pd.grpc.watch.WatchGraphResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchType; -import com.baidu.hugegraph.pd.raft.RaftEngine; -import com.baidu.hugegraph.pd.raft.RaftStateListener; import io.grpc.CallOptions; import io.grpc.ManagedChannel; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDWatchService.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDWatchService.java index 2e19b9bd3..1ddda6de1 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDWatchService.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PDWatchService.java @@ -17,13 +17,12 @@ package org.apache.hugegraph.pd.service; +import org.apache.hugegraph.pd.grpc.watch.HgPdWatchGrpc; +import org.apache.hugegraph.pd.grpc.watch.WatchRequest; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; import org.apache.hugegraph.pd.watch.PDWatchSubject; import org.lognet.springboot.grpc.GRpcService; -import com.baidu.hugegraph.pd.grpc.watch.HgPdWatchGrpc; -import com.baidu.hugegraph.pd.grpc.watch.WatchRequest; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; - import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PromTargetsService.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PromTargetsService.java index f18772221..118ad4af0 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PromTargetsService.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/PromTargetsService.java @@ -27,22 +27,21 @@ import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; +import org.apache.hugegraph.pd.RegistryService; +import org.apache.hugegraph.pd.common.HgAssert; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfo; +import org.apache.hugegraph.pd.grpc.discovery.NodeInfos; +import org.apache.hugegraph.pd.grpc.discovery.Query; import org.apache.hugegraph.pd.model.PromTargetsModel; import org.apache.hugegraph.pd.rest.MemberAPI; import org.apache.hugegraph.pd.util.HgMapCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.pd.RegistryService; -import com.baidu.hugegraph.pd.common.HgAssert; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfo; -import com.baidu.hugegraph.pd.grpc.discovery.NodeInfos; -import com.baidu.hugegraph.pd.grpc.discovery.Query; - import lombok.extern.slf4j.Slf4j; /** diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/ServiceGrpc.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/ServiceGrpc.java index 084728b85..620d0e474 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/ServiceGrpc.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/ServiceGrpc.java @@ -19,14 +19,13 @@ package org.apache.hugegraph.pd.service; import java.util.concurrent.ConcurrentHashMap; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Pdpb; import org.apache.hugegraph.pd.pulse.PDPulseSubject; +import org.apache.hugegraph.pd.raft.RaftEngine; +import org.apache.hugegraph.pd.raft.RaftStateListener; import org.apache.hugegraph.pd.watch.PDWatchSubject; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Pdpb; -import com.baidu.hugegraph.pd.raft.RaftEngine; -import com.baidu.hugegraph.pd.raft.RaftStateListener; - import io.grpc.CallOptions; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/UpgradeService.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/UpgradeService.java index 1756eea26..78af36aae 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/UpgradeService.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/UpgradeService.java @@ -15,16 +15,15 @@ * under the License. */ -package com.baidu.hugegraph.pd.service; +package org.apache.hugegraph.pd.service; +import org.apache.hugegraph.pd.KvService; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.rest.API; import org.apache.hugegraph.pd.upgrade.VersionScriptFactory; import org.apache.hugegraph.pd.upgrade.VersionUpgradeScript; -import com.baidu.hugegraph.pd.KvService; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.rest.API; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/VersionUpgradeScript.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/VersionUpgradeScript.java index 9f58b4702..8cd54864a 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/VersionUpgradeScript.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/VersionUpgradeScript.java @@ -17,7 +17,7 @@ package org.apache.hugegraph.pd.upgrade; -import com.baidu.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.config.PDConfig; public interface VersionUpgradeScript { diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/scripts/PartitionMetaUpgrade.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/scripts/PartitionMetaUpgrade.java index 30f1caadb..e113d95ff 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/scripts/PartitionMetaUpgrade.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/scripts/PartitionMetaUpgrade.java @@ -19,14 +19,13 @@ package org.apache.hugegraph.pd.upgrade.scripts; import java.util.HashSet; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.meta.MetadataKeyHelper; +import org.apache.hugegraph.pd.meta.MetadataRocksDBStore; import org.apache.hugegraph.pd.upgrade.VersionUpgradeScript; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.meta.MetadataKeyHelper; -import com.baidu.hugegraph.pd.meta.MetadataRocksDBStore; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/scripts/TaskCleanUpgrade.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/scripts/TaskCleanUpgrade.java index a73bce96f..6370f839f 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/scripts/TaskCleanUpgrade.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/upgrade/scripts/TaskCleanUpgrade.java @@ -17,13 +17,12 @@ package org.apache.hugegraph.pd.upgrade.scripts; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.meta.MetadataKeyHelper; +import org.apache.hugegraph.pd.meta.MetadataRocksDBStore; import org.apache.hugegraph.pd.upgrade.VersionUpgradeScript; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.meta.MetadataKeyHelper; -import com.baidu.hugegraph.pd.meta.MetadataRocksDBStore; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/util/DateUtil.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/util/DateUtil.java index 709b65a6d..e9bbd045b 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/util/DateUtil.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/util/DateUtil.java @@ -21,9 +21,8 @@ import java.text.ParseException; import java.util.Date; import org.apache.commons.lang3.time.DateUtils; - -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.grpc.Pdpb; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.grpc.Pdpb; /** * @author zhangyingjie diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/AbstractWatchSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/AbstractWatchSubject.java index 06a7d521a..2b6994a31 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/AbstractWatchSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/AbstractWatchSubject.java @@ -24,8 +24,9 @@ import java.util.function.Consumer; import javax.annotation.concurrent.ThreadSafe; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchType; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchType; + import com.google.protobuf.util.JsonFormat; import io.grpc.Status; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/KvWatchSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/KvWatchSubject.java index aefecc9b8..2e0dee58d 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/KvWatchSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/KvWatchSubject.java @@ -25,14 +25,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.BiPredicate; -import com.baidu.hugegraph.pd.KvService; -import com.baidu.hugegraph.pd.common.PDException; -import com.baidu.hugegraph.pd.config.PDConfig; -import com.baidu.hugegraph.pd.grpc.kv.WatchEvent; -import com.baidu.hugegraph.pd.grpc.kv.WatchKv; -import com.baidu.hugegraph.pd.grpc.kv.WatchResponse; -import com.baidu.hugegraph.pd.grpc.kv.WatchState; -import com.baidu.hugegraph.pd.grpc.kv.WatchType; +import org.apache.hugegraph.pd.KvService; +import org.apache.hugegraph.pd.common.PDException; +import org.apache.hugegraph.pd.config.PDConfig; +import org.apache.hugegraph.pd.grpc.kv.WatchEvent; +import org.apache.hugegraph.pd.grpc.kv.WatchKv; +import org.apache.hugegraph.pd.grpc.kv.WatchResponse; +import org.apache.hugegraph.pd.grpc.kv.WatchState; +import org.apache.hugegraph.pd.grpc.kv.WatchType; import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/NodeChangeSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/NodeChangeSubject.java index 610baad59..77ad0542e 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/NodeChangeSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/NodeChangeSubject.java @@ -17,13 +17,13 @@ package org.apache.hugegraph.pd.watch; -import static com.baidu.hugegraph.pd.common.HgAssert.isArgumentNotNull; +import static org.apache.hugegraph.pd.common.HgAssert.isArgumentNotNull; import javax.annotation.concurrent.ThreadSafe; -import com.baidu.hugegraph.pd.grpc.watch.NodeEventType; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchType; +import org.apache.hugegraph.pd.grpc.watch.NodeEventType; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchType; /** * The subject of partition change. diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/PDWatchSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/PDWatchSubject.java index 691505018..199d92622 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/PDWatchSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/PDWatchSubject.java @@ -17,20 +17,20 @@ package org.apache.hugegraph.pd.watch; -import static com.baidu.hugegraph.pd.common.HgAssert.isArgumentNotNull; +import static org.apache.hugegraph.pd.common.HgAssert.isArgumentNotNull; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.concurrent.ThreadSafe; -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.watch.NodeEventType; -import com.baidu.hugegraph.pd.grpc.watch.WatchChangeType; -import com.baidu.hugegraph.pd.grpc.watch.WatchCreateRequest; -import com.baidu.hugegraph.pd.grpc.watch.WatchRequest; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchType; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.watch.NodeEventType; +import org.apache.hugegraph.pd.grpc.watch.WatchChangeType; +import org.apache.hugegraph.pd.grpc.watch.WatchCreateRequest; +import org.apache.hugegraph.pd.grpc.watch.WatchRequest; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchType; import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; @@ -50,7 +50,7 @@ public class PDWatchSubject implements StreamObserver { subjectHolder.put(WatchType.WATCH_TYPE_STORE_NODE_CHANGE.name(), new NodeChangeSubject()); subjectHolder.put(WatchType.WATCH_TYPE_GRAPH_CHANGE.name(), new NodeChangeSubject()); subjectHolder.put(WatchType.WATCH_TYPE_SHARD_GROUP_CHANGE.name(), - new com.baidu.hugegraph.pd.watch.ShardGroupChangeSubject()); + new org.apache.hugegraph.pd.watch.ShardGroupChangeSubject()); } private final StreamObserver responseObserver; @@ -82,7 +82,7 @@ public class PDWatchSubject implements StreamObserver { public static void notifyShardGroupChange(ChangeType changeType, int groupId, Metapb.ShardGroup group) { - ((com.baidu.hugegraph.pd.watch.ShardGroupChangeSubject) subjectHolder.get( + ((org.apache.hugegraph.pd.watch.ShardGroupChangeSubject) subjectHolder.get( WatchType.WATCH_TYPE_SHARD_GROUP_CHANGE.name())) .notifyWatcher(changeType.getGrpcType(), groupId, group); } diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/PartitionChangeSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/PartitionChangeSubject.java index 556d6b20b..2e664b98f 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/PartitionChangeSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/PartitionChangeSubject.java @@ -17,14 +17,14 @@ package org.apache.hugegraph.pd.watch; -import static com.baidu.hugegraph.pd.common.HgAssert.isArgumentNotNull; -import static com.baidu.hugegraph.pd.common.HgAssert.isArgumentValid; +import static org.apache.hugegraph.pd.common.HgAssert.isArgumentNotNull; +import static org.apache.hugegraph.pd.common.HgAssert.isArgumentValid; import javax.annotation.concurrent.ThreadSafe; -import com.baidu.hugegraph.pd.grpc.watch.WatchChangeType; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchType; +import org.apache.hugegraph.pd.grpc.watch.WatchChangeType; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchType; /** * The subject of partition change. diff --git a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/ShardGroupChangeSubject.java b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/ShardGroupChangeSubject.java index f0c9643b7..d9cfde8e7 100644 --- a/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/ShardGroupChangeSubject.java +++ b/hg-pd-service/src/main/java/org/apache/hugegraph/pd/watch/ShardGroupChangeSubject.java @@ -15,16 +15,14 @@ * under the License. */ -package com.baidu.hugegraph.pd.watch; +package org.apache.hugegraph.pd.watch; -import static com.baidu.hugegraph.pd.common.HgAssert.isArgumentNotNull; +import static org.apache.hugegraph.pd.common.HgAssert.isArgumentNotNull; -import org.apache.hugegraph.pd.watch.AbstractWatchSubject; - -import com.baidu.hugegraph.pd.grpc.Metapb; -import com.baidu.hugegraph.pd.grpc.watch.WatchChangeType; -import com.baidu.hugegraph.pd.grpc.watch.WatchResponse; -import com.baidu.hugegraph.pd.grpc.watch.WatchType; +import org.apache.hugegraph.pd.grpc.Metapb; +import org.apache.hugegraph.pd.grpc.watch.WatchChangeType; +import org.apache.hugegraph.pd.grpc.watch.WatchResponse; +import org.apache.hugegraph.pd.grpc.watch.WatchType; public class ShardGroupChangeSubject extends AbstractWatchSubject { diff --git a/hg-pd-service/src/main/resources/log4j2.xml b/hg-pd-service/src/main/resources/log4j2.xml index 125b8ea9f..a26fe62d9 100644 --- a/hg-pd-service/src/main/resources/log4j2.xml +++ b/hg-pd-service/src/main/resources/log4j2.xml @@ -131,7 +131,7 @@ - + diff --git a/hg-pd-service/src/test/resources/log4j2.xml b/hg-pd-service/src/test/resources/log4j2.xml index 68c832697..d117f8328 100644 --- a/hg-pd-service/src/test/resources/log4j2.xml +++ b/hg-pd-service/src/test/resources/log4j2.xml @@ -131,7 +131,7 @@ - + diff --git a/hg-pd-test/pom.xml b/hg-pd-test/pom.xml index 0ac87fa93..d6f29a329 100644 --- a/hg-pd-test/pom.xml +++ b/hg-pd-test/pom.xml @@ -20,9 +20,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.hugegraph hugegraph-pd-root - com.baidu.hugegraph - 3.6.5-SNAPSHOT + ${revision} 4.0.0 @@ -72,14 +72,14 @@ 4.13.2 - com.baidu.hugegraph + org.apache.hugegraph hg-store-grpc - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hg-store-common - ${project.version} + ${revision} org.projectlombok @@ -102,9 +102,9 @@ - com.baidu.hugegraph + org.apache.hugegraph hg-pd-client - ${project.version} + ${revision} @@ -113,9 +113,9 @@ 2.8.9 - com.baidu.hugegraph + org.apache.hugegraph hg-pd-grpc - ${project.version} + ${revision} commons-io @@ -171,31 +171,31 @@ - com.baidu.hugegraph + org.apache.hugegraph hg-pd-clitools - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hg-pd-common - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hg-pd-core - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hg-pd-dist - ${project.version} + ${revision} compile - com.baidu.hugegraph + org.apache.hugegraph hugegraph-pd - ${project.version} + ${revision} - - - - - - - - - - - @@ -245,7 +234,6 @@ - \ No newline at end of file