From 40ffac051514f37d2efa264f7221d8fc2206803e Mon Sep 17 00:00:00 2001 From: imbajin Date: Thu, 7 Nov 2024 19:26:09 +0800 Subject: [PATCH 1/7] Update pom.xml --- computer/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/computer/pom.xml b/computer/pom.xml index 685f64819..2c1a491e1 100644 --- a/computer/pom.xml +++ b/computer/pom.xml @@ -91,8 +91,8 @@ + 1.5.0 - 1.3.0 1.3.0 1.3.0 1.3.0 From 29ed36a42f025bd24845d73faf54c0964c5d72d9 Mon Sep 17 00:00:00 2001 From: coderzc Date: Tue, 19 Nov 2024 15:04:59 +0800 Subject: [PATCH 2/7] keep using 1.3.0 hugegraph image --- .github/workflows/ci.yml | 3 --- .../src/assembly/travis/load-data-into-hugegraph.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0fe7aa5c..694456fa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,6 @@ jobs: TRAVIS_DIR: computer-dist/src/assembly/travis KUBERNETES_VERSION: 1.20.1 BSP_ETCD_URL: http://localhost:2579 - # TODO: delete this env in the future (replaced by docker way now) - HUGEGRAPH_SERVER_COMMIT_ID: d01c8737d7d5909119671953521f1401dcd1a188 steps: - name: Checkout @@ -79,7 +77,6 @@ jobs: run: | $TRAVIS_DIR/install-env.sh $TRAVIS_DIR/load-data-into-hugegraph.sh - #$TRAVIS_DIR/install-hugegraph-from-source.sh $HUGEGRAPH_SERVER_COMMIT_ID - name: Install JDK 11 uses: actions/setup-java@v3 diff --git a/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh b/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh index b448b6619..0e0983e8d 100755 --- a/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh +++ b/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh @@ -23,7 +23,7 @@ DATASET_DIR=${TRAVIS_DIR}/../dataset docker network create ci # Note: we need wait for server start finished, so start it first -docker run -itd --name=graph --network ci -p 8080:8080 hugegraph/hugegraph:latest && sleep 6 +docker run -itd --name=graph --network ci -p 8080:8080 hugegraph/hugegraph:1.3.0 && sleep 6 wget http://files.grouplens.org/datasets/movielens/ml-latest-small.zip unzip -d ${DATASET_DIR} ml-latest-small.zip From 265c6c2bacca14647a36c0464204dd589ca7d896 Mon Sep 17 00:00:00 2001 From: coderzc Date: Tue, 19 Nov 2024 15:13:07 +0800 Subject: [PATCH 3/7] keep using 1.3.0 hugegraph image --- computer/pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/computer/pom.xml b/computer/pom.xml index bfbad2fc8..f1fcb4257 100644 --- a/computer/pom.xml +++ b/computer/pom.xml @@ -92,11 +92,10 @@ 1.5.0 - - 1.3.0 - 1.3.0 - 1.3.0 - 1.3.0 + + 1.3.0 + + 1.3.0 UTF-8 ${project.basedir}/.. hugegraph-computer From 7d9c2848f3540242f9712c92b2580fb6d986ad26 Mon Sep 17 00:00:00 2001 From: coderzc Date: Tue, 19 Nov 2024 16:03:51 +0800 Subject: [PATCH 4/7] test --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d392b78d..694456fa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,11 +93,11 @@ jobs: - name: Compile run: mvn clean compile -e -Dmaven.javadoc.skip=true -ntp - - name: Integrate test - run: mvn test -P integrate-test -ntp + - name: Integrate test + run: mvn test -P integrate-test -ntp - - name: Unit test - run: mvn test -P unit-test -ntp + - name: Unit test + run: mvn test -P unit-test -ntp - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 From 1a3e067ef2907da4ebd0d407fa3b790dcca4f41e Mon Sep 17 00:00:00 2001 From: coderzc Date: Tue, 19 Nov 2024 18:27:50 +0800 Subject: [PATCH 5/7] test --- .github/workflows/ci.yml | 4 +- .../computer/suite/unit/UnitTestSuite.java | 60 +++++++------------ 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 694456fa7..04cc6190a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,8 +93,8 @@ jobs: - name: Compile run: mvn clean compile -e -Dmaven.javadoc.skip=true -ntp - - name: Integrate test - run: mvn test -P integrate-test -ntp +# - name: Integrate test +# run: mvn test -P integrate-test -ntp - name: Unit test run: mvn test -P unit-test -ntp diff --git a/computer/computer-test/src/main/java/org/apache/hugegraph/computer/suite/unit/UnitTestSuite.java b/computer/computer-test/src/main/java/org/apache/hugegraph/computer/suite/unit/UnitTestSuite.java index 62dec2cff..deb3bb069 100644 --- a/computer/computer-test/src/main/java/org/apache/hugegraph/computer/suite/unit/UnitTestSuite.java +++ b/computer/computer-test/src/main/java/org/apache/hugegraph/computer/suite/unit/UnitTestSuite.java @@ -17,53 +17,33 @@ package org.apache.hugegraph.computer.suite.unit; -import org.apache.hugegraph.computer.algorithm.AlgorithmTestSuite; -import org.apache.hugegraph.computer.core.allocator.AllocatorTestSuite; -import org.apache.hugegraph.computer.core.bsp.BspTestSuite; -import org.apache.hugegraph.computer.core.combiner.CombinerTestSuite; -import org.apache.hugegraph.computer.core.common.CommonTestSuite; -import org.apache.hugegraph.computer.core.compute.ComputeTestSuite; -import org.apache.hugegraph.computer.core.config.ConfigTestSuite; -import org.apache.hugegraph.computer.core.graph.GraphTestSuite; -import org.apache.hugegraph.computer.core.input.InputTestSuite; -import org.apache.hugegraph.computer.core.io.IOTestSuite; -import org.apache.hugegraph.computer.core.network.NetworkTestSuite; -import org.apache.hugegraph.computer.core.receiver.ReceiverTestSuite; -import org.apache.hugegraph.computer.core.sender.SenderTestSuite; -import org.apache.hugegraph.computer.core.sort.sorter.SorterTestSuite; -import org.apache.hugegraph.computer.core.sort.sorting.SortingTestSuite; -import org.apache.hugegraph.computer.core.store.StoreTestSuite; -import org.apache.hugegraph.computer.core.util.UtilTestSuite; import org.apache.hugegraph.computer.core.worker.WorkerTestSuite; -import org.apache.hugegraph.computer.dist.ComputerDistTestSuite; -import org.apache.hugegraph.computer.driver.DriverTestSuite; -import org.apache.hugegraph.computer.k8s.K8sTestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ - AllocatorTestSuite.class, - CommonTestSuite.class, - ConfigTestSuite.class, - UtilTestSuite.class, - BspTestSuite.class, - CombinerTestSuite.class, - GraphTestSuite.class, - IOTestSuite.class, - InputTestSuite.class, +// AllocatorTestSuite.class, +// CommonTestSuite.class, +// ConfigTestSuite.class, +// UtilTestSuite.class, +// BspTestSuite.class, +// CombinerTestSuite.class, +// GraphTestSuite.class, +// IOTestSuite.class, +// InputTestSuite.class, WorkerTestSuite.class, - NetworkTestSuite.class, - StoreTestSuite.class, - SorterTestSuite.class, - SortingTestSuite.class, - SenderTestSuite.class, - ReceiverTestSuite.class, - ComputeTestSuite.class, - ComputerDistTestSuite.class, - DriverTestSuite.class, - K8sTestSuite.class, - AlgorithmTestSuite.class, +// NetworkTestSuite.class, +// StoreTestSuite.class, +// SorterTestSuite.class, +// SortingTestSuite.class, +// SenderTestSuite.class, +// ReceiverTestSuite.class, +// ComputeTestSuite.class, +// ComputerDistTestSuite.class, +// DriverTestSuite.class, +// K8sTestSuite.class, +// AlgorithmTestSuite.class, }) public class UnitTestSuite { } From 7f4fe2b91a3c35eb224dfaaffd837ece668fd361 Mon Sep 17 00:00:00 2001 From: coderzc Date: Wed, 20 Nov 2024 10:17:51 +0800 Subject: [PATCH 6/7] using 1.3 loader --- .github/workflows/ci.yml | 4 +- .../travis/load-data-into-hugegraph.sh | 2 +- .../computer/suite/unit/UnitTestSuite.java | 60 ++++++++++++------- 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04cc6190a..694456fa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,8 +93,8 @@ jobs: - name: Compile run: mvn clean compile -e -Dmaven.javadoc.skip=true -ntp -# - name: Integrate test -# run: mvn test -P integrate-test -ntp + - name: Integrate test + run: mvn test -P integrate-test -ntp - name: Unit test run: mvn test -P unit-test -ntp diff --git a/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh b/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh index 0e0983e8d..968bf08b8 100755 --- a/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh +++ b/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh @@ -30,7 +30,7 @@ unzip -d ${DATASET_DIR} ml-latest-small.zip cd ${DATASET_DIR}/.. && pwd && ls -lh * -docker run -id --name=loader --network ci hugegraph/loader:latest +docker run -id --name=loader --network ci hugegraph/loader:1.3.0 docker cp dataset loader:/dataset || exit 1 docker exec -i loader ls -lh /dataset diff --git a/computer/computer-test/src/main/java/org/apache/hugegraph/computer/suite/unit/UnitTestSuite.java b/computer/computer-test/src/main/java/org/apache/hugegraph/computer/suite/unit/UnitTestSuite.java index deb3bb069..62dec2cff 100644 --- a/computer/computer-test/src/main/java/org/apache/hugegraph/computer/suite/unit/UnitTestSuite.java +++ b/computer/computer-test/src/main/java/org/apache/hugegraph/computer/suite/unit/UnitTestSuite.java @@ -17,33 +17,53 @@ package org.apache.hugegraph.computer.suite.unit; +import org.apache.hugegraph.computer.algorithm.AlgorithmTestSuite; +import org.apache.hugegraph.computer.core.allocator.AllocatorTestSuite; +import org.apache.hugegraph.computer.core.bsp.BspTestSuite; +import org.apache.hugegraph.computer.core.combiner.CombinerTestSuite; +import org.apache.hugegraph.computer.core.common.CommonTestSuite; +import org.apache.hugegraph.computer.core.compute.ComputeTestSuite; +import org.apache.hugegraph.computer.core.config.ConfigTestSuite; +import org.apache.hugegraph.computer.core.graph.GraphTestSuite; +import org.apache.hugegraph.computer.core.input.InputTestSuite; +import org.apache.hugegraph.computer.core.io.IOTestSuite; +import org.apache.hugegraph.computer.core.network.NetworkTestSuite; +import org.apache.hugegraph.computer.core.receiver.ReceiverTestSuite; +import org.apache.hugegraph.computer.core.sender.SenderTestSuite; +import org.apache.hugegraph.computer.core.sort.sorter.SorterTestSuite; +import org.apache.hugegraph.computer.core.sort.sorting.SortingTestSuite; +import org.apache.hugegraph.computer.core.store.StoreTestSuite; +import org.apache.hugegraph.computer.core.util.UtilTestSuite; import org.apache.hugegraph.computer.core.worker.WorkerTestSuite; +import org.apache.hugegraph.computer.dist.ComputerDistTestSuite; +import org.apache.hugegraph.computer.driver.DriverTestSuite; +import org.apache.hugegraph.computer.k8s.K8sTestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ -// AllocatorTestSuite.class, -// CommonTestSuite.class, -// ConfigTestSuite.class, -// UtilTestSuite.class, -// BspTestSuite.class, -// CombinerTestSuite.class, -// GraphTestSuite.class, -// IOTestSuite.class, -// InputTestSuite.class, + AllocatorTestSuite.class, + CommonTestSuite.class, + ConfigTestSuite.class, + UtilTestSuite.class, + BspTestSuite.class, + CombinerTestSuite.class, + GraphTestSuite.class, + IOTestSuite.class, + InputTestSuite.class, WorkerTestSuite.class, -// NetworkTestSuite.class, -// StoreTestSuite.class, -// SorterTestSuite.class, -// SortingTestSuite.class, -// SenderTestSuite.class, -// ReceiverTestSuite.class, -// ComputeTestSuite.class, -// ComputerDistTestSuite.class, -// DriverTestSuite.class, -// K8sTestSuite.class, -// AlgorithmTestSuite.class, + NetworkTestSuite.class, + StoreTestSuite.class, + SorterTestSuite.class, + SortingTestSuite.class, + SenderTestSuite.class, + ReceiverTestSuite.class, + ComputeTestSuite.class, + ComputerDistTestSuite.class, + DriverTestSuite.class, + K8sTestSuite.class, + AlgorithmTestSuite.class, }) public class UnitTestSuite { } From 8ac3f8d052b2a2d8c6447e43afbbebcf2a313054 Mon Sep 17 00:00:00 2001 From: imbajin Date: Wed, 20 Nov 2024 17:11:14 +0800 Subject: [PATCH 7/7] tiny improve --- .github/workflows/ci.yml | 7 +++++-- .../src/assembly/travis/load-data-into-hugegraph.sh | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 694456fa7..a853bdc06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,11 @@ jobs: env: USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: computer-dist/src/assembly/travis - KUBERNETES_VERSION: 1.20.1 BSP_ETCD_URL: http://localhost:2579 + KUBERNETES_VERSION: 1.20.1 + # TODO: adapt the HugeGraph Server/Loader version to 1.5.0 (EdgeID has 5 parts now) + # NOTE: Remember to adaptor/update the version before new release + GRAPH_ENV_VERSION: 1.3.0 steps: - name: Checkout @@ -76,7 +79,7 @@ jobs: - name: Prepare env and service run: | $TRAVIS_DIR/install-env.sh - $TRAVIS_DIR/load-data-into-hugegraph.sh + $TRAVIS_DIR/load-data-into-hugegraph.sh ${{ env.GRAPH_ENV_VERSION }} - name: Install JDK 11 uses: actions/setup-java@v3 diff --git a/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh b/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh index 968bf08b8..712c55e82 100755 --- a/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh +++ b/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh @@ -23,14 +23,14 @@ DATASET_DIR=${TRAVIS_DIR}/../dataset docker network create ci # Note: we need wait for server start finished, so start it first -docker run -itd --name=graph --network ci -p 8080:8080 hugegraph/hugegraph:1.3.0 && sleep 6 +docker run -itd --name=graph --network ci -p 8080:8080 hugegraph/hugegraph:"${GRAPH_ENV_VERSION}" && sleep 6 wget http://files.grouplens.org/datasets/movielens/ml-latest-small.zip -unzip -d ${DATASET_DIR} ml-latest-small.zip +unzip -d "${DATASET_DIR}" ml-latest-small.zip -cd ${DATASET_DIR}/.. && pwd && ls -lh * +cd "${DATASET_DIR}"/.. && pwd && ls -lh ./* -docker run -id --name=loader --network ci hugegraph/loader:1.3.0 +docker run -id --name=loader --network ci hugegraph/loader:"${GRAPH_ENV_VERSION}" docker cp dataset loader:/dataset || exit 1 docker exec -i loader ls -lh /dataset