anph
/
hugegraph-sync
forked from hugegraph/hugegraph-sync
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: search & replace to "org.apache" manually 

- also replace "a/b/c" regrex
- replace pom version to ${revision}

Change-Id: Ia3a9ce891fcff58cef4a5a1f95adb44ef8ee8049
This commit is contained in:
imbajin 2023-05-06 19:57:29 +08:00
parent fd13bb436b
commit 4166b6f8ff
145 changed files with 629 additions and 704 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hg-pd-client/pom.xml
View File

@ -41,14 +41,14 @@
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-pd-grpc</artifactId>
<version>${project.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-pd-common</artifactId>
<version>${project.version}</version>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
<dependency>

16
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java
View File

@ -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;

4
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/Discoverable.java
View File

@ -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

12
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClient.java
View File

@ -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;

4
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/DiscoveryClientImpl.java
View File

@ -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

80
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/KvClient.java
View File

@ -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<T extends WatchResponse> extends AbstractClient implements
WatchRequest k =
WatchRequest.newBuilder().setClientId(clientId.get()).setKey(prefix).build();
streamingCall(KvServiceGrpc.getWatchPrefixMethod(), k, observer, 1);
} BiConsumer<String, Consumer> 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<T extends WatchResponse> extends AbstractClient implements
log.error("get semaphore with error:", e);
}
}
}
} BiConsumer<String, Consumer> 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<String> getWatchList(T response) {
List<String> values = new LinkedList<>();
@ -237,17 +237,7 @@ public class KvClient<T extends WatchResponse> extends AbstractClient implements
values.put(key, value);
}
return values;
} BiConsumer<String, Consumer> 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<T extends WatchResponse> extends AbstractClient implements
clientId.compareAndSet(0L, response.getClientId());
assert clientId.get() == response.getClientId();
return response;
}
} BiConsumer<String, Consumer> 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();

7
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/LicenseClient.java
View File

@ -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;

18
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDClient.java
View File

@ -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;

5
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulse.java
View File

@ -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
*

21
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDPulseImpl.java
View File

@ -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;

3
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatch.java
View File

@ -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
*/

18
hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/PDWatchImpl.java
View File

@ -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;

2
hg-pd-client/src/main/java/org/apache/hugegraph/pd/pulse/PartitionNotice.java
View File

@ -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

2
hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/NodeEvent.java
View File

@ -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

2
hg-pd-client/src/main/java/org/apache/hugegraph/pd/watch/PartitionEvent.java
View File

@ -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

7
hg-pd-client/src/test/java/org/apache/hugegraph/pd/PartitionCacheTest.java
View File

@ -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;

11
hg-pd-client/src/test/java/org/apache/hugegraph/pd/StoreRegisterTest.java
View File

@ -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";

5
hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/DiscoveryClientImplTest.java
View File

@ -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

7
hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/LicenseClientImplTest.java
View File

@ -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;
/**

3
hg-pd-client/src/test/java/org/apache/hugegraph/pd/client/PDPulseTest.java
View File

@ -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
*/

2
hg-pd-clitools/pom.xml
View File

@ -29,7 +29,7 @@
<artifactId>hg-pd-clitools</artifactId>
<dependencies>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-pd-client</artifactId>
<version>3.6.5-SNAPSHOT</version>
</dependency>

8
hg-pd-clitools/src/main/java/org/apache/hugegraph/pd/clitools/Main.java
View File

@ -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 {

2
hg-pd-clitools/src/test/java/org/apache/hugegraph/pd/clitools/MainTest.java
View File

@ -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<Integer> arrays, int tail, int res) {

4
hg-pd-common/pom.xml
View File

@ -35,9 +35,9 @@
<dependencies>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-pd-grpc</artifactId>
<version>${project.version}</version>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

3
hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PDException.java
View File

@ -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));

3
hg-pd-common/src/main/java/org/apache/hugegraph/pd/common/PartitionCache.java
View File

@ -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;

8
hg-pd-core/pom.xml
View File

