Skip to content
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

Jump to bottom

[SPARK-47504][SQL] Resolve AbstractDataType simpleStrings for StringTypeCollated #45694

Closed
wants to merge 11 commits into from
Closed

[SPARK-47504][SQL] Resolve AbstractDataType simpleStrings for StringTypeCollated #45694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5543b65
Change simpleStringin StringTypeCollated
mihailom-db Mar 25, 2024
a4a323a
Merge branch 'apache:master' into SPARK-47504
mihailom-db Mar 25, 2024
8a11d60
Add ticket to TODOs
mihailom-db Mar 26, 2024
6c90933
Merge remote-tracking branch 'origin/SPARK-47504' into SPARK-47504
mihailom-db Mar 26, 2024
e1f2290
Merge remote-tracking branch 'upstream/master' into SPARK-47504
mihailom-db Apr 4, 2024
bdd08d6
Fix tests that use STRING_ANY_COLLATION
mihailom-db Apr 5, 2024
57ad918
Merge branch 'apache:master' into SPARK-47504
mihailom-db Apr 8, 2024
97b54fd
Remove TODOs
mihailom-db Apr 8, 2024
2972bb4
Refactor code
mihailom-db Apr 8, 2024
bc0366b
Merge remote-tracking branch 'origin/SPARK-47504' into SPARK-47504
mihailom-db Apr 8, 2024
96c3382
Fix failing tests
mihailom-db Apr 8, 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
4 changes: 1 addition & 3 deletions ...atalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/StringTypeCollated.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import org.apache.spark.sql.types.{AbstractDataType, DataType, StringType}
*/
abstract class StringTypeCollated extends AbstractDataType {
override private[sql] def defaultConcreteType: DataType = StringType
override private[sql] def simpleString: String = "string"
}

/**
* Use StringTypeBinary for expressions supporting only binary collation.
*/
case object StringTypeBinary extends StringTypeCollated {
override private[sql] def simpleString: String = "string_binary"
override private[sql] def acceptsType(other: DataType): Boolean =
other.isInstanceOf[StringType] && other.asInstanceOf[StringType].supportsBinaryEquality
}
Expand All @@ -39,7 +39,6 @@ case object StringTypeBinary extends StringTypeCollated {
* Use StringTypeBinaryLcase for expressions supporting only binary and lowercase collation.
*/
case object StringTypeBinaryLcase extends StringTypeCollated {
override private[sql] def simpleString: String = "string_binary_lcase"
override private[sql] def acceptsType(other: DataType): Boolean =
other.isInstanceOf[StringType] && (other.asInstanceOf[StringType].supportsBinaryEquality ||
other.asInstanceOf[StringType].isUTF8BinaryLcaseCollation)
Expand All @@ -49,6 +48,5 @@ case object StringTypeBinaryLcase extends StringTypeCollated {
* Use StringTypeAnyCollation for expressions supporting all possible collation types.
*/
case object StringTypeAnyCollation extends StringTypeCollated {
override private[sql] def simpleString: String = "string_any_collation"
override private[sql] def acceptsType(other: DataType): Boolean = other.isInstanceOf[StringType]
}
2 changes: 1 addition & 1 deletion ...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/StringExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
errorSubClass = "UNEXPECTED_INPUT_TYPE",
messageParameters = Map(
"paramIndex" -> ordinalNumber(0),
"requiredType" -> "(\"STRING_ANY_COLLATION\" or \"BINARY\" or \"ARRAY\")",
"requiredType" -> "(\"STRING\" or \"BINARY\" or \"ARRAY\")",
"inputSql" -> "\"1\"",
"inputType" -> "\"INT\""
)
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -127,7 +127,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
"paramIndex" -> "first",
"inputSql" -> "\"1\"",
"inputType" -> "\"INT\"",
"requiredType" -> "\"STRING_ANY_COLLATION\""),
"requiredType" -> "\"STRING\""),
context = ExpectedContext(
fragment = s"collate(1, 'UTF8_BINARY')", start = 7, stop = 31))
}
Expand Down
10 changes: 5 additions & 5 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
"paramIndex" -> "second",
"inputSql" -> "\"1\"",
"inputType" -> "\"INT\"",
"requiredType" -> "\"STRING_ANY_COLLATION\""
"requiredType" -> "\"STRING\""
),
queryContext = Array(ExpectedContext("", "", 0, 15, "array_join(x, 1)"))
)
Expand All @@ -1727,7 +1727,7 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
"paramIndex" -> "third",
"inputSql" -> "\"1\"",
"inputType" -> "\"INT\"",
"requiredType" -> "\"STRING_ANY_COLLATION\""
"requiredType" -> "\"STRING\""
),
queryContext = Array(ExpectedContext("", "", 0, 21, "array_join(x, ', ', 1)"))
)
Expand Down Expand Up @@ -1987,7 +1987,7 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
"paramIndex" -> "first",
"inputSql" -> "\"struct(1, a)\"",
"inputType" -> "\"STRUCT<col1: INT NOT NULL, col2: STRING NOT NULL>\"",
"requiredType" -> "(\"STRING_ANY_COLLATION\" or \"ARRAY\")"
"requiredType" -> "(\"STRING\" or \"ARRAY\")"
),
queryContext = Array(ExpectedContext("", "", 7, 29, "reverse(struct(1, 'a'))"))
)
Expand All @@ -2002,7 +2002,7 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
"paramIndex" -> "first",
"inputSql" -> "\"map(1, a)\"",
"inputType" -> "\"MAP<INT, STRING>\"",
"requiredType" -> "(\"STRING_ANY_COLLATION\" or \"ARRAY\")"
"requiredType" -> "(\"STRING\" or \"ARRAY\")"
),
queryContext = Array(ExpectedContext("", "", 7, 26, "reverse(map(1, 'a'))"))
)
Expand Down Expand Up @@ -2552,7 +2552,7 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
parameters = Map(
"sqlExpr" -> "\"concat(map(1, 2), map(3, 4))\"",
"paramIndex" -> "first",
"requiredType" -> "(\"STRING_ANY_COLLATION\" or \"BINARY\" or \"ARRAY\")",
"requiredType" -> "(\"STRING\" or \"BINARY\" or \"ARRAY\")",
"inputSql" -> "\"map(1, 2)\"",
"inputType" -> "\"MAP<INT, INT>\""
),
Expand Down