drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [2/3] drill git commit: DRILL-3463: Unit test of project pushdown in TestUnionAll should verify proper plan attributes in expected plan result.
Date Thu, 09 Jul 2015 05:48:00 GMT
DRILL-3463: Unit test of project pushdown in TestUnionAll should verify proper plan attributes
in expected plan result.


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/aa7c253a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/aa7c253a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/aa7c253a

Branch: refs/heads/master
Commit: aa7c253a2cdb81724643675bc85f310de6cfd20d
Parents: 3e83b34
Author: Jinfeng Ni <jni@apache.org>
Authored: Mon Jul 6 16:20:32 2015 -0700
Committer: Jinfeng Ni <jni@apache.org>
Committed: Wed Jul 8 20:38:15 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/drill/TestUnionAll.java     | 36 ++++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/aa7c253a/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java b/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java
index b9cca2e..3e5bfa2 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java
@@ -642,10 +642,10 @@ public class TestUnionAll extends BaseTestQuery{
     // Validate the plan
     final String[] expectedPlan = {"UnionAll.*\n" +
         ".*Project.*\n" +
-            ".*Scan.*\n" +
+            ".*Scan.*columns=\\[`n_nationkey`, `n_name`\\].*\n" +
         ".*Project.*\n" +
-            ".*Scan"};
-    final String[] excludedPlan = {"Project.*\n.*UnionAll"};
+            ".*Scan.*columns=\\[`r_regionkey`, `r_name`\\]"};
+    final String[] excludedPlan = {};
     PlanTestBase.testPlanMatchingPatterns(query, expectedPlan, excludedPlan);
 
     testBuilder()
@@ -666,9 +666,9 @@ public class TestUnionAll extends BaseTestQuery{
 
     // Validate the plan
     final String[] expectedPlan = {"UnionAll.*\n" +
-        ".*Scan.*\n" +
-        ".*Scan"};
-    final String[] excludedPlan = {"Project"};
+        ".*Scan.*columns=\\[`n_nationkey`\\].*\n" +
+        ".*Scan.*columns=\\[`r_regionkey`\\].*"};
+    final String[] excludedPlan = {};
     PlanTestBase.testPlanMatchingPatterns(query, expectedPlan, excludedPlan);
 
     // Validate the result
@@ -691,10 +691,10 @@ public class TestUnionAll extends BaseTestQuery{
     // Validate the plan
     final String[] expectedPlan = {"UnionAll.*\n" +
         ".*Project.*\n" +
-            ".*Scan.*\n" +
+            ".*Scan.*columns=\\[`n_nationkey`\\].*\n" +
         ".*Project.*\n" +
-            ".*Scan"};
-    final String[] excludedPlan = {"Project.*\n.*UnionAll"};
+            ".*Scan.*columns=\\[`r_regionkey`\\].*"};
+    final String[] excludedPlan = {};
     PlanTestBase.testPlanMatchingPatterns(query, expectedPlan, excludedPlan);
 
     // Validate the result
@@ -719,10 +719,10 @@ public class TestUnionAll extends BaseTestQuery{
     // Validate the plan
     final String[] expectedPlan = {"UnionAll.*\n." +
         ".*Project.*\n" +
-            ".*Scan.*\n" +
+            ".*Scan.*columns=\\[`n_nationkey`\\].*\n" +
         ".*Project.*\n" +
-            ".*Scan"};
-    final String[] excludedPlan = {"Project.*\\*.*\n.*UnionAll"};
+            ".*Scan.*columns=\\[`columns`\\[0\\]\\]"};
+    final String[] excludedPlan = {};
     PlanTestBase.testPlanMatchingPatterns(query, expectedPlan, excludedPlan);
 
     // Validate the result
@@ -745,10 +745,10 @@ public class TestUnionAll extends BaseTestQuery{
     // Validate the plan
     final String[] expectedPlan = {"UnionAll.*\n." +
         "*Project.*\n" +
-            ".*Scan.*\n" +
+            ".*Scan.*columns=\\[`n_comment`, `n_nationkey`, `n_name`\\].*\n" +
         ".*Project.*\n" +
-            ".*Scan"};
-    final String[] excludedPlan = {"Project.*\n.*UnionAll"};
+            ".*Scan.*columns=\\[`r_comment`, `r_regionkey`, `r_name`\\]"};
+    final String[] excludedPlan = {};
     PlanTestBase.testPlanMatchingPatterns(query, expectedPlan, excludedPlan);
 
     // Validate the result
@@ -773,11 +773,11 @@ public class TestUnionAll extends BaseTestQuery{
     final String[] expectedPlan = {"UnionAll.*\n" +
         ".*SelectionVectorRemover.*\n" +
             ".*Filter.*\n" +
-                ".*Scan.*\n" +
+                ".*Scan.*columns=\\[`n_nationkey`\\].*\n" +
         ".*SelectionVectorRemover.*\n" +
             ".*Filter.*\n" +
-                ".*Scan"};
-    final String[] excludedPlan = {"Project", "Filter.*\n.*UnionAll"};
+                ".*Scan.*columns=\\[`r_regionkey`\\]"};
+    final String[] excludedPlan = {};
     PlanTestBase.testPlanMatchingPatterns(query, expectedPlan, excludedPlan);
 
     // Validate the result


Mime
View raw message