Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions .github/workflows/velox_backend_enhanced.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,59 +89,6 @@ jobs:
path: ./cpp/build/releases/
if-no-files-found: error

spark-test-spark34:
needs: build-native-lib-centos-7
runs-on: ubuntu-22.04
container: apache/gluten:centos-8-jdk8
steps:
- uses: actions/checkout@v4
- name: Download All Artifacts
uses: actions/download-artifact@v4
with:
name: velox-native-lib-enhanced-centos-7-${{github.sha}}
path: ./cpp/build/releases
- name: Prepare spark.test.home for Spark 3.4.4 (other tests)
run: |
dnf module -y install python39 && \
alternatives --set python3 /usr/bin/python3.9 && \
pip3 install setuptools==77.0.3 && \
pip3 install pyspark==3.4.4 cython && \
pip3 install pandas==2.2.3 pyarrow==20.0.0
- name: Build and Run unit test for Spark 3.4.4 (other tests)
run: |
cd $GITHUB_WORKSPACE/
export SPARK_SCALA_VERSION=2.12
yum install -y java-17-openjdk-devel
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
export PATH=$JAVA_HOME/bin:$PATH
java -version
export SPARK_HOME=/opt/shims/spark34/spark_home/
ls -l $SPARK_HOME
$MVN_CMD clean test -Pspark-3.4 -Pjava-17 -Pbackends-velox -Piceberg -Piceberg-test -Pdelta -Phudi \
-DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.spark.tags.SlowHiveTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.SkipTest \
-DargLine="-Dspark.test.home=$SPARK_HOME"
- name: Upload test report
if: always()
uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}-report
path: '**/surefire-reports/TEST-*.xml'
- name: Upload unit tests log files
if: ${{ !success() }}
uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}-test-log
path: |
**/target/*.log
**/gluten-ut/**/hs_err_*.log
**/gluten-ut/**/core.*
- name: Upload golden files
if: failure()
uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}-golden-files
path: /tmp/tpch-approved-plan/**

spark-test-spark35:
needs: build-native-lib-centos-7
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion cpp/velox/substrait/VeloxToSubstraitPlan.cc
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ ::substrait::AggregationPhase toAggregationPhase(const core::AggregationNode::St
return ::substrait::AGGREGATION_PHASE_INTERMEDIATE_TO_RESULT;
}
default:
VELOX_UNSUPPORTED("Unsupported Aggregate Step '{}' in Substrait ", mapAggregationStepToName(step));
VELOX_UNSUPPORTED("Unsupported Aggregate Step '{}' in Substrait ", core::AggregationNode::toName(step));
}
}

Expand Down
4 changes: 2 additions & 2 deletions ep/build-velox/src/get-velox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ set -exu

CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
VELOX_REPO=https://github.com/IBM/velox.git
VELOX_BRANCH=dft-2026_06_30
VELOX_ENHANCED_BRANCH=ibm-2026_06_30
VELOX_BRANCH=dft-2026_07_02
VELOX_ENHANCED_BRANCH=ibm-2026_07_02
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
ENABLE_ENHANCED_FEATURES=OFF
Expand Down
Loading