Skip to content

[Spark-13772][SQL] fix data type mismatch for decimal #11605

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
cenyuhai wants to merge 4 commits into from
Closed

[Spark-13772][SQL] fix data type mismatch for decimal #11605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5236dcb
temp patch for SPARK-13566
cenyuhai Mar 6, 2016
8d539df
fix data type mismatch for decimal
cenyuhai Mar 9, 2016
42addd6
rebase to branch 1.6
cenyuhai Mar 9, 2016
90cf309
fix scala style
cenyuhai Mar 17, 2016
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
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ object HiveTypeCoercion {
case e if !e.childrenResolved => e
// Find tightest common type for If, if the true value and false value have different types.
case i @ If(pred, left, right) if left.dataType != right.dataType =>
findTightestCommonTypeToString(left.dataType, right.dataType).map { widestType =>
findWiderTypeForTwo(left.dataType, right.dataType).map { widestType =>
val newLeft = if (left.dataType == widestType) left else Cast(left, widestType)
val newRight = if (right.dataType == widestType) right else Cast(right, widestType)
If(pred, newLeft, newRight)
Expand Down
14 changes: 14 additions & 0 deletions ...atalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,20 @@ class HiveTypeCoercionSuite extends PlanTest {
)
}

test("test for SPARK-13772") {
val rule = HiveTypeCoercion.IfCoercion
ruleTest(rule,
If(Literal(true), Literal(1.0), Cast(Literal(1.0), DecimalType(19, 0))),
Copy link
Contributor

@cloud-fan cloud-fan Mar 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also check it with other database systems like Hive? Do they allow double type and decimal type in if and else branches?

Copy link
Contributor Author

@cenyuhai cenyuhai Mar 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cloud-fan It is ok in hive 1.2.1 and spark 1.4.1.
test case:
select if(1=1, cast(1 as double), cast(1 as decimal)) from test

If(Literal(true), Literal(1.0), Cast(Cast(Literal(1.0), DecimalType(19, 0)), DoubleType))
)

ruleTest(rule,
If(Literal(true), Literal(Decimal(1)), Cast(Literal(1.0), DecimalType(19, 9))),
If(Literal(true), Cast(Literal(Decimal(1)), DecimalType(19, 9)),
Cast(Literal(1.0), DecimalType(19, 9)))
)
}

test("type coercion for CaseKeyWhen") {
ruleTest(HiveTypeCoercion.CaseWhenCoercion,
CaseKeyWhen(Literal(1.toShort), Seq(Literal(1), Literal("a"))),
Expand Down