Skip to content

[SPARK-44868][SQL] Convert datetime to string by to_char/to_varchar #42534

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
MaxGekk wants to merge 10 commits into from
Closed

[SPARK-44868][SQL] Convert datetime to string by to_char/to_varchar #42534

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
618b249
Rename ToCharacter to NumberToCharacter
MaxGekk Aug 17, 2023
4173bed
ToCharacter extends ExpressionBuilder
MaxGekk Aug 17, 2023
2e414ff
Use expressionBuilder
MaxGekk Aug 17, 2023
1705eb3
ToCharacter -> ToCharacterBuilder
MaxGekk Aug 17, 2023
a862579
NumberToCharacter -> ToCharacter
MaxGekk Aug 17, 2023
ba3553a
fix coding style
MaxGekk Aug 17, 2023
2dffd5f
Add tests to datetime-formatting.sql
MaxGekk Aug 17, 2023
abc64a0
Add more tests for to_char and to_varchar
MaxGekk Aug 18, 2023
2c2c59e
Merge remote-tracking branch 'origin/master' into replace-exprs
MaxGekk Aug 18, 2023
bfb9357
Add an example
MaxGekk Aug 18, 2023
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
Next Next commit
Rename ToCharacter to NumberToCharacter
  • Loading branch information
@MaxGekk
MaxGekk committed Aug 17, 2023
commit 618b249a9b6196efa375b3da04e96ad264191fb2
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,8 +530,8 @@ object FunctionRegistry {
expression[FormatString]("format_string"),
expression[ToNumber]("to_number"),
expression[TryToNumber]("try_to_number"),
expression[ToCharacter]("to_char"),
expression[ToCharacter]("to_varchar", setAlias = true, Some("3.5.0")),
expression[NumberToCharacter]("to_char"),
expression[NumberToCharacter]("to_varchar", setAlias = true, Some("3.5.0")),
expression[GetJsonObject]("get_json_object"),
expression[InitCap]("initcap"),
expression[StringInstr]("instr"),
Expand Down
4 changes: 2 additions & 2 deletions ...st/src/main/scala/org/apache/spark/sql/catalyst/expressions/numberFormatExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ case class TryToNumber(left: Expression, right: Expression)
""",
since = "3.4.0",
group = "string_funcs")
case class ToCharacter(left: Expression, right: Expression)
case class NumberToCharacter(left: Expression, right: Expression)
extends BinaryExpression with ImplicitCastInputTypes with NullIntolerant {
private lazy val numberFormatter = {
val value = right.eval()
Expand Down Expand Up @@ -278,6 +278,6 @@ case class ToCharacter(left: Expression, right: Expression)
ev.copy(code = stripped)
}
override protected def withNewChildrenInternal(
newLeft: Expression, newRight: Expression): ToCharacter =
newLeft: Expression, newRight: Expression): NumberToCharacter =
copy(left = newLeft, right = newRight)
}
30 changes: 15 additions & 15 deletions ...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 @@ -1397,7 +1397,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
s"The format string should have been invalid: $format")
assert(tryToNumberResult == invalidFormat)

val toCharResult = ToCharacter(Decimal(456), Literal(format)).checkInputDataTypes()
val toCharResult = NumberToCharacter(Decimal(456), Literal(format)).checkInputDataTypes()
assert(toCharResult != TypeCheckResult.TypeCheckSuccess,
s"The format string should have been invalid: $format")
assert(toCharResult == invalidFormat)
Expand All @@ -1406,7 +1406,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {

test("ToCharacter: fails analysis if numberFormat is not foldable") {
val right = AttributeReference("a", StringType)()
val toCharacterExpr = ToCharacter(Decimal(456), right)
val toCharacterExpr = NumberToCharacter(Decimal(456), right)
assert(toCharacterExpr.checkInputDataTypes() ==
DataTypeMismatch(
errorSubClass = "NON_FOLDABLE_INPUT",
Expand All @@ -1421,7 +1421,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {

test("SPARK-41452: ToCharacter: null format string") {
// if null format, to_number should return null
val toCharacterExpr = ToCharacter(Literal(Decimal(454)), Literal(null, StringType))
val toCharacterExpr = NumberToCharacter(Literal(Decimal(454)), Literal(null, StringType))
assert(toCharacterExpr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(toCharacterExpr, null)
}
Expand Down Expand Up @@ -1539,7 +1539,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"00000") ->
"00454"
).foreach { case ((decimal, format), expected) =>
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand Down Expand Up @@ -1569,11 +1569,11 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"4542 "
).foreach { case ((decimal, format), expected) =>
val format2 = format.replace('.', 'D')
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)

expr = ToCharacter(Literal(decimal), Literal(format2))
expr = NumberToCharacter(Literal(decimal), Literal(format2))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand All @@ -1599,7 +1599,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"99999.") ->
" 4542 "
).foreach { case ((decimal, format), expected) =>
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand All @@ -1626,11 +1626,11 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"12,454,367"
).foreach { case ((decimal, format), expected) =>
val format2 = format.replace(',', 'G')
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)

expr = ToCharacter(Literal(decimal), Literal(format2))
expr = NumberToCharacter(Literal(decimal), Literal(format2))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand Down Expand Up @@ -1682,7 +1682,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"999,999") ->
" 12,454"
).foreach { case ((decimal, format), expected) =>
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand All @@ -1696,7 +1696,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"$00.00") ->
"$78.12"
).foreach { case ((decimal, format), expected) =>
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand Down Expand Up @@ -1731,7 +1731,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"99999999999.9999999S") ->
" 83028485.0000000-"
).foreach { case ((decimal, format), expected) =>
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand Down Expand Up @@ -1763,7 +1763,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"MI9999999999999999.999999999999999") ->
" -4.310000000000000"
).foreach { case ((decimal, format), expected) =>
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand Down Expand Up @@ -1798,7 +1798,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"99G999D9PR") ->
"<12,454.8>"
).foreach { case ((decimal, format), expected) =>
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand All @@ -1820,7 +1820,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
"99.9") ->
"##.#"
).foreach { case ((decimal, format), expected) =>
var expr: Expression = ToCharacter(Literal(decimal), Literal(format))
var expr: Expression = NumberToCharacter(Literal(decimal), Literal(format))
assert(expr.checkInputDataTypes() == TypeCheckResult.TypeCheckSuccess)
checkEvaluation(expr, expected)
}
Expand Down
4 changes: 2 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/functions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4406,7 +4406,7 @@ object functions {
* @since 3.5.0
*/
def to_char(e: Column, format: Column): Column = withExpr {
ToCharacter(e.expr, format.expr)
NumberToCharacter(e.expr, format.expr)
}

/**
Expand Down Expand Up @@ -4434,7 +4434,7 @@ object functions {
* @since 3.5.0
*/
def to_varchar(e: Column, format: Column): Column = withExpr {
ToCharacter(e.expr, format.expr)
NumberToCharacter(e.expr, format.expr)
}

/**
Expand Down