fix: gate non-default collations for Spark 4 datetime expressions#4693
Open
0lai0 wants to merge 1 commit into
Open
fix: gate non-default collations for Spark 4 datetime expressions#46930lai0 wants to merge 1 commit into
0lai0 wants to merge 1 commit into
Conversation
andygrove
reviewed
Jun 19, 2026
| " `TimestampNTZType` is not supported because Comet incorrectly applies timezone" + | ||
| " conversion to TimestampNTZ values.") | ||
|
|
||
| override def getIncompatibleReasons(): Seq[String] = Seq(collationReason) |
Member
There was a problem hiding this comment.
minor nit: this incompatibility will get documented for all Spark versions even though it is specific to Spark 4.x
I wonder if we can shim getIncompatibleReasons so it only applies for 4.x?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #4646.
Rationale for this change
Spark 4.0 adds
StringTypeWithCollationsupport to several datetime expression string inputs. Comet previously did not distinguish non-default collations for these inputs, so affected expressions could be planned as compatible even though native execution does not honor collation semantics.What changes are included in this PR?
convert_timezone, date_format, date_trunc, from_unixtime, make_timestamp, next_day, to_unix_timestamp, trunc, and unix_timestamp.LocalTableScanmasking the expression fallback.How are these changes tested?
./mvnw compile test-compile -Pspark-4.0 -DskipTests./mvnw test -Pspark-4.0 -Dtest=none -Dsuites=org.apache.spark.sql.CometCollationSuite./mvnw compile test-compile -Pspark-4.1 -DskipTests./mvnw test -Pspark-4.1 -Dtest=none -Dsuites=org.apache.spark.sql.CometCollationSuite