chore(pd): refactor and fix pd tests

.github/workflows/pd-store.yml

@@ -62,10 +62,6 @@ jobs:
         run: |
           mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test
 
-      - name: Run cli-tools test
-        run: |
-          mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-cli-tools-test
-
       - name: Run rest test
         run: |
           mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test

hugegraph-pd/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/ClientCache.java

@@ -73,8 +73,15 @@
         try {
             GraphCache graph = initGraph(graphName);
             Partition partition = graph.getPartition(partId);
-            Shard shard = groups.get(partId).getValue();
-            if (partition == null || shard == null) {
+            if (partition == null) {
+                return null;
+            }
+            KVPair<ShardGroup, Shard> group = groups.get(partId);
+            if (group == null) {
+                return null;
+            }
+            Shard shard = group.getValue();
+            if (shard == null) {
                 return null;
             }
             return new KVPair<>(partition, shard);

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

@@ -47,7 +47,7 @@ public class IdMetaStore extends MetadataRocksDBStore {
     private static final String CID_DEL_SLOT_PREFIX = "@CID_DEL_SLOT@";
     private static final String SEPARATOR = "@";
     private static final ConcurrentHashMap<String, Object> SEQUENCES = new ConcurrentHashMap<>();
-    public static long CID_DEL_TIMEOUT = 24 * 3600 * 1000;
+    private static long CID_DEL_TIMEOUT = 24 * 3600 * 1000;
     private final long clusterId;
 
     public IdMetaStore(PDConfig pdConfig) {

hugegraph-pd/hg-pd-test/pom.xml

@@ -164,16 +164,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.hugegraph</groupId>
-            <artifactId>hg-pd-clitools</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.hugegraph</groupId>
             <artifactId>hg-pd-common</artifactId>
             <version>${revision}</version>
-
         </dependency>
         <dependency>
             <groupId>org.apache.hugegraph</groupId>

hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/client/BaseClientTest.java

@@ -24,21 +24,18 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class BaseClientTest {
-    public static PDClient pdClient;
-    public final String storeAddr = "localhost";
-    public final String graphName = "default/hugegraph/g";
-    public long storeId = 0;
+
+    protected static PDClient pdClient;
 
     @BeforeClass
-    public static void beforeClass() throws Exception {
+    public static void beforeClass() {
         PDConfig config = PDConfig.of("localhost:8686");
-//        PDConfig config = PDConfig.of("10.81.116.77:8986");
         config.setEnableCache(true);
         pdClient = PDClient.create(config);
     }
 
     @After
-    public void teardown() throws Exception {
+    public void teardown() {
         // pass
     }
 }