drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [13/13] drill git commit: DRILL-1384: Part 7 - Resolve conflicts after rebasing Drill master with view/impersonation.
Date Wed, 22 Apr 2015 06:10:16 GMT
DRILL-1384: Part 7 - Resolve conflicts after rebasing Drill master with view/impersonation.


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

Branch: refs/heads/master
Commit: e99f270322ec17580e728bf28a20b978a7fbdf8b
Parents: e462d14
Author: Jinfeng Ni <jni@apache.org>
Authored: Tue Apr 21 17:08:22 2015 -0700
Committer: Jinfeng Ni <jni@apache.org>
Committed: Tue Apr 21 17:34:46 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/drill/exec/ops/QueryContext.java  | 4 ++--
 .../java/org/apache/drill/exec/ops/ViewExpansionContext.java   | 6 +++---
 .../java/org/apache/drill/exec/planner/logical/DrillTable.java | 1 +
 .../org/apache/drill/exec/planner/logical/DrillViewTable.java  | 3 ++-
 .../java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java | 1 +
 .../org/apache/drill/exec/planner/torel/ConversionContext.java | 1 +
 .../org/apache/drill/exec/store/parquet/ParquetGroupScan.java  | 2 ++
 .../java-exec/src/test/java/org/apache/drill/PlanningBase.java | 2 +-
 pom.xml                                                        | 2 +-
 9 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java
index bc72779..6414f56 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java
@@ -110,7 +110,7 @@ public class QueryContext implements AutoCloseable, UdfUtilities {
   }
 
   /**
-   * Return reference to default schema instance in a schema tree. Each {@link net.hydromatic.optiq.SchemaPlus}
+   * Return reference to default schema instance in a schema tree. Each {@link org.apache.calcite.schema.SchemaPlus}
    * instance can refer to its parent and its children. From the returned reference to default
schema instance,
    * clients can traverse the entire schema tree and know the default schema where to look
up the tables first.
    *
@@ -153,7 +153,7 @@ public class QueryContext implements AutoCloseable, UdfUtilities {
    */
   public SchemaPlus getRootSchema(SchemaConfig schemaConfig) {
     try {
-      final SchemaPlus rootSchema = SimpleOptiqSchema.createRootSchema(false);
+      final SchemaPlus rootSchema = SimpleCalciteSchema.createRootSchema(false);
       drillbitContext.getSchemaFactory().registerSchemas(schemaConfig, rootSchema);
       return rootSchema;
     } catch(IOException e) {

http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
index 9d04ab9..157d550 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java
@@ -19,10 +19,10 @@ package org.apache.drill.exec.ops;
 
 import com.carrotsearch.hppc.ObjectIntOpenHashMap;
 import com.google.common.base.Preconditions;
-import net.hydromatic.optiq.SchemaPlus;
+import org.apache.calcite.schema.SchemaPlus;
 import org.apache.drill.common.exceptions.UserException;
-import org.eigenbase.relopt.RelOptTable;
-import org.eigenbase.relopt.RelOptTable.ToRelContext;
+import org.apache.calcite.plan.RelOptTable;
+import org.apache.calcite.plan.RelOptTable.ToRelContext;
 
 import static org.apache.drill.exec.ExecConstants.IMPERSONATION_MAX_CHAINED_USER_HOPS;
 

http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java
index 3fdbb57..4ddfcfd 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java
@@ -30,6 +30,7 @@ import org.apache.drill.exec.physical.base.GroupScan;
 import org.apache.drill.exec.store.StoragePlugin;
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.plan.RelOptTable;
+import org.apache.drill.exec.util.ImpersonationUtil;
 
 public abstract class DrillTable implements Table {
 

http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewTable.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewTable.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewTable.java
index b25423b..d2e1ace 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewTable.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewTable.java
@@ -31,6 +31,7 @@ import org.apache.calcite.plan.RelOptTable.ToRelContext;
 import org.apache.calcite.plan.RelOptUtil;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.drill.exec.ops.ViewExpansionContext;
 
 public class DrillViewTable implements TranslatableTable, DrillViewInfoProvider {
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillViewTable.class);
@@ -57,7 +58,7 @@ public class DrillViewTable implements TranslatableTable, DrillViewInfoProvider
 
   @Override
   public RelNode toRel(ToRelContext context, RelOptTable relOptTable) {
-    ViewExpansionToken token = null;
+    ViewExpansionContext.ViewExpansionToken token = null;
     try {
       RelDataType rowType = relOptTable.getRowType();
       RelNode rel;

http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
index ebe7aeb..c918723 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
@@ -64,6 +64,7 @@ import org.apache.calcite.sql.parser.SqlAbstractParserImpl;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParser;
 import org.apache.calcite.sql.parser.SqlParserImplFactory;
+import org.apache.hadoop.security.AccessControlException;
 
 public class DrillSqlWorker {
 //  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillSqlWorker.class);

http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/exec/java-exec/src/main/java/org/apache/drill/exec/planner/torel/ConversionContext.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/torel/ConversionContext.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/torel/ConversionContext.java
index 4c027e1..a88f523 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/torel/ConversionContext.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/torel/ConversionContext.java
@@ -52,6 +52,7 @@ import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rex.RexBuilder;
 import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.schema.SchemaPlus;
 
 public class ConversionContext implements ToRelContext {
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ConversionContext.class);

http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java
index 64c245d..37f19ac 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import com.google.common.collect.ArrayListMultimap;
 import org.apache.drill.common.exceptions.DrillRuntimeException;
 import org.apache.drill.common.exceptions.ExecutionSetupException;
 import org.apache.drill.common.expression.SchemaPath;
@@ -156,6 +157,7 @@ public class ParquetGroupScan extends AbstractFileGroupScan {
    * This is used to clone another copy of the group scan.
    */
   private ParquetGroupScan(ParquetGroupScan that) {
+    super(that);
     this.columns = that.columns == null ? null : Lists.newArrayList(that.columns);
     this.endpointAffinities = that.endpointAffinities == null ? null : Lists.newArrayList(that.endpointAffinities);
     this.entries = that.entries == null ? null : Lists.newArrayList(that.entries);

http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java b/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java
index e0ca68e..da033f7 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java
@@ -102,7 +102,7 @@ public class PlanningBase extends ExecTest{
     registry.init();
     final FunctionImplementationRegistry functionRegistry = new FunctionImplementationRegistry(config);
     final DrillOperatorTable table = new DrillOperatorTable(functionRegistry);
-    final SchemaPlus root = SimpleOptiqSchema.createRootSchema(false);
+    final SchemaPlus root = SimpleCalciteSchema.createRootSchema(false);
     registry.getSchemaFactory().registerSchemas(SchemaConfig.newBuilder("foo", context).build(),
root);
 
     new NonStrictExpectations() {

http://git-wip-us.apache.org/repos/asf/drill/blob/e99f2703/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48d6970..1720651 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1038,7 +1038,7 @@
           <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.1.0-drill-r1</version>
+            <version>1.1.0-drill-r2</version>
             <exclusions>
               <exclusion>
                 <groupId>org.jgrapht</groupId>


Mime
View raw message