-
Notifications
You must be signed in to change notification settings - Fork 232
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.
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
Fix databrick Shim to support Ansi mode when casting from string to date [databricks] #5494
Merged
res-life
merged 4 commits into
NVIDIA:branch-22.06
from
res-life:db312-cast-string-to-date-ansi-mode
May 17, 2022
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ | |
|
||
from asserts import assert_gpu_and_cpu_are_equal_collect, assert_gpu_and_cpu_are_equal_sql, assert_gpu_and_cpu_error, assert_gpu_fallback_collect, assert_py4j_exception | ||
from data_gen import * | ||
from spark_session import is_before_spark_320, is_before_spark_330, with_gpu_session | ||
from spark_session import is_before_spark_320, is_before_spark_330, is_databricks91_or_later, with_gpu_session | ||
from marks import allow_non_gpu, approximate_float | ||
from pyspark.sql.types import * | ||
from spark_init_internal import spark_version | ||
|
@@ -83,15 +83,36 @@ def test_cast_string_date_valid_format(): | |
] | ||
values_string_to_data = invalid_values_string_to_date + valid_values_string_to_date | ||
|
||
# test Spark Spark versions < 3.2.0, ANSI mode | ||
@pytest.mark.skipif(not is_before_spark_320(), reason="ansi cast(string as date) throws exception only in 3.2.0+") | ||
# Spark 320+ and db312+ support Ansi mode when casting string to date | ||
# This means an exception will be thrown when casting invalid string to date on Spark 320+ or db312+ | ||
# test Spark versions < 3.2.0 and non db, ANSI mode | ||
@pytest.mark.skipif((not is_before_spark_320()) or is_databricks91_or_later(), reason="ansi cast(string as date) throws exception only in 3.2.0+ or db") | ||
def test_cast_string_date_invalid_ansi_before_320(): | ||
data_rows = [(v,) for v in values_string_to_data] | ||
assert_gpu_and_cpu_are_equal_collect( | ||
lambda spark: spark.createDataFrame(data_rows, "a string").select(f.col('a').cast(DateType())), | ||
conf={'spark.rapids.sql.hasExtendedYearValues': 'false', | ||
'spark.sql.ansi.enabled': 'true'}, ) | ||
|
||
# test db312+, ANSI mode, all db versions supports Ansi mode when casting string to date | ||
@pytest.mark.skipif(not is_databricks91_or_later(), reason="Spark versions(< 320) not support Ansi mode when casting string to date") | ||
@pytest.mark.parametrize('invalid', invalid_values_string_to_date) | ||
def test_cast_string_date_invalid_ansi_dbs(invalid): | ||
assert_gpu_and_cpu_error( | ||
lambda spark: spark.createDataFrame([(invalid,)], "a string").select(f.col('a').cast(DateType())).collect(), | ||
conf={'spark.rapids.sql.hasExtendedYearValues': 'false', | ||
'spark.sql.ansi.enabled': 'true'}, | ||
error_message="DateTimeException") | ||
|
||
# test db312+, ANSI mode, valid values | ||
@pytest.mark.skipif(not is_databricks91_or_later(), reason="Spark versions(< 320) not support Ansi mode when casting string to date") | ||
def test_cast_string_date_valid_ansi_dbs(): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit, instead of dbs put databricks since here if just looking at the test name dbs might get confused with like database |
||
data_rows = [(v,) for v in valid_values_string_to_date] | ||
assert_gpu_and_cpu_are_equal_collect( | ||
lambda spark: spark.createDataFrame(data_rows, "a string").select(f.col('a').cast(DateType())), | ||
conf={'spark.rapids.sql.hasExtendedYearValues': 'false', | ||
'spark.sql.ansi.enabled': 'true'}) | ||
|
||
# test Spark versions >= 320, ANSI mode | ||
@pytest.mark.skipif(is_before_spark_320(), reason="ansi cast(string as date) throws exception only in 3.2.0+") | ||
@pytest.mark.parametrize('invalid', invalid_values_string_to_date) | ||
|
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit 312db instead of db312