Skip to content

Commit 9becb20

Browse files
author
zhangli20
committed
fix incorrect expression conversion: Days should be DayOfMonth.
add wget retry in github workflows.
1 parent 02082df commit 9becb20

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

.github/workflows/tpcds-reusable.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,15 @@ jobs:
7373
- name: Setup ${{ inputs.sparkver }}
7474
if: steps.cache-spark.outputs.cache-hit != 'true'
7575
run: |
76-
wget -c ${{ inputs.sparkurl }}
76+
wget_retry=0 # wget with retry
77+
while ! wget -c ${{ inputs.sparkurl }}; do
78+
if [ $wget_retry -ge 5 ]; then
79+
exit 1
80+
fi
81+
let wget_retry+=1
82+
sleep 5
83+
done
84+
7785
mkdir -p spark-bin-${{ inputs.sparkver }}
7886
cd spark-bin-${{ inputs.sparkver }} && tar -xf ../spark-*.tgz --strip-component=1
7987

spark-extension/src/main/scala/org/apache/spark/sql/blaze/NativeConverters.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import org.apache.spark.sql.catalyst.plans.LeftSemi
5151
import org.apache.spark.sql.catalyst.plans.RightOuter
5252
import org.apache.spark.sql.catalyst.util.ArrayData
5353
import org.apache.spark.sql.catalyst.InternalRow
54-
import org.apache.spark.sql.catalyst.expressions.Days
54+
import org.apache.spark.sql.catalyst.expressions.DayOfMonth
5555
import org.apache.spark.sql.catalyst.expressions.GetJsonObject
5656
import org.apache.spark.sql.catalyst.expressions.LeafExpression
5757
import org.apache.spark.sql.catalyst.expressions.Month
@@ -875,7 +875,7 @@ object NativeConverters extends Logging {
875875

876876
case Year(child) => buildExtScalarFunction("Year", child :: Nil, DateType)
877877
case Month(child) => buildExtScalarFunction("Month", child :: Nil, DateType)
878-
case Days(child) => buildExtScalarFunction("Day", child :: Nil, DateType)
878+
case DayOfMonth(child) => buildExtScalarFunction("Day", child :: Nil, DateType)
879879

880880
// startswith is converted to scalar function in pruning-expr mode
881881
case StartsWith(expr, Literal(prefix, StringType)) if isPruningExpr =>

0 commit comments

Comments
 (0)