[carbondata] branch master updated: [CARBONDATA-3467] Fix count(*) with filter on string column

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ravipesala pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git


The following commit(s) were added to refs/heads/master by this push:
     new ebe78dc  [CARBONDATA-3467] Fix count(*) with filter on string column
ebe78dc is described below

commit ebe78dca170773a5f4a37e8146a923b2dc6604a4
Author: Indhumathi27 <in...@gmail.com>
AuthorDate: Tue Jul 9 09:10:24 2019 +0530

    [CARBONDATA-3467] Fix count(*) with filter on string column
    
    Problem:
    count(*) with filter on string column throws Unresolved Exception
    Solution:
    Added check for UnresolvedAlias in MVAnalyzer
    
    This closes #3319
---
 .../org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala   |  9 ++++++++-
 .../carbondata/mv/rewrite/TestAllOperationsOnMV.scala       | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala b/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala
index 04bcfbb..edd9c81 100644
--- a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala
+++ b/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala
@@ -70,7 +70,14 @@ class MVAnalyzerRule(sparkSession: SparkSession) extends Rule[LogicalPlan] {
     plan.transform {
       case aggregate@Aggregate(grp, aExp, child) =>
         // check for if plan is for dataload for preaggregate table, then skip applying mv
-        if (aExp.exists(p => p.name.equals("preAggLoad") || p.name.equals("preAgg"))) {
+        val isPreAggLoad = aExp.exists { p =>
+          if (p.isInstanceOf[UnresolvedAlias]) {
+            false
+          } else {
+            p.name.equals("preAggLoad") || p.name.equals("preAgg")
+          }
+        }
+        if (isPreAggLoad) {
           needAnalysis = false
         }
         Aggregate(grp, aExp, child)
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala b/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala
index 839a2e6..81ddf38 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala
+++ b/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala
@@ -540,6 +540,17 @@ class TestAllOperationsOnMV extends QueryTest with BeforeAndAfterEach {
     }.getMessage.contains("Operation not allowed on child table.")
   }
 
+  test("test count(*) with filter") {
+    sql("drop table if exists maintable")
+    sql("create table maintable(id int, name string, id1 string, id2 string, dob timestamp, doj " +
+        "timestamp, v1 bigint, v2 bigint, v3 decimal(30,10), v4 decimal(20,10), v5 double, v6 " +
+        "double ) stored by 'carbondata'")
+    sql("insert into maintable values(1, 'abc', 'id001', 'id002', '2017-01-01 00:00:00','2017-01-01 " +
+        "00:00:00', 234, 2242,12.4,23.4,2323,455 )")
+    checkAnswer(sql("select count(*) from maintable where  id1 < id2"), Seq(Row(1)))
+    sql("drop table if exists maintable")
+  }
+
   test("drop meta cache on mv datamap table") {
     sql("drop table IF EXISTS maintable")
     sql("create table maintable(name string, c_code int, price int) stored by 'carbondata'")
@@ -580,6 +591,6 @@ class TestAllOperationsOnMV extends QueryTest with BeforeAndAfterEach {
     newSet.addAll(oldSet)
     newSet
   }
-
+  
 }