[drill] branch master updated: DRILL-7397: Fix logback errors when building the project

2019-10-30 Thread bohdan 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 81dba65  DRILL-7397: Fix logback errors when building the project
81dba65 is described below

commit 81dba65268fd86fd04d9c98a4de0be5288d43ae9
Author: Bohdan Kazydub 
AuthorDate: Mon Oct 28 16:19:00 2019 +0200

DRILL-7397: Fix logback errors when building the project
---
 common/pom.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/common/pom.xml b/common/pom.xml
index 47b60fc..743374d 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -102,6 +102,14 @@
 2.9
 
 
+
+
+  org.codehaus.janino
+  janino
+  test
+
+

[drill] branch master updated: DRILL-7418: MetadataDirectGroupScan improvements

2019-10-30 Thread arina 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 0928427  DRILL-7418: MetadataDirectGroupScan improvements
0928427 is described below

commit 09284270b85d35f7a1d521539c42876bb613a6e3
Author: Arina Ielchiieva 
AuthorDate: Tue Oct 22 17:33:04 2019 +0300

DRILL-7418: MetadataDirectGroupScan improvements

1. Replaced files listing with selection root information to reduce query 
plan size in MetadataDirectGroupScan.
2. Fixed MetadataDirectGroupScan ser / de issues.
3. Added PlanMatcher to QueryBuilder for more convenient plan matching.
4. Re-written TestConvertCountToDirectScan to use ClusterTest.
5. Refactoring and code clean up.
---
 .../exec/TestHiveDrillNativeParquetReader.java |  19 +-
 .../exec/physical/base/AbstractGroupScan.java  |   5 +
 .../apache/drill/exec/physical/base/GroupScan.java |   9 +-
 .../apache/drill/exec/physical/base/ScanStats.java |  46 ++-
 .../logical/ConvertCountToDirectScanRule.java  |  27 +-
 .../physical/ConvertCountToDirectScanPrule.java|  17 +-
 .../drill/exec/store/direct/DirectGroupScan.java   |  24 +-
 .../exec/store/direct/MetadataDirectGroupScan.java |  49 ++-
 .../parquet/AbstractParquetScanBatchCreator.java   |   6 +-
 .../drill/TestFunctionsWithTypeExpoQueries.java|   2 +-
 .../logical/TestConvertCountToDirectScan.java  | 444 -
 .../java/org/apache/drill/test/ClientFixture.java  |  76 ++--
 .../java/org/apache/drill/test/QueryBuilder.java   | 152 +--
 13 files changed, 530 insertions(+), 346 deletions(-)

diff --git 
a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveDrillNativeParquetReader.java
 
b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveDrillNativeParquetReader.java
index 5490640..6b9a7cd 100644
--- 
a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveDrillNativeParquetReader.java
+++ 
b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveDrillNativeParquetReader.java
@@ -64,8 +64,7 @@ public class TestHiveDrillNativeParquetReader extends 
HiveTestBase {
 int actualRowCount = testSql(query);
 assertEquals("Expected and actual row count should match", 2, 
actualRowCount);
 
-testPlanMatchingPatterns(query,
-new String[]{"HiveDrillNativeParquetScan", "numFiles=1"}, null);
+testPlanMatchingPatterns(query, "HiveDrillNativeParquetScan", 
"numFiles=1");
   }
 
   @Test
@@ -75,8 +74,7 @@ public class TestHiveDrillNativeParquetReader extends 
HiveTestBase {
 int actualRowCount = testSql(query);
 assertEquals("Expected and actual row count should match", 1, 
actualRowCount);
 
-testPlanMatchingPatterns(query,
-new String[]{"HiveDrillNativeParquetScan", "numFiles=1"}, null);
+testPlanMatchingPatterns(query, "HiveDrillNativeParquetScan", 
"numFiles=1");
   }
 
   @Test
@@ -114,15 +112,14 @@ public class TestHiveDrillNativeParquetReader extends 
HiveTestBase {
 int actualRowCount = testSql(query);
 assertEquals("Expected and actual row count should match", 2, 
actualRowCount);
 
-testPlanMatchingPatterns(query,
-new String[]{"HiveDrillNativeParquetScan", "numFiles=1"}, null);
+testPlanMatchingPatterns(query, "HiveDrillNativeParquetScan", 
"numFiles=1");
   }
 
   @Test
   public void testPartitionedExternalTable() throws Exception {
 String query = "select * from hive.kv_native_ext";
 
-testPlanMatchingPatterns(query, new String[]{"HiveDrillNativeParquetScan", 
"numFiles=2"}, null);
+testPlanMatchingPatterns(query, "HiveDrillNativeParquetScan", 
"numFiles=2");
 
 testBuilder()
 .sqlQuery(query)
@@ -185,14 +182,16 @@ public class TestHiveDrillNativeParquetReader extends 
HiveTestBase {
 int actualRowCount = testSql(query);
 assertEquals("Expected and actual row count should match", 2, 
actualRowCount);
 
-testPlanMatchingPatterns(query, new String[]{"HiveDrillNativeParquetScan", 
"numFiles=1"}, null);
+testPlanMatchingPatterns(query, "HiveDrillNativeParquetScan", 
"numFiles=1");
   }
 
   @Test
   public void testConvertCountToDirectScanOptimization() throws Exception {
 String query = "select count(1) as cnt from hive.kv_native";
 
-testPlanMatchingPatterns(query, new String[]{"DynamicPojoRecordReader"}, 
null);
+testPlanMatchingPatterns(query, "DynamicPojoRecordReader");
+
+testPhysicalPlanExecutionBasedOnQuery(query);
 
 testBuilder()
   .sqlQuery(query)
@@ -224,7 +223,7 @@ public class TestHiveDrillNativeParquetReader extends 
HiveTestBase {
   public void testReadAllSupportedHiveDataTypesNativeParquet() throws 
Exception {
 String query = "select * from hive.readtest_parquet";
 
-testPlanMatchingPatterns(query, new String[] 
{"HiveDrillNativeParquetScan"}, null);
+testPl