@ -50,7 +50,7 @@
<version>6.29.5</version>
</dependency>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-pd-grpc</artifactId>
</dependency>
<dependency>
@ -58,7 +58,7 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-pd-common</artifactId>
</dependency>
<dependency>
@ -81,9 +81,9 @@
</dependency>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-store-grpc</artifactId>
<version>${project.version}</version>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

5
hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java
View File

@ -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

3
hg-pd-core/src/main/java/org/apache/hugegraph/pd/IdService.java
View File

@ -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;

6
hg-pd-core/src/main/java/org/apache/hugegraph/pd/KvService.java
View File

@ -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;

4
hg-pd-core/src/main/java/org/apache/hugegraph/pd/LogService.java
View File

@ -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;

18
hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionInstructionListener.java
View File

@ -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;
/**
* 分区命令监听

31
hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionService.java
View File

@ -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;
/**

2
hg-pd-core/src/main/java/org/apache/hugegraph/pd/PartitionStatusListener.java
View File

@ -17,7 +17,7 @@
package org.apache.hugegraph.pd;
import com.baidu.hugegraph.pd.grpc.Metapb;
import org.apache.hugegraph.pd.grpc.Metapb;
/**
* 分区状态监听

9
hg-pd-core/src/main/java/org/apache/hugegraph/pd/RegistryService.java
View File

@ -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

4
hg-pd-core/src/main/java/org/apache/hugegraph/pd/ShardGroupStatusListener.java
View File

@ -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);

5
hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreMonitorDataService.java
View File

@ -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;

17
hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreNodeService.java
View File

@ -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;

2
hg-pd-core/src/main/java/org/apache/hugegraph/pd/StoreStatusListener.java
View File

@ -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 {

11
hg-pd-core/src/main/java/org/apache/hugegraph/pd/TaskScheduleService.java
View File

@ -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;

5
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/ConfigMetaStore.java
View File

@ -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 {

9
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/DiscoveryMetaStore.java
View File

@ -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;

2
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/IdMetaStore.java
View File

@ -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;

5
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/LogMeta.java
View File

@ -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

3
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataKeyHelper.java
View File

@ -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 {

4
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataRocksDBStore.java
View File

@ -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;
/**

4
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/MetadataStoreBase.java
View File

@ -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 {

7
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/PartitionMeta.java
View File

@ -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;

7
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/QueueStore.java
View File

@ -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

5
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/StoreInfoMeta.java
View File

@ -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;

11
hg-pd-core/src/main/java/org/apache/hugegraph/pd/meta/TaskInfoMeta.java
View File

@ -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;
/**
* 任务管理

3
hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/KVStoreClosure.java
View File

@ -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 {

6
hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java
View File

@ -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;

4
hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftStateMachine.java
View File

@ -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;

2
hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftTaskHandler.java
View File

@ -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发送的数据

3
hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/BaseKVStoreClosure.java
View File

@ -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;

3
hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStore.java
View File

@ -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);

6
hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/HgKVStoreImpl.java
View File

@ -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;

4
hg-pd-core/src/main/java/org/apache/hugegraph/pd/store/RaftKVStore.java
View File

@ -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;

5
hg-pd-core/src/test/java/org/apache/hugegraph/pd/MonitorServiceTest.java
View File

@ -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 {

3
hg-pd-core/src/test/java/org/apache/hugegraph/pd/PartitionServiceTest.java
View File

@ -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() {

19
hg-pd-core/src/test/java/org/apache/hugegraph/pd/StoreNodeServiceTest.java
View File

@ -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;

2
hg-pd-core/src/test/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java
View File

@ -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 {

3
hg-pd-core/src/test/java/org/apache/hugegraph/pd/store/HgKVStoreImplTest.java
View File

@ -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;

2
hg-pd-core/src/test/resources/log4j2.xml
View File

@ -131,7 +131,7 @@
<appender-ref ref="console"/>
</logger>
<!-- Use mixed async way to output logs -->
<AsyncLogger name="com.baidu.hugegraph" level="INFO" additivity="false">
<AsyncLogger name="org.apache.hugegraph" level="INFO" additivity="false">
<appender-ref ref="file"/>
<appender-ref ref="console"/>
</AsyncLogger>

6
hg-pd-dist/pom.xml
View File

@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>hugegraph-pd-root</artifactId>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<version>3.6.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -40,9 +40,9 @@
<dependencies>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-pd</artifactId>
<version>${project.version}</version>
<version>${revision}</version>
</dependency>
</dependencies>
<build>

2
hg-pd-dist/src/assembly/descriptor/server-assembly.xml
View File

@ -49,7 +49,7 @@
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
<includes>
<include>com.baidu.hugegraph:${executable.jar.name}:jar:*</include>
<include>org.apache.hugegraph:${executable.jar.name}:jar:*</include>
</includes>
</dependencySet>
</dependencySets>

2
hg-pd-dist/src/assembly/static/conf/log4j2.xml
View File

@ -127,7 +127,7 @@
<appender-ref ref="file"/>
</logger>
<!-- Use mixed async way to output logs -->
<AsyncLogger name="com.baidu.hugegraph" level="INFO" additivity="false">
<AsyncLogger name="org.apache.hugegraph" level="INFO" additivity="false">
<appender-ref ref="file"/>
</AsyncLogger>
</loggers>

2
hg-pd-grpc/src/main/proto/discovery.proto
View File

@ -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;

2
hg-pd-grpc/src/main/proto/kv.proto
View File

@ -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;

2
hg-pd-grpc/src/main/proto/metaTask.proto
View File

@ -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;

2
hg-pd-grpc/src/main/proto/metapb.proto
View File

@ -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{

2
hg-pd-grpc/src/main/proto/pd_common.proto
View File

@ -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 {

2
hg-pd-grpc/src/main/proto/pd_pulse.proto
View File

@ -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 {

2
hg-pd-grpc/src/main/proto/pd_watch.proto
View File

@ -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 {

2
hg-pd-grpc/src/main/proto/pdpb.proto
View File

@ -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唯一标识

8
hg-pd-service/pom.xml
View File

@ -34,7 +34,7 @@
</properties>
<dependencies>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-pd-grpc</artifactId>
<exclusions>
<exclusion>
@ -45,9 +45,9 @@
</dependency>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hg-pd-core</artifactId>
<version>${project.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
@ -110,7 +110,7 @@
<version>3.17.2</version>
</dependency>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-common</artifactId>
<version>1.8.12</version>
</dependency>

2
hg-pd-service/src/main/java/org/apache/hugegraph/pd/boot/HugePDServer.java
View File

@ -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) {

22
hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifierService.java
View File

@ -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;

9
hg-pd-service/src/main/java/org/apache/hugegraph/pd/license/LicenseVerifyManager.java
View File

@ -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;

5
hg-pd-service/src/main/java/org/apache/hugegraph/pd/metrics/PDMetrics.java
View File

@ -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;

2
hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RegistryRestResponse.java
View File

@ -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;

2
hg-pd-service/src/main/java/org/apache/hugegraph/pd/model/RestApiResponse.java
View File

@ -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;

2
hg-pd-service/src/main/java/org/apache/hugegraph/pd/notice/NoticeBroadcaster.java
View File

@ -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;

8
hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/AbstractObserverSubject.java
View File

@ -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;

8
hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PDPulseSubject.java
View File

@ -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;

2
hg-pd-service/src/main/java/org/apache/hugegraph/pd/pulse/PartitionHeartbeatSubject.java
View File

@ -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

3
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/API.java
View File

@ -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;

7
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphAPI.java
View File

@ -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;

5
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/GraphSpaceAPI.java
View File

@ -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

9
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java
View File

@ -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;

7
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/MemberAPI.java
View File

@ -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;

6
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/PartitionAPI.java
View File

@ -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;

15
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/RegistryAPI.java
View File

@ -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;
/**

7
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/ShardAPI.java
View File

@ -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;

6
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/StoreAPI.java
View File

@ -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;

7
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TaskAPI.java
View File

@ -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

18
hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/TestAPI.java
View File

@ -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;

25
hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/DiscoveryService.java
View File

@ -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;

41
hg-pd-service/src/main/java/org/apache/hugegraph/pd/service/KvServiceGrpcImpl.java
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More