drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [2/5] drill git commit: DRILL-3542: Rebase Drill on Calcite 1.4.0 release.
Date Wed, 26 Aug 2015 22:08:18 GMT
DRILL-3542: Rebase Drill on Calcite 1.4.0 release.

Changes includes:
 - Parser configuration change
 - Rule name change.
 - Consistency checking in SqlOperator.
 - Exclude dependency inherited from Calcite, due to version conflicts.


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

Branch: refs/heads/master
Commit: 793884d671ec60c927e8d67e676e5f63f5875d75
Parents: ec4ffb4
Author: Jinfeng Ni <jni@apache.org>
Authored: Tue Jul 28 16:23:04 2015 -0700
Committer: Jinfeng Ni <jni@apache.org>
Committed: Wed Aug 26 12:08:06 2015 -0700

----------------------------------------------------------------------
 .../drill/exec/planner/sql/HiveUDFOperator.java   |  5 +++++
 exec/java-exec/src/main/codegen/data/Parser.tdd   |  2 ++
 .../planner/logical/DrillPushProjIntoScan.java    |  2 +-
 .../drill/exec/planner/logical/DrillRuleSets.java |  2 +-
 .../apache/drill/exec/planner/sql/Checker.java    |  5 +++++
 .../planner/sql/handlers/DefaultSqlHandler.java   |  2 +-
 exec/jdbc-all/pom.xml                             |  4 ++++
 pom.xml                                           | 18 +++++++++++++++---
 8 files changed, 34 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/793884d6/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java
b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java
index 988060c..377ea75 100644
--- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java
+++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java
@@ -76,6 +76,11 @@ public class HiveUDFOperator extends SqlFunction {
     }
 
     @Override
+    public Consistency getConsistency() {
+      return Consistency.NONE;
+    }
+
+    @Override
     public SqlOperandCountRange getOperandCountRange() {
       return range;
     }

http://git-wip-us.apache.org/repos/asf/drill/blob/793884d6/exec/java-exec/src/main/codegen/data/Parser.tdd
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/codegen/data/Parser.tdd b/exec/java-exec/src/main/codegen/data/Parser.tdd
index 358b75e..7c03ab0 100644
--- a/exec/java-exec/src/main/codegen/data/Parser.tdd
+++ b/exec/java-exec/src/main/codegen/data/Parser.tdd
@@ -67,6 +67,8 @@
   ]
   
   includeCompoundIdentifier: false,
+  includeBraces: true,
+  includeAdditionalDeclarations: false,
 
   identifierMaxLength: 1024
 

http://git-wip-us.apache.org/repos/asf/drill/blob/793884d6/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjIntoScan.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjIntoScan.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjIntoScan.java
index 950cd87..1fd1cd7 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjIntoScan.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjIntoScan.java
@@ -80,7 +80,7 @@ public class DrillPushProjIntoScan extends RelOptRule {
               newProjects,
               proj.getRowType());
 
-      if (ProjectRemoveRule.isTrivial(newProj, true)) {
+      if (ProjectRemoveRule.isTrivial(newProj)) {
         call.transformTo(newScan);
       } else {
         call.transformTo(newProj);

http://git-wip-us.apache.org/repos/asf/drill/blob/793884d6/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
index 4307757..6af23c5 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
@@ -116,7 +116,7 @@ public class DrillRuleSets {
 
       FilterMergeRule.INSTANCE,
       AggregateRemoveRule.INSTANCE,
-      ProjectRemoveRule.NAME_CALC_INSTANCE,
+      ProjectRemoveRule.INSTANCE,
       SortRemoveRule.INSTANCE,
 
       AggregateExpandDistinctAggregatesRule.INSTANCE,

http://git-wip-us.apache.org/repos/asf/drill/blob/793884d6/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java
index 42aa728..338977c 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java
@@ -44,4 +44,9 @@ class Checker implements SqlOperandTypeChecker {
     return opName + "(Drill - Opaque)";
   }
 
+  @Override
+  public Consistency getConsistency() {
+    return Consistency.NONE;
+  }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/793884d6/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java
index a53c242..4c986aa 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java
@@ -504,7 +504,7 @@ public class DefaultSqlHandler extends AbstractSqlHandler {
     DrillProjectRel topProj = DrillProjectRel.create(rel.getCluster(), rel.getTraitSet(),
rel, projections, newRowType);
 
     // Add a final non-trivial Project to get the validatedRowType, if child is not project.
-    if (rel instanceof Project && ProjectRemoveRule.isTrivial(topProj, true)) {
+    if (rel instanceof Project && ProjectRemoveRule.isTrivial(topProj)) {
       return rel;
     } else{
       return topProj;

http://git-wip-us.apache.org/repos/asf/drill/blob/793884d6/exec/jdbc-all/pom.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 0e1f85d..ed49cfb 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -336,6 +336,10 @@
               <groupId>org.slf4j</groupId>
               <artifactId>jcl-over-slf4j</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>net.hydromatic</groupId>
+              <artifactId>eigenbase-properties</artifactId>
+            </exclusion>
           </exclusions>
           <libs>
             <lib>${java.home}/lib/rt.jar</lib>

http://git-wip-us.apache.org/repos/asf/drill/blob/793884d6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a4b22d7..8d4b318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1226,16 +1226,28 @@
           <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.1.0-drill-r16</version>
+            <version>1.4.0-drill-r0</version>
             <exclusions>
               <exclusion>
                 <groupId>org.jgrapht</groupId>
                 <artifactId>jgrapht-jdk1.5</artifactId>
               </exclusion>
-            <exclusion>
+              <exclusion>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-            </exclusion>
+              </exclusion>
+              <exclusion>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+              </exclusion>
+              <exclusion>
+                 <groupId>com.fasterxml.jackson.core</groupId>
+                 <artifactId>jackson-core</artifactId>
+              </exclusion>
+              <exclusion>
+                 <groupId>com.fasterxml.jackson.core</groupId>
+                 <artifactId>jackson-databind</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
 


Mime
View raw message