yihua commented on code in PR #18786: URL: https://github.com/apache/hudi/pull/18786#discussion_r3277524726
########## packaging/bundle-validation/base/build_flink1171hive313spark334.sh: ########## @@ -1,27 +0,0 @@ -#!/bin/bash -# -# 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. -# -docker build \ - --build-arg HIVE_VERSION=3.1.3 \ - --build-arg FLINK_VERSION=1.17.1 \ - --build-arg SPARK_VERSION=3.3.4 \ Review Comment: We should upgrade this to Spark 3.5 with a new shell script. ########## packaging/bundle-validation/ci_run.sh: ########## @@ -54,17 +54,7 @@ elif [[ -n "$MAVEN_BASE_URL" ]]; then fi # choose versions based on build profiles -if [[ ${SPARK_RUNTIME} == 'spark3.3.4' ]]; then - HADOOP_VERSION=2.7.7 - HIVE_VERSION=3.1.3 - DERBY_VERSION=10.14.1.0 - FLINK_VERSION=1.17.1 - SPARK_VERSION=3.3.4 - SPARK_HADOOP_VERSION=2 - CONFLUENT_VERSION=5.5.12 - KAFKA_CONNECT_HDFS_VERSION=10.1.13 - IMAGE_TAG=flink1171hive313spark334 -elif [[ ${SPARK_RUNTIME} == 'spark3.4.3' ]]; then +if [[ ${SPARK_RUNTIME} == 'spark3.4.3' ]]; then Review Comment: Could you revisit this script to see if all supported Flink versions are covered? Also, it looks like Flink 1.19 is missing. ########## .github/workflows/maven_artifact_validation.yml: ########## @@ -38,10 +38,6 @@ jobs: flinkProfile: 'flink1.18' sparkProfile: 'spark3.4' sparkRuntime: 'spark3.4.3' - - scalaProfile: 'scala-2.12' - flinkProfile: 'flink1.17' - sparkProfile: 'spark3.3' - sparkRuntime: 'spark3.3.4' Review Comment: Same concern here as `bot.yml` ########## hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/helpers/TestMercifulJsonToRowConverterBase.java: ########## @@ -356,25 +355,7 @@ public interface ThrowingRunnable { } Review Comment: Let's address this. ########## .github/workflows/release_candidate_validation.yml: ########## @@ -34,10 +34,6 @@ jobs: flinkProfile: 'flink1.18' sparkProfile: 'spark3.4' sparkRuntime: 'spark3.4.3' - - scalaProfile: 'scala-2.12' - flinkProfile: 'flink1.17' - sparkProfile: 'spark3.3' - sparkRuntime: 'spark3.3.4' Review Comment: Same here ########## packaging/bundle-validation/Dockerfile: ########## @@ -28,7 +28,7 @@ RUN cp conf/hive-site.xml $HIVE_HOME/conf/ RUN cp conf/hive-site.xml $SPARK_HOME/conf/ RUN cp $DERBY_HOME/lib/derbyclient.jar $SPARK_HOME/jars/ RUN cp conf/spark-defaults.conf $SPARK_HOME/conf/ -RUN if [[ $SPARK_HOME =~ 'spark-3.2' ]] || [[ $SPARK_HOME =~ 'spark-3.3' ]]; \ +RUN if [[ $SPARK_HOME =~ 'spark-3.2' ]]; \ Review Comment: This can be removed as Spark 3.2 is deprecated ########## hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieAnalysis.scala: ########## @@ -66,8 +66,7 @@ object HoodieAnalysis extends SparkAdapterSupport { } else if (HoodieSparkUtils.isSpark3_4) { "org.apache.spark.sql.hudi.analysis.HoodieSpark34DataSourceV2ToV1Fallback" } else { - // Spark 3.3.x - "org.apache.spark.sql.hudi.analysis.HoodieSpark33DataSourceV2ToV1Fallback" + throw new IllegalStateException("Unsupported Spark version") Review Comment: Let's fix this. ########## hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieAnalysis.scala: ########## @@ -153,8 +150,7 @@ object HoodieAnalysis extends SparkAdapterSupport { } else if (HoodieSparkUtils.gteqSpark3_4) { "org.apache.spark.sql.execution.datasources.Spark34NestedSchemaPruning" } else { - // spark 3.3 - "org.apache.spark.sql.execution.datasources.Spark33NestedSchemaPruning" Review Comment: Let's actually remove all these "else" branches with unsupported versions and use `else` for Spark 3.4 for brevity? -- 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]
