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/06/08 17:16:01 UTC
[1/2] carbondata git commit: Inset Filter
Repository: carbondata
Updated Branches:
refs/heads/master 224e38513 -> b754390e6
Inset Filter
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/8410d19f
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/8410d19f
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/8410d19f
Branch: refs/heads/master
Commit: 8410d19f9e8cf1e3b2c3516b22e168e14da94b20
Parents: 224e385
Author: sounakr <so...@gmail.com>
Authored: Fri May 26 16:59:44 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Thu Jun 8 22:45:16 2017 +0530
----------------------------------------------------------------------
.../apache/spark/sql/execution/CarbonLateDecodeStrategy.scala | 4 ++++
.../scala/org/apache/spark/sql/optimizer/CarbonFilters.scala | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/8410d19f/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala
index ac43a12..4605914 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala
@@ -471,6 +471,10 @@ private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
Some(CastExpr(c))
case c@In(Cast(a: Attribute, _), list) if !list.exists(!_.isInstanceOf[Literal]) =>
Some(CastExpr(c))
+ case InSet(a: Attribute, set) =>
+ Some(sources.In(a.name, set.toArray))
+ case Not(InSet(a: Attribute, set)) =>
+ Some(sources.Not(sources.In(a.name, set.toArray)))
case GreaterThan(a: Attribute, Literal(v, t)) =>
Some(sources.GreaterThan(a.name, v))
case GreaterThan(Literal(v, t), a: Attribute) =>
http://git-wip-us.apache.org/repos/asf/carbondata/blob/8410d19f/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala
index 5c80618..1bc97d8 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala
@@ -197,6 +197,10 @@ object CarbonFilters {
Some(CastExpr(c))
case c@In(Cast(a: Attribute, _), list) if !list.exists(!_.isInstanceOf[Literal]) =>
Some(CastExpr(c))
+ case InSet(a: Attribute, set) =>
+ Some(sources.In(a.name, set.toArray))
+ case Not(InSet(a: Attribute, set)) =>
+ Some(sources.Not(sources.In(a.name, set.toArray)))
case GreaterThan(a: Attribute, Literal(v, t)) =>
Some(sources.GreaterThan(a.name, v))
case GreaterThan(Literal(v, t), a: Attribute) =>
[2/2] carbondata git commit: [CARBONDATA-1118] Inset Filter Pushdown
in 2.1 This closes #955
Posted by ra...@apache.org.
[CARBONDATA-1118] Inset Filter Pushdown in 2.1 This closes #955
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/b754390e
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/b754390e
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/b754390e
Branch: refs/heads/master
Commit: b754390e6f81535575bae77654b12f3b03045a4d
Parents: 224e385 8410d19
Author: ravipesala <ra...@gmail.com>
Authored: Thu Jun 8 22:45:47 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Thu Jun 8 22:45:47 2017 +0530
----------------------------------------------------------------------
.../apache/spark/sql/execution/CarbonLateDecodeStrategy.scala | 4 ++++
.../scala/org/apache/spark/sql/optimizer/CarbonFilters.scala | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------