diff options
| author | Takuya UESHIN <ueshin@happy-camper.st> | 2014-06-10 23:13:48 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-06-10 23:14:04 -0700 |
| commit | 6d15e9f7cbe9dffe8695519fc5cb6baa59f75776 (patch) | |
| tree | bd1602df0e4cc52b4f838d63912cb2a58d7aa017 /sql | |
| parent | 2cdce7cf35ffe48810920978b6f55be8a456e844 (diff) | |
| download | spark-6d15e9f7cbe9dffe8695519fc5cb6baa59f75776.tar.gz spark-6d15e9f7cbe9dffe8695519fc5cb6baa59f75776.tar.bz2 spark-6d15e9f7cbe9dffe8695519fc5cb6baa59f75776.zip | |
[SPARK-2093] [SQL] NullPropagation should use exact type value.
`NullPropagation` should use exact type value when transform `Count` or `Sum`.
Author: Takuya UESHIN <ueshin@happy-camper.st>
Closes #1034 from ueshin/issues/SPARK-2093 and squashes the following commits:
65b6ff1 [Takuya UESHIN] Modify the literal value of the result of transformation from Sum to long value.
830c20b [Takuya UESHIN] Add Cast to the result of transformation from Count.
9314806 [Takuya UESHIN] Fix NullPropagation to use exact type value.
(cherry picked from commit 0402bd77ec786d1fa6cfd7f9cc3aa97c7ab16fd8)
Signed-off-by: Michael Armbrust <michael@databricks.com>
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala index ccb8245cc2..e41fd2db74 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala @@ -104,8 +104,8 @@ object ColumnPruning extends Rule[LogicalPlan] { object NullPropagation extends Rule[LogicalPlan] { def apply(plan: LogicalPlan): LogicalPlan = plan transform { case q: LogicalPlan => q transformExpressionsUp { - case e @ Count(Literal(null, _)) => Literal(0, e.dataType) - case e @ Sum(Literal(c, _)) if c == 0 => Literal(0, e.dataType) + case e @ Count(Literal(null, _)) => Cast(Literal(0L), e.dataType) + case e @ Sum(Literal(c, _)) if c == 0 => Cast(Literal(0L), e.dataType) case e @ Average(Literal(c, _)) if c == 0 => Literal(0.0, e.dataType) case e @ IsNull(c) if c.nullable == false => Literal(false, BooleanType) case e @ IsNotNull(c) if c.nullable == false => Literal(true, BooleanType) |