From 327b7007f5453aa4cf0428dee14a9e6d5e097889 Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Mon, 9 Sep 2024 14:08:59 +0800 Subject: [PATCH 1/4] Initial --- cpp/velox/tests/VeloxShuffleWriterTest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/velox/tests/VeloxShuffleWriterTest.cc b/cpp/velox/tests/VeloxShuffleWriterTest.cc index d8b2fb72fdd2..ddcc30ff1ce9 100644 --- a/cpp/velox/tests/VeloxShuffleWriterTest.cc +++ b/cpp/velox/tests/VeloxShuffleWriterTest.cc @@ -607,7 +607,7 @@ TEST_F(VeloxHashShuffleWriterMemoryTest, kStop) { // Reclaim bytes to shrink partition buffer. int64_t reclaimed = 0; ASSERT_NOT_OK(shuffleWriter->reclaimFixedSize(2000, &reclaimed)); - ASSERT(reclaimed >= 2000); + ASSERT_TRUE(reclaimed >= 2000); // Trigger spill during stop. ASSERT_TRUE(pool.checkEvict(pool.bytes_allocated(), [&] { ASSERT_NOT_OK(shuffleWriter->stop()); })); @@ -630,7 +630,7 @@ TEST_F(VeloxHashShuffleWriterMemoryTest, kStopComplex) { // Reclaim bytes to shrink partition buffer. int64_t reclaimed = 0; ASSERT_NOT_OK(shuffleWriter->reclaimFixedSize(2000, &reclaimed)); - ASSERT(reclaimed >= 2000); + ASSERT_TRUE(reclaimed >= 2000); // Reclaim from PartitionWriter to free cached bytes. auto payloadSize = shuffleWriter->cachedPayloadSize(); From 064bf660fcbc80443742fd2865c37ec141093a3e Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Mon, 9 Sep 2024 14:09:41 +0800 Subject: [PATCH 2/4] For triggering --- .github/workflows/velox_weekly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/velox_weekly.yml b/.github/workflows/velox_weekly.yml index 96de3bd570c8..1b4a96afc50a 100644 --- a/.github/workflows/velox_weekly.yml +++ b/.github/workflows/velox_weekly.yml @@ -89,4 +89,5 @@ jobs: apt-get update && apt-get install -y sudo maven wget git sudo apt-get install -y openjdk-8-jdk export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 + echo "test" cd $GITHUB_WORKSPACE/ && ./dev/package.sh From 7df6901e9b373dca8f1d4800ac03b0298723bf9c Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Mon, 9 Sep 2024 14:12:38 +0800 Subject: [PATCH 3/4] Explicit disable vcpkg --- dev/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/package.sh b/dev/package.sh index a26f94d9b6b8..8f2150291a18 100755 --- a/dev/package.sh +++ b/dev/package.sh @@ -12,7 +12,7 @@ cd "$GLUTEN_DIR" # build gluten with velox backend, prompt always respond y export PROMPT_ALWAYS_RESPOND=y -./dev/buildbundle-veloxbe.sh --build_tests=ON --build_benchmarks=ON --enable_s3=ON --enable_hdfs=ON "$@" +./dev/buildbundle-veloxbe.sh --enable_vcpkg=OFF --build_tests=ON --build_benchmarks=ON --enable_s3=ON --enable_hdfs=ON "$@" # make thirdparty package ./dev/build-thirdparty.sh From b4d0fc1bf83e89eb42743b5fb3062e3f46e6b89c Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Mon, 9 Sep 2024 17:07:04 +0800 Subject: [PATCH 4/4] Revert "For triggering" This reverts commit 064bf660fcbc80443742fd2865c37ec141093a3e. --- .github/workflows/velox_weekly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/velox_weekly.yml b/.github/workflows/velox_weekly.yml index 1b4a96afc50a..96de3bd570c8 100644 --- a/.github/workflows/velox_weekly.yml +++ b/.github/workflows/velox_weekly.yml @@ -89,5 +89,4 @@ jobs: apt-get update && apt-get install -y sudo maven wget git sudo apt-get install -y openjdk-8-jdk export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 - echo "test" cd $GITHUB_WORKSPACE/ && ./dev/package.sh