[VL] Daily Update Velox Version (2024_05_11) (#5695)

Upstream Velox's New Commits: 35c4fa31f by Jimmy Lu, Selective Nimble reader skeleton (9768) 818411304 by zhli1142015, Add shuffle Spark function (9415) 54a060df1 by yan ma, Update aws-sdk-cpp version to 1.11.321(from 1.11.169) (9756) bdbd2555c by Krishna Pai, Fix name of runner used for fuzzer jobs. (9753) f1b6ccf0c by xiaoxmeng, Fix spill read runtime stats unit (9765)
apache · May 11, 2024 · 4899ea5 · 4899ea5
1 parent 00730ef
commit 4899ea5
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 1 deletion.
diff --git a/.github/workflows/velox_docker.yml b/.github/workflows/velox_docker.yml
@@ -497,6 +497,8 @@ jobs:
   run-spark-test-spark32:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:circleci-avx
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
     steps:
       - uses: actions/checkout@v2
       - name: Setup build dependency
@@ -506,6 +508,15 @@ jobs:
           tar -xvf apache-maven-3.8.8-bin.tar.gz
           mv apache-maven-3.8.8 /usr/lib/maven
           echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
+      - name: Get Ccache
+        uses: actions/cache/restore@v3
+        with:
+          path: '${{ env.CCACHE_DIR }}'
+          key: ccache-centos-release-default
+      - name: Ensure Cache Dirs Exists
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p '${{ env.CCACHE_DIR }}'
       - name: Build Gluten velox third party
         run: |
           cd ep/build-velox/src && \
@@ -560,6 +571,8 @@ jobs:
   run-spark-test-spark32-slow:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:circleci-avx
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
     steps:
       - uses: actions/checkout@v2
       - name: Setup build dependency
@@ -569,6 +582,15 @@ jobs:
           tar -xvf apache-maven-3.8.8-bin.tar.gz
           mv apache-maven-3.8.8 /usr/lib/maven
           echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
+      - name: Get Ccache
+        uses: actions/cache/restore@v3
+        with:
+          path: '${{ env.CCACHE_DIR }}'
+          key: ccache-centos-release-default
+      - name: Ensure Cache Dirs Exists
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p '${{ env.CCACHE_DIR }}'
       - name: Build Gluten velox third party
         run: |
           cd ep/build-velox/src && \
@@ -596,6 +618,8 @@ jobs:
   run-spark-test-spark33:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:circleci-avx
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
     steps:
       - uses: actions/checkout@v2
       - name: Setup build dependency
@@ -605,6 +629,15 @@ jobs:
           tar -xvf apache-maven-3.8.8-bin.tar.gz
           mv apache-maven-3.8.8 /usr/lib/maven
           echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
+      - name: Get Ccache
+        uses: actions/cache/restore@v3
+        with:
+          path: '${{ env.CCACHE_DIR }}'
+          key: ccache-centos-release-default
+      - name: Ensure Cache Dirs Exists
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p '${{ env.CCACHE_DIR }}'
       - name: Build Gluten velox third party
         run: |
           cd ep/build-velox/src && \
@@ -651,6 +684,8 @@ jobs:
   run-spark-test-spark33-slow:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:circleci-avx
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
     steps:
       - uses: actions/checkout@v2
       - name: Setup build dependency
@@ -660,6 +695,15 @@ jobs:
           tar -xvf apache-maven-3.8.8-bin.tar.gz
           mv apache-maven-3.8.8 /usr/lib/maven
           echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
+      - name: Get Ccache
+        uses: actions/cache/restore@v3
+        with:
+          path: '${{ env.CCACHE_DIR }}'
+          key: ccache-centos-release-default
+      - name: Ensure Cache Dirs Exists
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p '${{ env.CCACHE_DIR }}'
       - name: Build Gluten velox third party
         run: |
           cd ep/build-velox/src && \
@@ -687,6 +731,8 @@ jobs:
   run-spark-test-spark34:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:circleci-avx
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
     steps:
       - uses: actions/checkout@v2
       - name: Setup build dependency
@@ -696,6 +742,15 @@ jobs:
           tar -xvf apache-maven-3.8.8-bin.tar.gz
           mv apache-maven-3.8.8 /usr/lib/maven
           echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
+      - name: Get Ccache
+        uses: actions/cache/restore@v3
+        with:
+          path: '${{ env.CCACHE_DIR }}'
+          key: ccache-centos-release-default
+      - name: Ensure Cache Dirs Exists
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p '${{ env.CCACHE_DIR }}'
       - name: Build Gluten velox third party
         run: |
           cd ep/build-velox/src && \
@@ -742,6 +797,8 @@ jobs:
   run-spark-test-spark34-slow:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:circleci-avx
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
     steps:
       - uses: actions/checkout@v2
       - name: Setup build dependency
@@ -751,6 +808,15 @@ jobs:
           tar -xvf apache-maven-3.8.8-bin.tar.gz
           mv apache-maven-3.8.8 /usr/lib/maven
           echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
+      - name: Get Ccache
+        uses: actions/cache/restore@v3
+        with:
+          path: '${{ env.CCACHE_DIR }}'
+          key: ccache-centos-release-default
+      - name: Ensure Cache Dirs Exists
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p '${{ env.CCACHE_DIR }}'
       - name: Build Gluten velox third party
         run: |
           cd ep/build-velox/src && \
@@ -778,6 +844,8 @@ jobs:
   run-spark-test-spark35:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:circleci-avx
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
     steps:
       - uses: actions/checkout@v2
       - name: Setup build dependency
@@ -787,6 +855,15 @@ jobs:
           tar -xvf apache-maven-3.8.8-bin.tar.gz
           mv apache-maven-3.8.8 /usr/lib/maven
           echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
+      - name: Get Ccache
+        uses: actions/cache/restore@v3
+        with:
+          path: '${{ env.CCACHE_DIR }}'
+          key: ccache-centos-release-default
+      - name: Ensure Cache Dirs Exists
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p '${{ env.CCACHE_DIR }}'
       - name: Build Gluten velox third party
         run: |
           cd ep/build-velox/src && \
@@ -832,6 +909,8 @@ jobs:
   run-spark-test-spark35-slow:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:circleci-avx
+    env:
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
     steps:
       - uses: actions/checkout@v2
       - name: Setup build dependency
@@ -841,6 +920,15 @@ jobs:
           tar -xvf apache-maven-3.8.8-bin.tar.gz
           mv apache-maven-3.8.8 /usr/lib/maven
           echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
+      - name: Get Ccache
+        uses: actions/cache/restore@v3
+        with:
+          path: '${{ env.CCACHE_DIR }}'
+          key: ccache-centos-release-default
+      - name: Ensure Cache Dirs Exists
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p '${{ env.CCACHE_DIR }}'
       - name: Build Gluten velox third party
         run: |
           cd ep/build-velox/src && \

diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
@@ -17,7 +17,7 @@
 set -exu
 
 VELOX_REPO=https://github.com/oap-project/velox.git
-VELOX_BRANCH=2024_05_10
+VELOX_BRANCH=2024_05_11
 VELOX_HOME=""
 
 #Set on run gluten on HDFS