jackylee-ch commented on code in PR #12902: URL: https://github.com/apache/gluten/pull/12902#discussion_r3893002742
########## docs/get-started/Velox.md: ########## @@ -386,7 +384,7 @@ Gluten with velox backend supports [Iceberg](https://iceberg.apache.org/) table. First, compile the gluten-iceberg module with the `iceberg` profile, as follows: ``` -mvn clean package -Pbackends-velox -Pspark-3.3 -Piceberg -DskipTests +mvn clean package -Pbackends-velox -Pspark-3.5 -Piceberg -DskipTests Review Comment: An explanation needs to be added here. ``` # For spark3.5.x with Iceberg (requires JDK 17) ``` ########## .github/workflows/velox_backend_x86.yml: ########## @@ -787,110 +777,6 @@ jobs: --off-heap-size=16g -s=1.0 --threads=16 --iterations=1 fi - spark-test-spark33: - needs: [detect-changes, build-native-lib-centos-7] - if: >- - needs.detect-changes.outputs.java == 'true' || - needs.detect-changes.outputs.shims33 == 'true' || - needs.detect-changes.outputs.cpp == 'true' - runs-on: ubuntu-22.04 - env: - SPARK_TESTING: true - container: apache/gluten:centos-8-jdk8 - steps: - - uses: actions/checkout@v7 - - name: Download All Artifacts - uses: actions/download-artifact@v8 - with: - name: velox-native-lib-centos-7-${{github.sha}} - path: ./cpp/build/releases/ - - name: Prepare - run: | - dnf module -y install python39 && \ - alternatives --set python3 /usr/bin/python3.9 && \ - pip3 install setuptools==77.0.3 && \ - pip3 install pyspark==3.3.1 cython && \ - pip3 install pandas==2.2.3 pyarrow==20.0.0 - - name: Build and Run unit test for Spark 3.3.1 (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 - $MVN_CMD clean test -Pspark-3.3 -Pjava-17 -Pbackends-velox -Piceberg -Pdelta -Phudi -Ppaimon -Pspark-ut \ - -DargLine="-Dspark.test.home=/opt/shims/spark33/spark_home/" \ - -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.spark.tags.SlowHiveTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.EnhancedFeaturesTest,org.apache.gluten.tags.CudfTest,org.apache.gluten.tags.SkipTest - - name: Upload test report - if: always() - uses: actions/upload-artifact@v7 - with: - name: ${{ github.job }}-report - path: '**/surefire-reports/TEST-*.xml' - - name: Upload unit tests log files - if: ${{ !success() }} - uses: actions/upload-artifact@v7 - 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@v7 - with: - name: ${{ github.job }}-golden-files - path: /tmp/tpch-approved-plan/** Review Comment: The `spark33` directories should also be removed under `backends-velox/src/test/resources/tpch-approved-plan`. ########## backends-clickhouse/src-iceberg-spark33/test/java/org/apache/gluten/execution/iceberg/TestFlinkUpsert.java: ########## @@ -1,539 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.gluten.execution.iceberg; - -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.table.api.EnvironmentSettings; -import org.apache.flink.table.api.TableEnvironment; -import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; -import org.apache.flink.types.Row; -import org.apache.iceberg.FileFormat; -import org.apache.iceberg.Parameter; -import org.apache.iceberg.Parameters; -import org.apache.iceberg.TableProperties; -import org.apache.iceberg.catalog.Namespace; -import org.apache.iceberg.flink.CatalogTestBase; -import org.apache.iceberg.flink.MiniClusterResource; -import org.apache.iceberg.flink.TestHelpers; -import org.apache.iceberg.relocated.com.google.common.collect.Iterables; -import org.apache.iceberg.relocated.com.google.common.collect.Lists; -import org.apache.iceberg.relocated.com.google.common.collect.Maps; -import org.apache.spark.sql.Dataset; -import org.apache.spark.sql.SparkSession; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.TestTemplate; - -import java.time.LocalDate; -import java.time.ZoneId; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.stream.Collectors; - -public class TestFlinkUpsert extends CatalogTestBase { Review Comment: This may need to copied to Spark 3.5/4.0/4.1. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
