From 9becb200c302b7f288e8886d4d2ac6b2a84e55cc Mon Sep 17 00:00:00 2001 From: zhangli20 Date: Tue, 10 Dec 2024 16:52:49 +0800 Subject: [PATCH] fix incorrect expression conversion: Days should be DayOfMonth. add wget retry in github workflows. --- .github/workflows/tpcds-reusable.yml | 10 +++++++++- .../org/apache/spark/sql/blaze/NativeConverters.scala | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tpcds-reusable.yml b/.github/workflows/tpcds-reusable.yml index e277b5da3..debed3e14 100644 --- a/.github/workflows/tpcds-reusable.yml +++ b/.github/workflows/tpcds-reusable.yml @@ -73,7 +73,15 @@ jobs: - name: Setup ${{ inputs.sparkver }} if: steps.cache-spark.outputs.cache-hit != 'true' run: | - wget -c ${{ inputs.sparkurl }} + wget_retry=0 # wget with retry + while ! wget -c ${{ inputs.sparkurl }}; do + if [ $wget_retry -ge 5 ]; then + exit 1 + fi + let wget_retry+=1 + sleep 5 + done + mkdir -p spark-bin-${{ inputs.sparkver }} cd spark-bin-${{ inputs.sparkver }} && tar -xf ../spark-*.tgz --strip-component=1 diff --git a/spark-extension/src/main/scala/org/apache/spark/sql/blaze/NativeConverters.scala b/spark-extension/src/main/scala/org/apache/spark/sql/blaze/NativeConverters.scala index 8e6e323f2..5d6d339d9 100644 --- a/spark-extension/src/main/scala/org/apache/spark/sql/blaze/NativeConverters.scala +++ b/spark-extension/src/main/scala/org/apache/spark/sql/blaze/NativeConverters.scala @@ -51,7 +51,7 @@ import org.apache.spark.sql.catalyst.plans.LeftSemi import org.apache.spark.sql.catalyst.plans.RightOuter import org.apache.spark.sql.catalyst.util.ArrayData import org.apache.spark.sql.catalyst.InternalRow -import org.apache.spark.sql.catalyst.expressions.Days +import org.apache.spark.sql.catalyst.expressions.DayOfMonth import org.apache.spark.sql.catalyst.expressions.GetJsonObject import org.apache.spark.sql.catalyst.expressions.LeafExpression import org.apache.spark.sql.catalyst.expressions.Month @@ -875,7 +875,7 @@ object NativeConverters extends Logging { case Year(child) => buildExtScalarFunction("Year", child :: Nil, DateType) case Month(child) => buildExtScalarFunction("Month", child :: Nil, DateType) - case Days(child) => buildExtScalarFunction("Day", child :: Nil, DateType) + case DayOfMonth(child) => buildExtScalarFunction("Day", child :: Nil, DateType) // startswith is converted to scalar function in pruning-expr mode case StartsWith(expr, Literal(prefix, StringType)) if isPruningExpr =>