chore: move pd tests to hg-pd-test

apache · Oct 12, 2023 · c5e0c3f · c5e0c3f
1 parent d48d55e
commit c5e0c3f
Show file tree

Hide file tree

Showing 38 changed files with 424 additions and 736 deletions.
diff --git a/.github/workflows/pd-store.yml b/.github/workflows/pd-store.yml
@@ -55,6 +55,14 @@ jobs:
         run: |
           $TRAVIS_DIR/install-backend.sh $BACKEND
 
+      - name: Run pd test
+        run: |
+          mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test
+
+      - name: Run store test
+        run: |
+          mvn test -pl hg-store-test/hg-store-client -am -P store-client-test
+
       - name: Run unit test
         run: |
           $TRAVIS_DIR/run-unit-test.sh $BACKEND

diff --git a/hugegraph-pd/hg-pd-clitools/src/test/java/org/apache/hugegraph/pd/clitools/MainTest.java b/hugegraph-pd/hg-pd-clitools/src/test/java/org/apache/hugegraph/pd/clitools/MainTest.java
diff --git a/hugegraph-pd/hg-pd-core/src/test/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java b/hugegraph-pd/hg-pd-core/src/test/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java
diff --git a/hugegraph-pd/hg-pd-core/src/test/resources/log4j2.xml b/hugegraph-pd/hg-pd-core/src/test/resources/log4j2.xml
diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml
@@ -244,7 +244,7 @@
                 <version>2.20</version>
                 <executions>
                     <execution>
-                        <id>client-test</id>
+                        <id>pd-client-test</id>
                         <configuration>
                             <testSourceDirectory>${basedir}/src/main/java/
                             </testSourceDirectory>
@@ -256,7 +256,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>core-test</id>
+                        <id>pd-core-test</id>
                         <configuration>
                             <testSourceDirectory>${basedir}/src/main/java/
                             </testSourceDirectory>
@@ -268,7 +268,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>cli-tools-test</id>
+                        <id>pd-cli-tools-test</id>
                         <configuration>
                             <testSourceDirectory>${basedir}/src/main/java/
                             </testSourceDirectory>
@@ -280,7 +280,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>common-test</id>
+                        <id>pd-common-test</id>
                         <configuration>
                             <testSourceDirectory>${basedir}/src/main/java/
                             </testSourceDirectory>
@@ -292,7 +292,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>service-test</id>
+                        <id>pd-service-test</id>
                         <configuration>
                             <testSourceDirectory>${basedir}/src/main/java/
                             </testSourceDirectory>
@@ -303,7 +303,6 @@
                             </includes>
                         </configuration>
                     </execution>
-
                 </executions>
             </plugin>
             <plugin>

diff --git a/...ache/hugegraph/pd/MonitorServiceTest.java → ...ache/hugegraph/pd/MonitorServiceTest.java b/...ache/hugegraph/pd/MonitorServiceTest.java → ...ache/hugegraph/pd/MonitorServiceTest.java
diff --git a/...ache/hugegraph/pd/PartitionCacheTest.java → ...ache/hugegraph/pd/PartitionCacheTest.java b/...ache/hugegraph/pd/PartitionCacheTest.java → ...ache/hugegraph/pd/PartitionCacheTest.java
diff --git a/...he/hugegraph/pd/PartitionServiceTest.java → ...he/hugegraph/pd/PartitionServiceTest.java b/...he/hugegraph/pd/PartitionServiceTest.java → ...he/hugegraph/pd/PartitionServiceTest.java
diff --git a/...he/hugegraph/pd/StoreNodeServiceTest.java → ...he/hugegraph/pd/StoreNodeServiceTest.java b/...he/hugegraph/pd/StoreNodeServiceTest.java → ...he/hugegraph/pd/StoreNodeServiceTest.java
diff --git a/...pache/hugegraph/pd/StoreRegisterTest.java → ...pache/hugegraph/pd/StoreRegisterTest.java b/...pache/hugegraph/pd/StoreRegisterTest.java → ...pache/hugegraph/pd/StoreRegisterTest.java
diff --git a/...org/apache/hugegraph/pd/UnitTestBase.java → ...org/apache/hugegraph/pd/UnitTestBase.java b/...org/apache/hugegraph/pd/UnitTestBase.java → ...org/apache/hugegraph/pd/UnitTestBase.java
diff --git a/...ph/pd/client/DiscoveryClientImplTest.java → ...ph/pd/client/DiscoveryClientImplTest.java b/...ph/pd/client/DiscoveryClientImplTest.java → ...ph/pd/client/DiscoveryClientImplTest.java
diff --git a/...raph/pd/client/LicenseClientImplTest.java → ...raph/pd/client/LicenseClientImplTest.java b/...raph/pd/client/LicenseClientImplTest.java → ...raph/pd/client/LicenseClientImplTest.java
diff --git a/...ache/hugegraph/pd/client/PDPulseTest.java → ...ache/hugegraph/pd/client/PDPulseTest.java b/...ache/hugegraph/pd/client/PDPulseTest.java → ...ache/hugegraph/pd/client/PDPulseTest.java
diff --git a/...ache/hugegraph/pd/client/PDWatchTest.java → ...ache/hugegraph/pd/client/PDWatchTest.java b/...ache/hugegraph/pd/client/PDWatchTest.java → ...ache/hugegraph/pd/client/PDWatchTest.java
diff --git a/...ugegraph/pd/client/test/HgPDTestUtil.java → ...ugegraph/pd/client/test/HgPDTestUtil.java b/...ugegraph/pd/client/test/HgPDTestUtil.java → ...ugegraph/pd/client/test/HgPDTestUtil.java
diff --git a/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java b/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/common/PartitionUtilsTest.java
@@ -17,19 +17,37 @@
 
 package org.apache.hugegraph.pd.common;
 
-import org.apache.hugegraph.pd.common.PartitionUtils;
+import java.nio.charset.StandardCharsets;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
 
-import lombok.extern.slf4j.Slf4j;
-
 
 @Slf4j
 public class PartitionUtilsTest extends BaseCommonTest {
+
     @Test
     public void testCalcHashcode() {
         byte[] key = new byte[5];
         long code = PartitionUtils.calcHashcode(key);
         Assert.assertEquals(code, 31912L);
     }
-}
+
+    // @Test
+    public void testHashCode() {
+        int partCount = 10;
+        int partSize = PartitionUtils.MAX_VALUE / partCount + 1;
+        int[] counter = new int[partCount];
+        for (int i = 0; i < 10000; i++) {
+            String s = String.format("BATCH-GET-UNIT-%02d", i);
+            int c = PartitionUtils.calcHashcode(s.getBytes(StandardCharsets.UTF_8));
+
+            counter[c / partSize]++;
+
+        }
+
+        for (int i = 0; i < counter.length; i++) {
+            System.out.println(i + " " + counter[i]);
+        }
+    }
+}
diff --git a/...service/src/test/java/live/PDServer0.java → ...g/apache/hugegraph/pd/live/PDServer0.java b/...service/src/test/java/live/PDServer0.java → ...g/apache/hugegraph/pd/live/PDServer0.java
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package live;
+package org.apache.hugegraph.pd.live;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...service/src/test/java/live/PDServer1.java → ...g/apache/hugegraph/pd/live/PDServer1.java b/...service/src/test/java/live/PDServer1.java → ...g/apache/hugegraph/pd/live/PDServer1.java
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package live;
+package org.apache.hugegraph.pd.live;
 
 import java.io.File;
 import java.io.IOException;