Skip to content

fix incorrect expression conversion: Days should be DayOfMonth #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richox merged 1 commit into from
Dec 11, 2024
Merged

fix incorrect expression conversion: Days should be DayOfMonth #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion .github/workflows/tpcds-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions spark-extension/src/main/scala/org/apache/spark/sql/blaze/NativeConverters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 =>
Expand Down