Skip to content

[SQL] Miscellaneous SQL/DF expression changes. #6754

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
rxin wants to merge 6 commits into from
Closed

[SQL] Miscellaneous SQL/DF expression changes. #6754

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b21a9b
[SQL] Miscellaneous SQL/DF expression changes.
rxin Jun 11, 2015
b201cd4
Removed if.
rxin Jun 11, 2015
de827ac
Fixed style
rxin Jun 11, 2015
3c32bbc
Fixed if.
rxin Jun 11, 2015
2647067
Promote to string type.
rxin Jun 11, 2015
35fce15
Removed println.
rxin Jun 11, 2015
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
Removed println.
  • Loading branch information
@rxin
rxin committed Jun 11, 2015
commit 35fce15b0aa70d33d29a81c24ba93e72203aec5e
1 change: 0 additions & 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 @@ -678,7 +678,6 @@ trait HiveTypeCoercion {
// Convert If(null literal, _, _) into boolean type.
// In the optimizer, we should short-circuit this directly into false value.
case i @ If(pred, left, right) if pred.dataType == NullType =>
println("fireing this rule")
i.makeCopy(Array(Literal.create(null, BooleanType), left, right))
Copy link
Contributor

@marmbrus marmbrus Jun 11, 2015

Choose a reason for hiding this comment

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

Why this special case? Also, I'd just use Ifinstead of makeCopy here and above. Make copy is nice when you are matching on different but structurally similar expression, but looses compile time checks for arguments.

Copy link
Contributor Author

@rxin rxin Jun 11, 2015

Choose a reason for hiding this comment

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

"if(null, true, false)" gets a nulltype.

Copy link
Contributor

@cloud-fan cloud-fan Jun 12, 2015

Choose a reason for hiding this comment

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

what about

case i @ If (pred, _, _) if pred.dataType == NullType =>
  i.copy(predicate = Literal.create(null, BooleanType))

Copy link
Contributor

@marmbrus marmbrus Jun 12, 2015

Choose a reason for hiding this comment

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

+1

}
}
Expand Down