File tree Expand file tree Collapse file tree 7 files changed +18
-13
lines changed
gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox Expand file tree Collapse file tree 7 files changed +18
-13
lines changed Original file line number Diff line number Diff line change 8383 "
8484
8585 - name : " Save ccache"
86+ if : always()
8687 uses : actions/cache/save@v4
8788 id : ccache
8889 with :
@@ -531,7 +532,7 @@ jobs:
531532 if [ ! -e "/opt/hadoop-${{ matrix.hadoop }}.tar.gz" ]; then
532533 ${WGET_CMD} https://archive.apache.org/dist/hadoop/common/hadoop-${{ matrix.hadoop }}/hadoop-${{ matrix.hadoop }}.tar.gz -P /opt
533534 fi
534- cd /opt && \
535+ cd /opt && rm -rf shims && \
535536 mkdir /opt/uniffle && tar xzf apache-uniffle-${{ matrix.uniffle }}-incubating-bin.tar.gz -C /opt/uniffle --strip-components=1 && \
536537 tar xzf hadoop-${{ matrix.hadoop }}.tar.gz -C /opt/ && \
537538 cd /opt/uniffle && mkdir shuffle_data && \
@@ -590,7 +591,7 @@ jobs:
590591 echo "WARNING: please pre-install your required package in docker image since the downloading is throttled by this site."
591592 wget -nv https://archive.apache.org/dist/celeborn/${{ matrix.celeborn }}/apache-${{ matrix.celeborn }}-bin.tgz -P /opt/
592593 fi
593- cd /opt && mkdir -p celeborn && \
594+ cd /opt && rm -rf shims && mkdir -p celeborn && \
594595 tar xzf apache-${{ matrix.celeborn }}-bin.tgz -C /opt/celeborn --strip-components=1 && cd celeborn && \
595596 mv ./conf/celeborn-env.sh.template ./conf/celeborn-env.sh && \
596597 bash -c "echo -e 'CELEBORN_MASTER_MEMORY=8g\nCELEBORN_WORKER_MEMORY=8g\nCELEBORN_WORKER_OFFHEAP_MEMORY=16g' > ./conf/celeborn-env.sh" && \
Original file line number Diff line number Diff line change 1919
2020source /opt/rh/devtoolset-11/enable
2121source /opt/rh/rh-git227/enable
22+ export NUM_THREADS=4
2223./dev/builddeps-veloxbe.sh --enable_vcpkg=ON --build_arrow=OFF --build_tests=OFF --build_benchmarks=OFF \
2324 --build_examples=OFF --enable_s3=ON --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON
Original file line number Diff line number Diff line change 1818set -e
1919
2020source /opt/rh/gcc-toolset-11/enable
21- export NUM_THREADS=2
2221if [ " $( uname -m) " = " aarch64" ]; then
2322 export CPU_TARGET=" aarch64" ;
2423 export VCPKG_FORCE_SYSTEM_BINARIES=1;
Original file line number Diff line number Diff line change @@ -40,10 +40,10 @@ RUN set -ex; \
4040 tar -xvf ${local_binary}; \
4141 mv apache-maven-${maven_version} /usr/lib/maven; \
4242 rm -rf ${local_binary}; \
43- wget -nv ${mirror_host}/celeborn/celeborn-0.5.4/apache-celeborn-0.5.4-bin.tgz?action=download -P /opt/; \
44- wget -nv ${mirror_host}/celeborn/celeborn-0.6.1/apache-celeborn-0.6.1-bin.tgz?action=download -P /opt/; \
45- wget -nv ${mirror_host}/uniffle/0.9.2/apache-uniffle-0.9.2-incubating-bin.tar.gz?action=download -P /opt/; \
46- wget -nv ${mirror_host}/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz -P /opt/; \
43+ wget -nv ${mirror_host}/celeborn/celeborn-0.5.4/apache-celeborn-0.5.4-bin.tgz?action=download -O /opt/apache-celeborn-0.5.4-bin.tgz ; \
44+ wget -nv ${mirror_host}/celeborn/celeborn-0.6.1/apache-celeborn-0.6.1-bin.tgz?action=download -O /opt/apache-celeborn-0.6.1-bin.tgz ; \
45+ wget -nv ${mirror_host}/uniffle/0.9.2/apache-uniffle-0.9.2-incubating-bin.tar.gz?action=download -O /opt/apache-uniffle-0.9.2-incubating-bin.tar.gz ; \
46+ wget -nv ${mirror_host}/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz?action=download -O /opt/hadoop-2.8.5.tar.gz ; \
4747 git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
4848 cd /opt/gluten/.github/workflows/util/; \
4949 ./install-spark-resources.sh 3.2; \
Original file line number Diff line number Diff line change @@ -38,10 +38,10 @@ RUN set -ex; \
3838 tar -xvf ${local_binary}; \
3939 mv apache-maven-${maven_version} /usr/lib/maven; \
4040 rm -rf ${local_binary}; \
41- wget -nv ${mirror_host}/celeborn/celeborn-0.5.4/apache-celeborn-0.5.4-bin.tgz?action=download -P /opt/; \
42- wget -nv ${mirror_host}/celeborn/celeborn-0.6.1/apache-celeborn-0.6.1-bin.tgz?action=download -P /opt/; \
43- wget -nv ${mirror_host}/uniffle/0.9.2/apache-uniffle-0.9.2-incubating-bin.tar.gz?action=download -P /opt/; \
44- wget -nv ${mirror_host}/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz -P /opt/; \
41+ wget -nv ${mirror_host}/celeborn/celeborn-0.5.4/apache-celeborn-0.5.4-bin.tgz?action=download -O /opt/apache-celeborn-0.5.4-bin.tgz ; \
42+ wget -nv ${mirror_host}/celeborn/celeborn-0.6.1/apache-celeborn-0.6.1-bin.tgz?action=download -O /opt/apache-celeborn-0.6.1-bin.tgz ; \
43+ wget -nv ${mirror_host}/uniffle/0.9.2/apache-uniffle-0.9.2-incubating-bin.tar.gz?action=download -O /opt/apache-uniffle-0.9.2-incubating-bin.tar.gz ; \
44+ wget -nv ${mirror_host}/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz?action=download -O /opt/hadoop-2.8.5.tar.gz ; \
4545 git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
4646 cd /opt/gluten/.github/workflows/util/; \
4747 ./install-spark-resources.sh 3.2; \
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ set -exu
1818
1919CURRENT_DIR=$( cd " $( dirname " $BASH_SOURCE " ) " ; pwd)
2020VELOX_REPO=https://github.com/IBM/velox.git
21- VELOX_BRANCH=dft-2025_11_21
22- VELOX_ENHANCED_BRANCH=ibm-2025_11_21
21+ VELOX_BRANCH=dft-2025_11_22
22+ VELOX_ENHANCED_BRANCH=ibm-2025_11_22
2323VELOX_HOME=" "
2424RUN_SETUP_SCRIPT=ON
2525ENABLE_ENHANCED_FEATURES=OFF
Original file line number Diff line number Diff line change @@ -148,6 +148,10 @@ class VeloxTestSettings extends BackendTestSettings {
148148 // Vanilla Spark does not have a unified DST Timestamp fastTime. 1320570000000L and
149149 // 1320566400000L both represent 2011-11-06 01:00:00.
150150 .exclude(" SPARK-42635: timestampadd near daylight saving transition" )
151+
152+ // TODO: fix in Spark-4.0
153+ .exclude(" SPARK-50669: timestampadd with long types" )
154+
151155 // https://github.com/facebookincubator/velox/pull/10563/files#diff-140dc50e6dac735f72d29014da44b045509df0dd1737f458de1fe8cfd33d8145
152156 .excludeGlutenTest(" from_unixtime" )
153157 // Replaced by a gluten test to pass timezone through config.
You can’t perform that action at this time.
0 commit comments