Skip to content

[SPARK-49611][SQL][FOLLOW-UP] Make collations TVF consistent and return null on no result for country and language #48835

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

Closed
mihailomilosevic2001 wants to merge 3 commits into from
Closed

[SPARK-49611][SQL][FOLLOW-UP] Make collations TVF consistent and return null on no result for country and language #48835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
459cf30
Fix OracleIntegrationSuite for JDK8
mihailomilosevic2001 May 30, 2024
79fb7cd
Revert "Fix OracleIntegrationSuite for JDK8"
mihailomilosevic2001 May 30, 2024
e9f7c6d
Fix tvf collations
mihailomilosevic2001 Nov 13, 2024
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
6 changes: 4 additions & 2 deletions common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,12 +1023,14 @@ protected Collation buildCollation() {

@Override
protected CollationMeta buildCollationMeta() {
String language = ICULocaleMap.get(locale).getDisplayLanguage();
String country = ICULocaleMap.get(locale).getDisplayCountry();
return new CollationMeta(
CATALOG,
SCHEMA,
normalizedCollationName(),
ICULocaleMap.get(locale).getDisplayLanguage(),
ICULocaleMap.get(locale).getDisplayCountry(),
language.isEmpty() ? null : language,
country.isEmpty() ? null : country,
VersionInfo.ICU_VERSION.toString(),
COLLATION_PAD_ATTRIBUTE,
accentSensitivity == AccentSensitivity.AS,
Expand Down
16 changes: 8 additions & 8 deletions sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,21 +2037,21 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
"ACCENT_SENSITIVE", "CASE_SENSITIVE", "NO_PAD", null),
Row("SYSTEM", "BUILTIN", "UTF8_LCASE", null, null,
"ACCENT_SENSITIVE", "CASE_INSENSITIVE", "NO_PAD", null),
Row("SYSTEM", "BUILTIN", "UNICODE", "", "",
Row("SYSTEM", "BUILTIN", "UNICODE", null, null,
"ACCENT_SENSITIVE", "CASE_SENSITIVE", "NO_PAD", icvVersion),
Row("SYSTEM", "BUILTIN", "UNICODE_AI", "", "",
Row("SYSTEM", "BUILTIN", "UNICODE_AI", null, null,
"ACCENT_INSENSITIVE", "CASE_SENSITIVE", "NO_PAD", icvVersion),
Row("SYSTEM", "BUILTIN", "UNICODE_CI", "", "",
Row("SYSTEM", "BUILTIN", "UNICODE_CI", null, null,
"ACCENT_SENSITIVE", "CASE_INSENSITIVE", "NO_PAD", icvVersion),
Row("SYSTEM", "BUILTIN", "UNICODE_CI_AI", "", "",
Row("SYSTEM", "BUILTIN", "UNICODE_CI_AI", null, null,
"ACCENT_INSENSITIVE", "CASE_INSENSITIVE", "NO_PAD", icvVersion),
Row("SYSTEM", "BUILTIN", "af", "Afrikaans", "",
Row("SYSTEM", "BUILTIN", "af", "Afrikaans", null,
"ACCENT_SENSITIVE", "CASE_SENSITIVE", "NO_PAD", icvVersion),
Row("SYSTEM", "BUILTIN", "af_AI", "Afrikaans", "",
Row("SYSTEM", "BUILTIN", "af_AI", "Afrikaans", null,
"ACCENT_INSENSITIVE", "CASE_SENSITIVE", "NO_PAD", icvVersion),
Row("SYSTEM", "BUILTIN", "af_CI", "Afrikaans", "",
Row("SYSTEM", "BUILTIN", "af_CI", "Afrikaans", null,
"ACCENT_SENSITIVE", "CASE_INSENSITIVE", "NO_PAD", icvVersion),
Row("SYSTEM", "BUILTIN", "af_CI_AI", "Afrikaans", "",
Row("SYSTEM", "BUILTIN", "af_CI_AI", "Afrikaans", null,
"ACCENT_INSENSITIVE", "CASE_INSENSITIVE", "NO_PAD", icvVersion)))

checkAnswer(sql("SELECT * FROM collations() WHERE NAME LIKE '%UTF8_BINARY%'"),
Expand Down