DRILL-1384: Part 7 - Resolve conflicts after rebasing Drill master wi…

…th view/impersonation.

exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java

@@ -110,7 +110,7 @@ public BufferAllocator getAllocator() {
   }
 
   /**
-   * 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 SchemaPlus getRootSchema(String userName) {
    */
   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) {

exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java

@@ -19,10 +19,10 @@
 
 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;
 

exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java

@@ -30,6 +30,7 @@
 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 {
 

exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewTable.java

@@ -31,6 +31,7 @@
 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 Statistic getStatistic() {
 
   @Override
   public RelNode toRel(ToRelContext context, RelOptTable relOptTable) {
-    ViewExpansionToken token = null;
+    ViewExpansionContext.ViewExpansionToken token = null;
     try {
       RelDataType rowType = relOptTable.getRowType();
       RelNode rel;

exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java

@@ -64,6 +64,7 @@
 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);

exec/java-exec/src/main/java/org/apache/drill/exec/planner/torel/ConversionContext.java

@@ -52,6 +52,7 @@
 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);

exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java

@@ -25,6 +25,7 @@
 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 ParquetGroupScan( //
    * 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);

exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java

@@ -102,7 +102,7 @@ protected void testSqlPlan(String sqlCommands) throws Exception {
     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() {

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>