Return-Path: X-Original-To: apmail-drill-commits-archive@www.apache.org Delivered-To: apmail-drill-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7793C17ED2 for ; Wed, 22 Apr 2015 06:10:05 +0000 (UTC) Received: (qmail 90216 invoked by uid 500); 22 Apr 2015 06:10:05 -0000 Delivered-To: apmail-drill-commits-archive@drill.apache.org Received: (qmail 90136 invoked by uid 500); 22 Apr 2015 06:10:05 -0000 Mailing-List: contact commits-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@drill.apache.org Delivered-To: mailing list commits@drill.apache.org Received: (qmail 89992 invoked by uid 99); 22 Apr 2015 06:10:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 06:10:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 13EBBE04B7; Wed, 22 Apr 2015 06:10:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jni@apache.org To: commits@drill.apache.org Date: Wed, 22 Apr 2015 06:10:08 -0000 Message-Id: <31a3613967b44c0486f3a8cd79933c33@git.apache.org> In-Reply-To: <42d6d9e5e83c46c29880e372b8f31e19@git.apache.org> References: <42d6d9e5e83c46c29880e372b8f31e19@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/13] drill git commit: DRILL-1384: Part 1 - Rebase on Calcite. Change code due to Calcite package renaming/re-structure. http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ViewHandler.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ViewHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ViewHandler.java index 00fc522..2428b45 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ViewHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ViewHandler.java @@ -20,12 +20,12 @@ package org.apache.drill.exec.planner.sql.handlers; import java.io.IOException; import java.util.List; -import net.hydromatic.optiq.Schema.TableType; -import net.hydromatic.optiq.SchemaPlus; -import net.hydromatic.optiq.Table; -import net.hydromatic.optiq.tools.Planner; -import net.hydromatic.optiq.tools.RelConversionException; -import net.hydromatic.optiq.tools.ValidationException; +import org.apache.calcite.schema.Schema; +import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.schema.Table; +import org.apache.calcite.tools.Planner; +import org.apache.calcite.tools.RelConversionException; +import org.apache.calcite.tools.ValidationException; import org.apache.drill.exec.dotdrill.View; import org.apache.drill.exec.ops.QueryContext; @@ -36,8 +36,8 @@ import org.apache.drill.exec.planner.sql.parser.SqlDropView; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.dfs.WorkspaceSchemaFactory.WorkspaceSchema; import org.apache.drill.exec.work.foreman.ForemanSetupException; -import org.eigenbase.rel.RelNode; -import org.eigenbase.sql.SqlNode; +import org.apache.calcite.rel.RelNode; +import org.apache.calcite.sql.SqlNode; import com.google.common.collect.ImmutableList; @@ -92,14 +92,14 @@ public abstract class ViewHandler extends AbstractSqlHandler { final Table existingTable = SqlHandlerUtil.getTableFromSchema(drillSchema, viewName); if (existingTable != null) { - if (existingTable.getJdbcTableType() != TableType.VIEW) { + if (existingTable.getJdbcTableType() != Schema.TableType.VIEW) { // existing table is not a view throw new ValidationException( String.format("A non-view table with given name [%s] already exists in schema [%s]", viewName, schemaPath)); } - if (existingTable.getJdbcTableType() == TableType.VIEW && !createView.getReplace()) { + if (existingTable.getJdbcTableType() == Schema.TableType.VIEW && !createView.getReplace()) { // existing table is a view and create view has no "REPLACE" clause throw new ValidationException( String.format("A view with given name [%s] already exists in schema [%s]", http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java index eb97941..bfa89a5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java @@ -20,14 +20,14 @@ package org.apache.drill.exec.planner.sql.parser; import java.util.List; import java.util.Map; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlJoin; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlOrderBy; -import org.eigenbase.sql.SqlSelect; -import org.eigenbase.sql.util.SqlShuttle; -import org.eigenbase.sql.util.SqlVisitor; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlJoin; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOrderBy; +import org.apache.calcite.sql.SqlSelect; +import org.apache.calcite.sql.util.SqlShuttle; +import org.apache.calcite.sql.util.SqlVisitor; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java index d5fa215..fe96be4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java @@ -20,12 +20,12 @@ package org.apache.drill.exec.planner.sql.parser; import java.util.Collections; import java.util.List; -import org.eigenbase.sql.SqlBasicCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.fun.SqlStdOperatorTable; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.sql.SqlBasicCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.calcite.sql.parser.SqlParserPos; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java index cba5a18..b6eb31a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java @@ -20,10 +20,10 @@ package org.apache.drill.exec.planner.sql.parser; import java.util.List; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.parser.SqlParserPos; -import org.eigenbase.sql.parser.SqlParserUtil; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.calcite.sql.parser.SqlParserUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java index 3e8d4f1..007b754 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java @@ -17,16 +17,16 @@ */ package org.apache.drill.exec.planner.sql.parser; -import net.hydromatic.optiq.tools.Planner; +import org.apache.calcite.tools.Planner; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.DefaultSqlHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; +import org.apache.calcite.plan.hep.HepPlanner; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.parser.SqlParserPos; import org.apache.drill.exec.util.Pointer; -import org.eigenbase.relopt.hep.HepPlanner; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.parser.SqlParserPos; /** * SqlCall interface with addition of method to get the handler. @@ -44,4 +44,4 @@ public abstract class DrillSqlCall extends SqlCall { public AbstractSqlHandler getSqlHandler(SqlHandlerConfig config, Pointer textPlan) { return new DefaultSqlHandler(config, textPlan); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java index ae1c744..9fd9d92 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java @@ -19,27 +19,27 @@ package org.apache.drill.exec.planner.sql.parser; import java.util.List; -import net.hydromatic.optiq.tools.Planner; +import org.apache.calcite.tools.Planner; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.CreateTableHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; -import org.apache.drill.exec.util.Pointer; -import org.eigenbase.relopt.hep.HepPlanner; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlNodeList; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.SqlSpecialOperator; -import org.eigenbase.sql.SqlWriter; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.plan.hep.HepPlanner; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlNodeList; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import org.apache.drill.exec.util.Pointer; public class SqlCreateTable extends DrillSqlCall { public static final SqlSpecialOperator OPERATOR = new SqlSpecialOperator("CREATE_TABLE", SqlKind.OTHER) { http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java index b7352b4..57cfde9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java @@ -22,16 +22,16 @@ import com.google.common.collect.Lists; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; import org.apache.drill.exec.planner.sql.handlers.ViewHandler; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlNodeList; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.SqlSpecialOperator; -import org.eigenbase.sql.SqlWriter; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlNodeList; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; import java.util.List; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDescribeTable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDescribeTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDescribeTable.java index 7d464e1..3a09aea 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDescribeTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDescribeTable.java @@ -19,22 +19,22 @@ package org.apache.drill.exec.planner.sql.parser; import java.util.List; -import net.hydromatic.optiq.tools.Planner; +import org.apache.calcite.tools.Planner; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.DescribeTableHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; -import org.eigenbase.relopt.hep.HepPlanner; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.SqlSpecialOperator; -import org.eigenbase.sql.SqlWriter; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.plan.hep.HepPlanner; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java index a0d6f7b..473dbcb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java @@ -20,22 +20,22 @@ package org.apache.drill.exec.planner.sql.parser; import java.util.Collections; import java.util.List; -import net.hydromatic.optiq.tools.Planner; +import org.apache.calcite.tools.Planner; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; import org.apache.drill.exec.planner.sql.handlers.ViewHandler.DropView; -import org.eigenbase.relopt.hep.HepPlanner; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.SqlSpecialOperator; -import org.eigenbase.sql.SqlWriter; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.plan.hep.HepPlanner; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java index 38abfeb..8df3324 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java @@ -20,22 +20,22 @@ package org.apache.drill.exec.planner.sql.parser; import java.util.Collections; import java.util.List; -import net.hydromatic.optiq.tools.Planner; +import org.apache.calcite.tools.Planner; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.ShowFileHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; -import org.eigenbase.relopt.hep.HepPlanner; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.SqlSpecialOperator; -import org.eigenbase.sql.SqlWriter; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.plan.hep.HepPlanner; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; /** * Sql parse tree node to represent statement: http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java index 9d8771a..6e95e10 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java @@ -19,21 +19,21 @@ package org.apache.drill.exec.planner.sql.parser; import java.util.List; -import net.hydromatic.optiq.tools.Planner; +import org.apache.calcite.tools.Planner; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.ShowSchemasHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; -import org.eigenbase.relopt.hep.HepPlanner; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.SqlSpecialOperator; -import org.eigenbase.sql.SqlWriter; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.plan.hep.HepPlanner; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java index da3f0fd..4d4ab09 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java @@ -21,15 +21,15 @@ import com.google.common.collect.Lists; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.ShowTablesHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.SqlSpecialOperator; -import org.eigenbase.sql.SqlWriter; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; import java.util.List; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java index c8af002..2f8eeb8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java @@ -20,15 +20,15 @@ package org.apache.drill.exec.planner.sql.parser; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; import org.apache.drill.exec.planner.sql.handlers.UseSchemaHandler; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlIdentifier; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.SqlOperator; -import org.eigenbase.sql.SqlSpecialOperator; -import org.eigenbase.sql.SqlWriter; -import org.eigenbase.sql.parser.SqlParserPos; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; import java.util.Collections; import java.util.List; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java index 4830fe1..45bf26f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java @@ -21,15 +21,15 @@ import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.exception.UnsupportedOperatorCollector; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.work.foreman.SqlUnsupportedException; -import org.eigenbase.sql.SqlCall; -import org.eigenbase.sql.SqlKind; -import org.eigenbase.sql.SqlJoin; -import org.eigenbase.sql.JoinType; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.type.SqlTypeName; -import org.eigenbase.sql.util.SqlShuttle; -import org.eigenbase.sql.SqlDataTypeSpec; -import org.eigenbase.sql.SqlSetOperator; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlJoin; +import org.apache.calcite.sql.JoinType; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.sql.util.SqlShuttle; +import org.apache.calcite.sql.SqlDataTypeSpec; +import org.apache.calcite.sql.SqlSetOperator; import java.util.List; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java index be333c0..6048d84 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java @@ -21,15 +21,15 @@ import java.io.Reader; import org.apache.drill.exec.planner.physical.PlannerSettings; import org.apache.drill.exec.planner.sql.parser.CompoundIdentifierConverter; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.parser.SqlAbstractParserImpl; -import org.eigenbase.sql.parser.SqlParserImplFactory; -import org.eigenbase.sql.util.SqlVisitor; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.parser.SqlAbstractParserImpl; +import org.apache.calcite.sql.parser.SqlParserImplFactory; +import org.apache.calcite.sql.util.SqlVisitor; public class DrillParserWithCompoundIdConverter extends DrillParserImpl { /** - * {@link org.eigenbase.sql.parser.SqlParserImplFactory} implementation for creating parser. + * {@link org.apache.calcite.sql.parser.SqlParserImplFactory} implementation for creating parser. */ public static final SqlParserImplFactory FACTORY = new SqlParserImplFactory() { http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/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 5f9061a..4c027e1 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 @@ -20,8 +20,7 @@ package org.apache.drill.exec.planner.torel; import java.util.List; import java.util.Map; -import net.hydromatic.optiq.SchemaPlus; -import net.hydromatic.optiq.prepare.Prepare; +import org.apache.calcite.prepare.Prepare; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.logical.LogicalPlan; @@ -43,16 +42,16 @@ import org.apache.drill.exec.planner.logical.DrillSortRel; import org.apache.drill.exec.planner.logical.DrillUnionRel; import org.apache.drill.exec.planner.logical.ScanFieldDeterminer; import org.apache.drill.exec.planner.logical.ScanFieldDeterminer.FieldList; -import org.eigenbase.rel.InvalidRelException; -import org.eigenbase.rel.RelNode; -import org.eigenbase.relopt.RelOptCluster; -import org.eigenbase.relopt.RelOptTable; -import org.eigenbase.relopt.RelOptTable.ToRelContext; -import org.eigenbase.relopt.RelTraitSet; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.reltype.RelDataTypeFactory; -import org.eigenbase.rex.RexBuilder; -import org.eigenbase.rex.RexNode; +import org.apache.calcite.rel.InvalidRelException; +import org.apache.calcite.rel.RelNode; +import org.apache.calcite.plan.RelOptCluster; +import org.apache.calcite.plan.RelOptTable; +import org.apache.calcite.plan.RelOptTable.ToRelContext; +import org.apache.calcite.plan.RelTraitSet; +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; 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/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java index d88f883..e23b353 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java @@ -20,13 +20,13 @@ package org.apache.drill.exec.planner.types; import java.util.Collections; import java.util.List; -import org.eigenbase.reltype.RelDataTypeFactory; -import org.eigenbase.reltype.RelDataTypeField; -import org.eigenbase.reltype.RelDataTypeFieldImpl; -import org.eigenbase.reltype.RelDataTypeImpl; -import org.eigenbase.reltype.RelDataTypePrecedenceList; -import org.eigenbase.sql.type.SqlTypeExplicitPrecedenceList; -import org.eigenbase.sql.type.SqlTypeName; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.calcite.rel.type.RelDataTypeFieldImpl; +import org.apache.calcite.rel.type.RelDataTypeImpl; +import org.apache.calcite.rel.type.RelDataTypePrecedenceList; +import org.apache.calcite.sql.type.SqlTypeExplicitPrecedenceList; +import org.apache.calcite.sql.type.SqlTypeName; import com.google.common.collect.Lists; @@ -54,17 +54,7 @@ public class DrillFixedRelDataTypeImpl extends RelDataTypeImpl { } @Override - public List getFieldList() { - return fields; - } - - @Override - public int getFieldCount() { - return fields.size(); - } - - @Override - public RelDataTypeField getField(String fieldName, boolean caseSensitive) { + public RelDataTypeField getField(String fieldName, boolean caseSensitive, boolean elideRecord) { // return the field with given name if available. for (RelDataTypeField f : fields) { if (fieldName.equalsIgnoreCase(f.getName())) { @@ -75,6 +65,16 @@ public class DrillFixedRelDataTypeImpl extends RelDataTypeImpl { } @Override + public List getFieldList() { + return fields; + } + + @Override + public int getFieldCount() { + return fields.size(); + } + + @Override public List getFieldNames() { List fieldNames = Lists.newArrayList(); for (RelDataTypeField f : fields) { http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java new file mode 100644 index 0000000..d4c868b --- /dev/null +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java @@ -0,0 +1,39 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.drill.exec.planner.types; + +import org.apache.calcite.rel.type.RelDataTypeSystem; +import org.apache.calcite.rel.type.RelDataTypeSystemImpl; +import org.apache.calcite.sql.type.SqlTypeName; + +public class DrillRelDataTypeSystem extends RelDataTypeSystemImpl { + + public static final RelDataTypeSystem DRILL_REL_DATATYPE_SYSTEM = new DrillRelDataTypeSystem(); + + @Override + public int getMaxNumericScale() { + return 38; + } + + @Override + public int getMaxNumericPrecision() { + return 38; + } + +} http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeDrillImpl.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeDrillImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeDrillImpl.java index 559cf68..25ce593 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeDrillImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeDrillImpl.java @@ -20,13 +20,13 @@ package org.apache.drill.exec.planner.types; import java.util.Collections; import java.util.List; -import org.eigenbase.reltype.RelDataTypeFactory; -import org.eigenbase.reltype.RelDataTypeFamily; -import org.eigenbase.reltype.RelDataTypeField; -import org.eigenbase.reltype.RelDataTypeImpl; -import org.eigenbase.reltype.RelDataTypePrecedenceList; -import org.eigenbase.sql.type.SqlTypeExplicitPrecedenceList; -import org.eigenbase.sql.type.SqlTypeName; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.rel.type.RelDataTypeFamily; +import org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.calcite.rel.type.RelDataTypeImpl; +import org.apache.calcite.rel.type.RelDataTypePrecedenceList; +import org.apache.calcite.sql.type.SqlTypeExplicitPrecedenceList; +import org.apache.calcite.sql.type.SqlTypeName; /* We use an instance of this class as the row type for * Drill table. Since we don't know the schema before hand @@ -57,7 +57,7 @@ public class RelDataTypeDrillImpl extends RelDataTypeImpl { } @Override - public RelDataTypeField getField(String fieldName, boolean caseSensitive) { + public RelDataTypeField getField(String fieldName, boolean caseSensitive, boolean elideRecord) { return holder.getField(typeFactory, fieldName); } http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeHolder.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeHolder.java index 1485aa3..483b277 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/RelDataTypeHolder.java @@ -19,10 +19,10 @@ package org.apache.drill.exec.planner.types; import java.util.List; -import org.eigenbase.reltype.RelDataTypeFactory; -import org.eigenbase.reltype.RelDataTypeField; -import org.eigenbase.reltype.RelDataTypeFieldImpl; -import org.eigenbase.sql.type.SqlTypeName; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.calcite.rel.type.RelDataTypeFieldImpl; +import org.apache.calcite.sql.type.SqlTypeName; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java index e631792..527bac0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java @@ -20,7 +20,7 @@ package org.apache.drill.exec.rpc.user; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import net.hydromatic.optiq.SchemaPlus; +import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.exec.proto.UserBitShared.UserCredentials; import org.apache.drill.exec.proto.UserProtos.Property; @@ -145,7 +145,7 @@ public class UserSession { /** * Get default schema from current default schema path and given schema tree. * @param rootSchema - * @return A {@link net.hydromatic.optiq.SchemaPlus} object. + * @return A {@link org.apache.calcite.schema.SchemaPlus} object. */ public SchemaPlus getDefaultSchema(SchemaPlus rootSchema) { return findSchema(rootSchema, getProp(SCHEMA)); http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java index 682bfea..0af816d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java @@ -20,7 +20,7 @@ package org.apache.drill.exec.server.options; import java.util.Iterator; import org.apache.drill.exec.server.options.OptionValue.OptionType; -import org.eigenbase.sql.SqlLiteral; +import org.apache.calcite.sql.SqlLiteral; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java index 0fed1fb..1bdc108 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java @@ -17,12 +17,7 @@ */ package org.apache.drill.exec.server.options; -import org.apache.drill.exec.server.options.OptionValue.OptionType; -import org.apache.drill.exec.server.options.TypeValidators.BooleanValidator; -import org.apache.drill.exec.server.options.TypeValidators.DoubleValidator; -import org.apache.drill.exec.server.options.TypeValidators.LongValidator; -import org.apache.drill.exec.server.options.TypeValidators.StringValidator; -import org.eigenbase.sql.SqlLiteral; +import org.apache.calcite.sql.SqlLiteral; public interface OptionManager extends Iterable { public OptionValue getOption(String name); @@ -32,15 +27,15 @@ public interface OptionManager extends Iterable { public OptionManager getSystemManager(); public OptionList getOptionList(); - public boolean getOption(BooleanValidator validator); - public double getOption(DoubleValidator validator); - public long getOption(LongValidator validator); - public String getOption(StringValidator validator); + public boolean getOption(TypeValidators.BooleanValidator validator); + public double getOption(TypeValidators.DoubleValidator validator); + public long getOption(TypeValidators.LongValidator validator); + public String getOption(TypeValidators.StringValidator validator); public interface OptionAdmin { public void registerOptionType(OptionValidator validator); public OptionValidator getValidator(String name); public void validate(OptionValue v) throws SetOptionException; - public OptionValue validate(String name, SqlLiteral value, OptionType optionType) throws SetOptionException; + public OptionValue validate(String name, SqlLiteral value, OptionValue.OptionType optionType) throws SetOptionException; } } http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValidator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValidator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValidator.java index 90ce3a1..31a25fc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValidator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValidator.java @@ -18,8 +18,7 @@ package org.apache.drill.exec.server.options; import org.apache.drill.common.exceptions.ExpressionParsingException; -import org.apache.drill.exec.server.options.OptionValue.OptionType; -import org.eigenbase.sql.SqlLiteral; +import org.apache.calcite.sql.SqlLiteral; /** * Validates the values provided to Drill options. @@ -47,7 +46,7 @@ public abstract class OptionValidator { * while allowing some flexibility for users * @throws ExpressionParsingException - message to describe error with value, including range or list of expected values */ - public abstract OptionValue validate(SqlLiteral value, OptionType optionType) throws ExpressionParsingException; + public abstract OptionValue validate(SqlLiteral value, OptionValue.OptionType optionType) throws ExpressionParsingException; public String getOptionName() { return optionName; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java index 3dc7c14..a394efe 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java @@ -37,7 +37,7 @@ import org.apache.drill.exec.server.options.TypeValidators.StringValidator; import org.apache.drill.exec.store.sys.PStore; import org.apache.drill.exec.store.sys.PStoreConfig; import org.apache.drill.exec.store.sys.PStoreProvider; -import org.eigenbase.sql.SqlLiteral; +import org.apache.calcite.sql.SqlLiteral; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java index e7b1eb3..b8597b7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java @@ -26,9 +26,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.drill.common.exceptions.ExpressionParsingException; import org.apache.drill.exec.server.options.OptionValue.Kind; import org.apache.drill.exec.server.options.OptionValue.OptionType; -import org.eigenbase.sql.SqlLiteral; -import org.eigenbase.sql.type.SqlTypeName; -import org.eigenbase.util.NlsString; + +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.util.NlsString; public class TypeValidators { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TypeValidators.class); http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java index 9477a59..2d6ac4f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java @@ -22,12 +22,12 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import net.hydromatic.linq4j.expressions.DefaultExpression; -import net.hydromatic.linq4j.expressions.Expression; -import net.hydromatic.optiq.Function; -import net.hydromatic.optiq.Schema; -import net.hydromatic.optiq.SchemaPlus; -import net.hydromatic.optiq.Table; +import org.apache.calcite.linq4j.tree.DefaultExpression; +import org.apache.calcite.linq4j.tree.Expression; +import org.apache.calcite.schema.Function; +import org.apache.calcite.schema.Schema; +import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.schema.Table; import org.apache.drill.exec.planner.logical.CreateTableEntry; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java index 024ca09..b092ff3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java @@ -17,7 +17,7 @@ ******************************************************************************/ package org.apache.drill.exec.store; -import net.hydromatic.optiq.SchemaPlus; +import org.apache.calcite.schema.SchemaPlus; import java.util.List; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java index 889db12..a562b77 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.store; import com.google.common.collect.Lists; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.reltype.RelDataTypeFactory; -import org.eigenbase.sql.type.SqlTypeName; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.sql.type.SqlTypeName; import java.util.List; @@ -30,7 +30,7 @@ import java.util.List; public abstract class RecordDataType { /** - * @return the {@link org.eigenbase.sql.type.SqlTypeName} of columns in the table + * @return the {@link org.apache.calcite.sql.type.SqlTypeName} of columns in the table */ public abstract List getFieldSqlTypeNames(); @@ -40,10 +40,10 @@ public abstract class RecordDataType { public abstract List getFieldNames(); /** - * This method constructs a {@link org.eigenbase.reltype.RelDataType} based on the + * This method constructs a {@link org.apache.calcite.rel.type.RelDataType} based on the * {@link org.apache.drill.exec.store.RecordDataType}'s field sql types and field names. * - * @param factory helps construct a {@link org.eigenbase.reltype.RelDataType} + * @param factory helps construct a {@link org.apache.calcite.rel.type.RelDataType} * @return the constructed type */ public final RelDataType getRowType(RelDataTypeFactory factory) { http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaFactory.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaFactory.java index e2dc613..b28c3c2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaFactory.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store; -import net.hydromatic.optiq.SchemaPlus; +import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.exec.ops.QueryContext; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginOptimizerRule.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginOptimizerRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginOptimizerRule.java index 32ec6ff..8b4f0e6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginOptimizerRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginOptimizerRule.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.store; -import org.eigenbase.relopt.RelOptRule; -import org.eigenbase.relopt.RelOptRuleOperand; +import org.apache.calcite.plan.RelOptRule; +import org.apache.calcite.plan.RelOptRuleOperand; public abstract class StoragePluginOptimizerRule extends RelOptRule { http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java index bda4cc8..80a0876 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java @@ -31,8 +31,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; -import net.hydromatic.optiq.SchemaPlus; -import net.hydromatic.optiq.tools.RuleSet; +import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.tools.RuleSet; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.DrillRuntimeException; @@ -56,7 +56,7 @@ import org.apache.drill.exec.store.sys.PStore; import org.apache.drill.exec.store.sys.PStoreConfig; import org.apache.drill.exec.store.sys.SystemTablePlugin; import org.apache.drill.exec.store.sys.SystemTablePluginConfig; -import org.eigenbase.relopt.RelOptRule; +import org.apache.calcite.plan.RelOptRule; import com.google.common.base.Charsets; import com.google.common.base.Stopwatch; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java index c792550..4e50bc1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java @@ -21,8 +21,9 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import net.hydromatic.optiq.Function; -import net.hydromatic.optiq.Table; +import org.apache.calcite.schema.Function; +import org.apache.calcite.schema.Schema; +import org.apache.calcite.schema.Table; import org.apache.drill.exec.planner.logical.CreateTableEntry; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java index 93fb0a0..4ae0cc8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.hydromatic.optiq.SchemaPlus; +import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.common.JSONOptions; import org.apache.drill.common.exceptions.ExecutionSetupException; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java index 30d8d25..fa9aa89 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java @@ -23,9 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.hydromatic.optiq.Function; -import net.hydromatic.optiq.SchemaPlus; -import net.hydromatic.optiq.Table; +import org.apache.calcite.schema.Function; +import org.apache.calcite.schema.Schema; +import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.schema.Table; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.planner.logical.CreateTableEntry; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java index 7cd50b0..916564d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java @@ -27,7 +27,7 @@ import java.util.regex.Pattern; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -import net.hydromatic.optiq.Table; +import org.apache.calcite.schema.Table; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.ExecutionSetupException; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java index ab94727..4232940 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java @@ -19,8 +19,8 @@ package org.apache.drill.exec.store.ischema; import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.exec.planner.logical.DrillTable; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.reltype.RelDataTypeFactory; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; public class InfoSchemaDrillTable extends DrillTable{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(InfoSchemaDrillTable.class); http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java index 61cc47b..0cf12b4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java @@ -27,10 +27,10 @@ import org.apache.drill.exec.planner.physical.FilterPrel; import org.apache.drill.exec.planner.physical.ProjectPrel; import org.apache.drill.exec.planner.physical.ScanPrel; import org.apache.drill.exec.store.StoragePluginOptimizerRule; -import org.eigenbase.rel.RelNode; -import org.eigenbase.relopt.RelOptRuleCall; -import org.eigenbase.relopt.RelOptRuleOperand; -import org.eigenbase.rex.RexNode; +import org.apache.calcite.rel.RelNode; +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.plan.RelOptRuleOperand; +import org.apache.calcite.rex.RexNode; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java index 4dfde7d..0a9c32c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Set; import com.google.common.collect.ImmutableSet; -import net.hydromatic.optiq.SchemaPlus; -import net.hydromatic.optiq.Table; +import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.schema.Table; import org.apache.drill.common.JSONOptions; import org.apache.drill.common.expression.SchemaPath; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java index 66ba2e3..0e9ca53 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java @@ -22,9 +22,9 @@ import java.util.List; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.common.types.Types; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.reltype.RelDataTypeFactory; -import org.eigenbase.sql.type.SqlTypeName; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.sql.type.SqlTypeName; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordGenerator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordGenerator.java index 5b132c6..772b9e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordGenerator.java @@ -21,18 +21,18 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableMap; -import net.hydromatic.optiq.Schema.TableType; -import net.hydromatic.optiq.SchemaPlus; -import net.hydromatic.optiq.Table; -import net.hydromatic.optiq.jdbc.JavaTypeFactoryImpl; +import org.apache.calcite.schema.Schema.TableType; +import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.schema.Table; +import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.drill.exec.planner.logical.DrillViewInfoProvider; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.RecordReader; import org.apache.drill.exec.store.ischema.InfoSchemaFilter.Result; import org.apache.drill.exec.store.pojo.PojoRecordReader; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.reltype.RelDataTypeField; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeField; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java index ec8ee2b..f14fa7e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.store.ischema; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.reltype.RelDataTypeField; -import org.eigenbase.sql.type.SqlTypeName; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.calcite.sql.type.SqlTypeName; public class Records { http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/SelectedTable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/SelectedTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/SelectedTable.java index 2c0a503..088736b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/SelectedTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/SelectedTable.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.ischema; -import net.hydromatic.optiq.SchemaPlus; +import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.exec.store.RecordReader; import org.apache.drill.exec.store.ischema.InfoSchemaTable.Catalogs; @@ -25,8 +25,8 @@ import org.apache.drill.exec.store.ischema.InfoSchemaTable.Columns; import org.apache.drill.exec.store.ischema.InfoSchemaTable.Schemata; import org.apache.drill.exec.store.ischema.InfoSchemaTable.Tables; import org.apache.drill.exec.store.ischema.InfoSchemaTable.Views; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.reltype.RelDataTypeFactory; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; public enum SelectedTable{ CATALOGS(new Catalogs()), http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java index 1689300..d68fd52 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import net.hydromatic.optiq.SchemaPlus; +import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.common.JSONOptions; import org.apache.drill.common.expression.SchemaPath; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java index 2acb727..9b04fd8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java @@ -22,10 +22,12 @@ import java.lang.reflect.Modifier; import java.sql.Timestamp; import java.util.List; -import org.apache.drill.exec.store.RecordDataType; -import org.eigenbase.sql.type.SqlTypeName; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.sql.type.SqlTypeName; import com.google.common.collect.Lists; +import org.apache.drill.exec.store.RecordDataType; /** * This class uses reflection of a Java class to construct a {@link org.apache.drill.exec.store.RecordDataType}. http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java index d9374cb..8b7225e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java @@ -20,8 +20,9 @@ package org.apache.drill.exec.store.sys; import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.store.RecordDataType; import org.apache.drill.exec.store.StoragePlugin; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.reltype.RelDataTypeFactory; +import org.apache.drill.exec.store.pojo.PojoDataType; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; /** * A {@link org.apache.drill.exec.planner.logical.DrillTable} with a defined schema http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java index e2ac9ed..9a5aa65 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java @@ -22,6 +22,10 @@ import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.server.options.DrillConfigIterator; import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.exec.server.options.OptionValue; +import org.apache.drill.exec.store.RecordDataType; +import org.apache.drill.exec.store.pojo.PojoDataType; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; import java.util.Iterator; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java index a13c945..bac02ca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import net.hydromatic.optiq.SchemaPlus; +import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.common.JSONOptions; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.logical.StoragePluginConfig; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java index 305e6d3..ca16283 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.work.foreman; -import org.eigenbase.sql.SqlDataTypeSpec; +import org.apache.calcite.sql.SqlDataTypeSpec; public class UnsupportedDataTypeException extends SqlUnsupportedException { public UnsupportedDataTypeException(String drillJiraNumber, String message) { http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java index 4744978..f909681 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java @@ -31,8 +31,8 @@ import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.rpc.user.QueryDataBatch; import org.apache.drill.exec.vector.NullableVarCharVector; import org.apache.drill.exec.vector.ValueVector; -import org.eigenbase.sql.SqlExplain.Depth; -import org.eigenbase.sql.SqlExplainLevel; +import org.apache.calcite.sql.SqlExplain.Depth; +import org.apache.calcite.sql.SqlExplainLevel; import com.google.common.base.Strings; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/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 e7f6896..e0ca68e 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 @@ -22,8 +22,8 @@ import java.net.URL; import mockit.Mocked; import mockit.NonStrictExpectations; -import net.hydromatic.optiq.SchemaPlus; -import net.hydromatic.optiq.jdbc.SimpleOptiqSchema; +import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.jdbc.SimpleCalciteSchema; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.TestTools; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java index 7c85c19..41414c9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java @@ -21,15 +21,15 @@ import static org.junit.Assert.*; import java.util.BitSet; -import net.hydromatic.optiq.impl.java.JavaTypeFactory; -import net.hydromatic.optiq.jdbc.JavaTypeFactoryImpl; +import org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.drill.exec.planner.logical.partition.FindPartitionConditions; -import org.eigenbase.reltype.RelDataType; -import org.eigenbase.rex.RexBuilder; -import org.eigenbase.rex.RexNode; -import org.eigenbase.sql.fun.SqlStdOperatorTable; -import org.eigenbase.sql.type.SqlTypeName; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rex.RexBuilder; +import org.apache.calcite.rex.RexNode; +import org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.calcite.sql.type.SqlTypeName; import org.junit.Test; public class FilterSplitTest { http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java index a5bcdec..4a3323d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java @@ -17,19 +17,19 @@ */ package org.apache.drill.exec.sql; -import net.hydromatic.optiq.config.Lex; -import net.hydromatic.optiq.jdbc.SimpleOptiqSchema; -import net.hydromatic.optiq.tools.FrameworkConfig; -import net.hydromatic.optiq.tools.Frameworks; -import net.hydromatic.optiq.tools.Planner; +import org.apache.calcite.config.Lex; +import org.apache.calcite.jdbc.SimpleCalciteSchema; +import org.apache.calcite.tools.FrameworkConfig; +import org.apache.calcite.tools.Frameworks; +import org.apache.calcite.tools.Planner; import org.apache.drill.exec.planner.physical.PlannerSettings; import org.apache.drill.exec.planner.sql.DrillConvertletTable; import org.apache.drill.exec.planner.sql.parser.CompoundIdentifierConverter; import org.apache.drill.exec.planner.sql.parser.impl.DrillParserImpl; import org.apache.drill.test.DrillAssert; -import org.eigenbase.sql.SqlNode; -import org.eigenbase.sql.parser.SqlParser; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.parser.SqlParser; import org.junit.Test; public class TestSqlBracketlessSyntax { @@ -38,9 +38,12 @@ public class TestSqlBracketlessSyntax { @Test public void checkComplexExpressionParsing() throws Exception{ FrameworkConfig config = Frameworks.newConfigBuilder() // - .parserConfig(new SqlParser.ParserConfigImpl(Lex.MYSQL, PlannerSettings.DEFAULT_IDENTIFIER_MAX_LENGTH)) - .parserFactory(DrillParserImpl.FACTORY) // - .defaultSchema(SimpleOptiqSchema.createRootSchema(false)) // + .parserConfig(SqlParser.configBuilder() + .setLex(Lex.MYSQL) + .setIdentifierMaxLength(PlannerSettings.DEFAULT_IDENTIFIER_MAX_LENGTH) + .setParserFactory(DrillParserImpl.FACTORY) + .build()) // + .defaultSchema(SimpleCalciteSchema.createRootSchema(false)) // .convertletTable(new DrillConvertletTable()) // .build(); Planner planner = Frameworks.getPlanner(config); http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java index 4979dff..2792f91 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import net.hydromatic.linq4j.Ord; +import org.apache.calcite.linq4j.Ord; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.logical.LogicalPlan; http://git-wip-us.apache.org/repos/asf/drill/blob/581f2e84/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java index 0e9f8a0..f257c98 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java @@ -37,7 +37,7 @@ import org.apache.drill.common.logical.data.Store; import org.apache.drill.common.logical.data.Union; import org.apache.drill.jdbc.JdbcTest; import org.apache.drill.jdbc.test.JdbcAssert.TestDataConnection; -import org.eigenbase.rel.JoinRelType; +import org.apache.calcite.rel.core.JoinRelType; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Ignore;