Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
minor fix
  • Loading branch information
jovanpavl-db committed Sep 24, 2024
commit 587cd2b18c37b35f641320eb176d7638b2e52b42
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ private static CollationSpecUTF8 fromCollationId(int collationId) {
protected Collation buildCollation() {
if (caseSensitivity == CaseSensitivity.UNSPECIFIED) {
return new Collation(
UTF8_BINARY_COLLATION_NAME,
normalizedCollationName(),
PROVIDER_SPARK,
null,
UTF8String::binaryCompare,
Expand All @@ -527,7 +527,7 @@ protected Collation buildCollation() {
/* supportsLowercaseEquality = */ false);
} else {
return new Collation(
UTF8_LCASE_COLLATION_NAME,
normalizedCollationName(),
PROVIDER_SPARK,
null,
CollationAwareUTF8String::compareLowerCase,
Expand Down Expand Up @@ -577,7 +577,7 @@ protected CollationMeta buildCollationMeta() {
@Override
protected String normalizedCollationName() {
StringBuilder builder = new StringBuilder();
if(SpecifierUtils.getSpecValue(collationId, CASE_SENSITIVITY_OFFSET, CaseSensitivity.LCASE.ordinal()) == 0){
if(caseSensitivity == CaseSensitivity.UNSPECIFIED){
builder.append(UTF8_BINARY_COLLATION_NAME);
}else{
builder.append(UTF8_LCASE_COLLATION_NAME);
Expand Down Expand Up @@ -721,16 +721,16 @@ private enum AccentSensitivity {
}

private static final int UNICODE_COLLATION_ID = new CollationSpecICU(
"UNICODE",
CaseSensitivity.CS,
AccentSensitivity.AS,
SpaceTrimming.NONE).collationId;
"UNICODE",
CaseSensitivity.CS,
AccentSensitivity.AS,
SpaceTrimming.NONE).collationId;

private static final int UNICODE_CI_COLLATION_ID = new CollationSpecICU(
"UNICODE",
CaseSensitivity.CI,
AccentSensitivity.AS,
SpaceTrimming.NONE).collationId;
"UNICODE",
CaseSensitivity.CI,
AccentSensitivity.AS,
SpaceTrimming.NONE).collationId;

private final CaseSensitivity caseSensitivity;
private final AccentSensitivity accentSensitivity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ case class Collate(child: Expression, collationName: String)

override def toString: String = s"$prettyName($child, $collationName)"

val usesTrimCollation = CollationFactory.usesTrimCollation(collationId)
val usesTrimCollation : Boolean = CollationFactory.usesTrimCollation(collationId)
}

// scalastyle:off line.contains.tab
Expand Down Expand Up @@ -115,6 +115,6 @@ case class Collation(child: Expression)
}
override def inputTypes: Seq[AbstractDataType] = Seq(StringTypeAnyCollation)

val usesTrimCollation = CollationFactory.usesTrimCollation(
val usesTrimCollation: Boolean = CollationFactory.usesTrimCollation(
child.dataType.asInstanceOf[StringType].collationId)
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
"utf8_lcase",
"unicode",
"unicode_ci",
"unicode_ltrim_ci",
"unicode_ci_ltrim",
"utf8_lcase_trim",
"utf8_binary_rtrim"
).foreach {
Expand Down