You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/05/11 13:53:09 UTC
[19/50] carbondata git commit: Cast Optimization Case Statement
Rectify
Cast Optimization Case Statement Rectify
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/90deaea9
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/90deaea9
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/90deaea9
Branch: refs/heads/branch-1.1
Commit: 90deaea92cc51a7e273f6e3a3f6f36a35a85c86d
Parents: 4e06b1c
Author: sounakr <so...@gmail.com>
Authored: Fri May 5 18:17:05 2017 +0530
Committer: sounakr <so...@gmail.com>
Committed: Fri May 5 18:17:05 2017 +0530
----------------------------------------------------------------------
.../execution/CastExpressionOptimization.scala | 28 ++++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/90deaea9/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CastExpressionOptimization.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CastExpressionOptimization.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CastExpressionOptimization.scala
index 71a1032..a8985b9 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CastExpressionOptimization.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CastExpressionOptimization.scala
@@ -114,7 +114,7 @@ object CastExpressionOptimization {
expr match {
case c@EqualTo(Cast(a: Attribute, _), Literal(v, t)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.EqualTo(a.name, value))
@@ -132,7 +132,7 @@ object CastExpressionOptimization {
}
case c@EqualTo(Literal(v, t), Cast(a: Attribute, _)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.EqualTo(a.name, value))
@@ -150,7 +150,7 @@ object CastExpressionOptimization {
}
case c@Not(EqualTo(Cast(a: Attribute, _), Literal(v, t))) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.Not(sources.EqualTo(a.name, value)))
@@ -168,7 +168,7 @@ object CastExpressionOptimization {
}
case c@Not(EqualTo(Literal(v, t), Cast(a: Attribute, _))) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.Not(sources.EqualTo(a.name, value)))
@@ -186,7 +186,7 @@ object CastExpressionOptimization {
}
case c@Not(In(Cast(a: Attribute, _), list)) =>
a.dataType match {
- case t: TimestampType if list.head.dataType.sameType(StringType) =>
+ case ts: TimestampType if list.head.dataType.sameType(StringType) =>
val value = typeCastStringToLongList(list)
if (!value.equals(list)) {
val hSet = value.map(e => e.eval(EmptyRow))
@@ -206,7 +206,7 @@ object CastExpressionOptimization {
}
case c@In(Cast(a: Attribute, _), list) =>
a.dataType match {
- case t: TimestampType if list.head.dataType.sameType(StringType) =>
+ case ts: TimestampType if list.head.dataType.sameType(StringType) =>
val value = typeCastStringToLongList(list)
if (!value.equals(list)) {
val hSet = value.map(e => e.eval(EmptyRow))
@@ -226,7 +226,7 @@ object CastExpressionOptimization {
}
case c@GreaterThan(Cast(a: Attribute, _), Literal(v, t)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.GreaterThan(a.name, value))
@@ -244,7 +244,7 @@ object CastExpressionOptimization {
}
case c@GreaterThan(Literal(v, t), Cast(a: Attribute, _)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.LessThan(a.name, value))
@@ -262,7 +262,7 @@ object CastExpressionOptimization {
}
case c@LessThan(Cast(a: Attribute, _), Literal(v, t)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.LessThan(a.name, value))
@@ -280,7 +280,7 @@ object CastExpressionOptimization {
}
case c@LessThan(Literal(v, t), Cast(a: Attribute, _)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.GreaterThan(a.name, value))
@@ -298,7 +298,7 @@ object CastExpressionOptimization {
}
case c@GreaterThanOrEqual(Cast(a: Attribute, _), Literal(v, t)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.GreaterThanOrEqual(a.name, value))
@@ -316,7 +316,7 @@ object CastExpressionOptimization {
}
case c@GreaterThanOrEqual(Literal(v, t), Cast(a: Attribute, _)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.LessThanOrEqual(a.name, value))
@@ -334,7 +334,7 @@ object CastExpressionOptimization {
}
case c@LessThanOrEqual(Cast(a: Attribute, _), Literal(v, t)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.LessThanOrEqual(a.name, value))
@@ -352,7 +352,7 @@ object CastExpressionOptimization {
}
case c@LessThanOrEqual(Literal(v, t), Cast(a: Attribute, _)) =>
a.dataType match {
- case t: TimestampType if t.sameType(StringType) =>
+ case ts: TimestampType if t.sameType(StringType) =>
val value = typeCastStringToLong(v)
if (!value.equals(v)) {
Some(sources.GreaterThanOrEqual(a.name, value))