You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2014/11/14 22:32:33 UTC
[25/58] [abbrv] [partial] incubator-calcite git commit: [CALCITE-306]
Standardize code style for "import package.*; "
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetQueryConstructor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetQueryConstructor.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetQueryConstructor.java
index f06d744..9e50507 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetQueryConstructor.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetQueryConstructor.java
@@ -14,16 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import java.util.List;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlOperatorBinding;
+import org.apache.calcite.sql.SqlSelect;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlTypeUtil;
+import org.apache.calcite.sql.validate.SqlValidator;
+import org.apache.calcite.sql.validate.SqlValidatorNamespace;
+import org.apache.calcite.sql.validate.SqlValidatorScope;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
-import org.eigenbase.sql.validate.*;
+import java.util.List;
-import static org.eigenbase.util.Static.RESOURCE;
+import static org.apache.calcite.util.Static.RESOURCE;
/**
* Definition of the SQL:2003 standard MULTISET query constructor, <code>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetSetOperator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetSetOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetSetOperator.java
index c8cbb1d..c997d3f 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetSetOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetSetOperator.java
@@ -14,17 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
+import org.apache.calcite.sql.SqlBinaryOperator;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.type.InferTypes;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
/**
* An operator which performs set operations on multisets, such as "MULTISET
* UNION ALL".
*
- * <p>Not to be confused with {@link SqlMultisetValueConstructor} or {@link
- * SqlMultisetQueryConstructor}.
+ * <p>Not to be confused with {@link SqlMultisetValueConstructor} or
+ * {@link SqlMultisetQueryConstructor}.
*
* <p>todo: Represent the ALL keyword to MULTISET UNION ALL etc. as a hidden
* operand. Then we can obsolete this class.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetValueConstructor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetValueConstructor.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetValueConstructor.java
index 4339690..c407f58 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetValueConstructor.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlMultisetValueConstructor.java
@@ -14,15 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import java.util.List;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperatorBinding;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlTypeUtil;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
+import java.util.List;
-import static org.eigenbase.util.Static.RESOURCE;
+import static org.apache.calcite.util.Static.RESOURCE;
/**
* Definition of the SQL:2003 standard MULTISET constructor, <code>MULTISET
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlNewOperator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlNewOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlNewOperator.java
index 61618c8..ca24298 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlNewOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlNewOperator.java
@@ -14,10 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.validate.*;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlPrefixOperator;
+import org.apache.calcite.sql.validate.SqlValidator;
/**
* SqlNewOperator represents an SQL <code>new specification</code> such as
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlNtileAggFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlNtileAggFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlNtileAggFunction.java
index 9364e10..5aaa2c3 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlNtileAggFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlNtileAggFunction.java
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import java.util.List;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.sql.SqlAggFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
-import org.eigenbase.reltype.RelDataType;
-import org.eigenbase.reltype.RelDataTypeFactory;
-import org.eigenbase.sql.SqlAggFunction;
-import org.eigenbase.sql.SqlFunctionCategory;
-import org.eigenbase.sql.SqlKind;
-import org.eigenbase.sql.type.OperandTypes;
-import org.eigenbase.sql.type.ReturnTypes;
+import java.util.List;
/**
* <code>NTILE</code> aggregate function
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlNullifFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlNullifFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlNullifFunction.java
index 22bb3f1..c5529f0 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlNullifFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlNullifFunction.java
@@ -14,14 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import java.util.List;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+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.parser.SqlParserPos;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.validate.SqlValidator;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.parser.*;
-import org.eigenbase.sql.type.*;
-import org.eigenbase.sql.validate.*;
+import java.util.List;
/**
* The <code>NULLIF</code> function.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java
index 888a6b5..e3643c1 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java
@@ -14,12 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
-import org.eigenbase.sql.validate.*;
+package org.apache.calcite.sql.fun;
+
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlUtil;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.InferTypes;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlOperandCountRanges;
+import org.apache.calcite.sql.type.SqlTypeUtil;
+import org.apache.calcite.sql.validate.SqlValidator;
+import org.apache.calcite.sql.validate.SqlValidatorScope;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlayFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlayFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlayFunction.java
index 462fbbd..1739332 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlayFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlayFunction.java
@@ -14,10 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlOperandTypeChecker;
/**
* The <code>OVERLAY</code> function.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlPositionFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlPositionFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlPositionFunction.java
index 6046997..f85e746 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlPositionFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlPositionFunction.java
@@ -14,10 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
/**
* The <code>POSITION</code> function.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlRowOperator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlRowOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlRowOperator.java
index b97f466..63ab3e9 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlRowOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlRowOperator.java
@@ -14,16 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
+
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlOperatorBinding;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlSyntax;
+import org.apache.calcite.sql.SqlUtil;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.InferTypes;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.util.Pair;
import java.util.AbstractList;
import java.util.Map;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
-import org.eigenbase.util.Pair;
-
/**
* SqlRowOperator represents the special ROW constructor.
*
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlSingleValueAggFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlSingleValueAggFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlSingleValueAggFunction.java
index b847b63..f13f3d8 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlSingleValueAggFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlSingleValueAggFunction.java
@@ -14,16 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import java.util.List;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.sql.SqlAggFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
import com.google.common.collect.ImmutableList;
+import java.util.List;
+
/**
* <code>SINGLE_VALUE</code> aggregate function returns the input value if there
* is only one value in the input; Otherwise it triggers a run-time error.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java
index 5a75975..465fcc9 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java
@@ -14,18 +14,46 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
-import org.eigenbase.sql.util.*;
+package org.apache.calcite.sql.fun;
+
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlAggFunction;
+import org.apache.calcite.sql.SqlAsOperator;
+import org.apache.calcite.sql.SqlBinaryOperator;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlFunctionalOperator;
+import org.apache.calcite.sql.SqlInternalOperator;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlOverOperator;
+import org.apache.calcite.sql.SqlPostfixOperator;
+import org.apache.calcite.sql.SqlPrefixOperator;
+import org.apache.calcite.sql.SqlProcedureCallOperator;
+import org.apache.calcite.sql.SqlRankFunction;
+import org.apache.calcite.sql.SqlSampleSpec;
+import org.apache.calcite.sql.SqlSetOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlUnnestOperator;
+import org.apache.calcite.sql.SqlUtil;
+import org.apache.calcite.sql.SqlValuesOperator;
+import org.apache.calcite.sql.SqlWindow;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.InferTypes;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlOperandCountRanges;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.sql.util.ReflectiveSqlOperatorTable;
import com.google.common.collect.ImmutableList;
/**
- * Implementation of {@link org.eigenbase.sql.SqlOperatorTable} containing the
- * standard operators and functions.
+ * Implementation of {@link org.apache.calcite.sql.SqlOperatorTable} containing
+ * the standard operators and functions.
*/
public class SqlStdOperatorTable extends ReflectiveSqlOperatorTable {
//~ Static fields/initializers ---------------------------------------------
@@ -964,9 +992,9 @@ public class SqlStdOperatorTable extends ReflectiveSqlOperatorTable {
* <p>Operands are as follows:
*
* <ol>
- * <li>name of window function ({@link org.eigenbase.sql.SqlCall})</li>
- * <li>window name ({@link org.eigenbase.sql.SqlLiteral}) or window in-line
- * specification (@link SqlWindowOperator})</li>
+ * <li>name of window function ({@link org.apache.calcite.sql.SqlCall})</li>
+ * <li>window name ({@link org.apache.calcite.sql.SqlLiteral}) or window
+ * in-line specification (@link SqlWindowOperator})</li>
* </ol>
*/
public static final SqlBinaryOperator OVER = new SqlOverOperator();
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlStringContextVariable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlStringContextVariable.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlStringContextVariable.java
index c1f641e..db7057e 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlStringContextVariable.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlStringContextVariable.java
@@ -14,11 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
-import org.eigenbase.sql.validate.*;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlSyntax;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.validate.SqlMonotonicity;
+import org.apache.calcite.sql.validate.SqlValidatorScope;
/**
* Base class for functions such as "USER", "CURRENT_ROLE", and "CURRENT_PATH".
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlSubstringFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlSubstringFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlSubstringFunction.java
index bf84442..5cac08f 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlSubstringFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlSubstringFunction.java
@@ -14,20 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
-
-import java.math.*;
-import java.util.List;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
-import org.eigenbase.sql.validate.*;
-
-import net.hydromatic.linq4j.Ord;
+package org.apache.calcite.sql.fun;
+
+import org.apache.calcite.linq4j.Ord;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlUtil;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlOperandCountRanges;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.sql.type.SqlTypeUtil;
+import org.apache.calcite.sql.validate.SqlMonotonicity;
+import org.apache.calcite.sql.validate.SqlValidator;
+import org.apache.calcite.sql.validate.SqlValidatorScope;
import com.google.common.collect.ImmutableList;
+import java.math.BigDecimal;
+import java.util.List;
+
/**
* Definition of the "SUBSTRING" builtin SQL function.
*/
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlSumAggFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlSumAggFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlSumAggFunction.java
index f70776b..9b2835d 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlSumAggFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlSumAggFunction.java
@@ -14,16 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import java.util.List;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.sql.SqlAggFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
import com.google.common.collect.ImmutableList;
+import java.util.List;
+
/**
* <code>Sum</code> is an aggregator which returns the sum of the values which
* go into it. It has precisely one argument of numeric type (<code>int</code>,
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlSumEmptyIsZeroAggFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlSumEmptyIsZeroAggFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlSumEmptyIsZeroAggFunction.java
index 1cff679..b1d50b8 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlSumEmptyIsZeroAggFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlSumEmptyIsZeroAggFunction.java
@@ -14,16 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import java.util.List;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.sql.SqlAggFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlTypeName;
import com.google.common.collect.ImmutableList;
+import java.util.List;
+
/**
* <code>Sum0</code> is an aggregator which returns the sum of the values which
* go into it like <code>Sum</code>. It differs in that when no non null values
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlThrowOperator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlThrowOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlThrowOperator.java
index 51c9793..f223141 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlThrowOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlThrowOperator.java
@@ -14,10 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.type.*;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlInternalOperator;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
/**
* An internal operator that throws an exception.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/SqlTrimFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlTrimFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlTrimFunction.java
index 8ac8d93..f798e3e 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlTrimFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlTrimFunction.java
@@ -14,17 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SameOperandTypeChecker;
+import org.apache.calcite.sql.type.SqlTypeFamily;
+import org.apache.calcite.sql.type.SqlTypeTransforms;
+import org.apache.calcite.sql.type.SqlTypeUtil;
+
+import com.google.common.collect.ImmutableList;
import java.util.Arrays;
import java.util.List;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.parser.*;
-import org.eigenbase.sql.type.*;
-
-import com.google.common.collect.ImmutableList;
-
/**
* Definition of the "TRIM" builtin SQL function.
*/
@@ -78,8 +90,8 @@ public class SqlTrimFunction extends SqlFunction {
SqlTypeFamily.ANY, SqlTypeFamily.STRING, SqlTypeFamily.STRING),
// Arguments 1 and 2 must have same type
new SameOperandTypeChecker(3) {
- @Override
- protected List<Integer> getOperandList(int operandCount) {
+ @Override protected List<Integer>
+ getOperandList(int operandCount) {
return ImmutableList.of(1, 2);
}
}),
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/package-info.java b/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
index 07b5db7..bd996ce 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
@@ -20,13 +20,13 @@
* operators.
*
* <p>The standard set of row-level functions and operators are declared in
- * class {@link org.eigenbase.sql.fun.SqlStdOperatorTable}. Anonymous inner
+ * class {@link org.apache.calcite.sql.fun.SqlStdOperatorTable}. Anonymous inner
* classes within that table are allowed only for specifying an operator's test
* function; if other custom code is needed for an operator, it should be
* implemented in a top-level class within this package instead. Operators
* which are not row-level (e.g. select and join) should be defined in package
- * {@link org.eigenbase.sql} instead.</p>
+ * {@link org.apache.calcite.sql} instead.</p>
*/
-package org.eigenbase.sql.fun;
+package org.apache.calcite.sql.fun;
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/package-info.java b/core/src/main/java/org/apache/calcite/sql/package-info.java
index 5b45af4..698fd89 100644
--- a/core/src/main/java/org/apache/calcite/sql/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/package-info.java
@@ -16,86 +16,82 @@
*/
/**
- * Provides an SQL parser and object model. This package, and the dependent
- * <code>org.eigenbase.sql.parser</code> package, are independent of the other
- * saffron packages, so may be used standalone.<p> </p>
+ * Provides a SQL parser and object model.
+ *
+ * <p>This package, and the dependent <code>org.apache.calcite.sql.parser</code>
+ * package, are independent of the other Calcite packages, so may be used
+ * standalone.
*
* <h2>Parser</h2>
*
- * <p>{@link org.eigenbase.sql.parser.SqlParser} parses a SQL string to a parse
- * tree. It
- * only performs the most basic syntactic validation.</p>
+ * <p>{@link org.apache.calcite.sql.parser.SqlParser} parses a SQL string to a
+ * parse tree. It only performs the most basic syntactic validation.</p>
*
* <h2>Object model</h2>
*
- * <p>Every node in the parse tree is a {@link org.eigenbase.sql.SqlNode}.
+ * <p>Every node in the parse tree is a {@link org.apache.calcite.sql.SqlNode}.
* Sub-types are:</p>
* <ul>
*
- * <li>{@link org.eigenbase.sql.SqlLiteral} represents a boolean, numeric,
- * string, or
- * date constant, or the value <code>NULL</code>.
- * </li>
+ * <li>{@link org.apache.calcite.sql.SqlLiteral} represents a boolean,
+ * numeric, string, or date constant, or the value <code>NULL</code>.
+ * </li>
*
- * <li>{@link org.eigenbase.sql.SqlIdentifier} represents an identifier, such
- * as <code>
- * EMPNO</code> or <code>emp.deptno</code>.
- * </li>
+ * <li>{@link org.apache.calcite.sql.SqlIdentifier} represents an
+ * identifier, such as <code> EMPNO</code> or <code>emp.deptno</code>.
+ * </li>
*
- * <li>{@link org.eigenbase.sql.SqlCall} is a call to an operator or
+ * <li>{@link org.apache.calcite.sql.SqlCall} is a call to an operator or
* function. By means of special operators, we can use this construct
* to represent virtually every non-leaf node in the tree. For example,
* a <code>select</code> statement is a call to the 'select'
* operator.</li>
*
- * <li>{@link org.eigenbase.sql.SqlNodeList} is a list of nodes.</li>
+ * <li>{@link org.apache.calcite.sql.SqlNodeList} is a list of nodes.</li>
*
* </ul>
*
- * <p>A {@link org.eigenbase.sql.SqlOperator} describes the behavior of a node
- * in the tree, such as how to un-parse a {@link org.eigenbase.sql.SqlCall}
- * into a SQL string. It is important to note that operators are metadata,
- * not data: there is only one <code>SqlOperator</code> instance
- * representing the '=' operator, even though there may be many calls to
- * it.</p>
+ * <p>A {@link org.apache.calcite.sql.SqlOperator} describes the behavior of a
+ * node in the tree, such as how to un-parse a
+ * {@link org.apache.calcite.sql.SqlCall} into a SQL string. It is
+ * important to note that operators are metadata, not data: there is only
+ * one <code>SqlOperator</code> instance representing the '=' operator, even
+ * though there may be many calls to it.</p>
*
* <p><code>SqlOperator</code> has several derived classes which make it easy to
- * define new operators: {@link org.eigenbase.sql.SqlFunction},
- * {@link org.eigenbase.sql.SqlBinaryOperator},
- * {@link org.eigenbase.sql.SqlPrefixOperator},
- * {@link org.eigenbase.sql.SqlPostfixOperator}.
+ * define new operators: {@link org.apache.calcite.sql.SqlFunction},
+ * {@link org.apache.calcite.sql.SqlBinaryOperator},
+ * {@link org.apache.calcite.sql.SqlPrefixOperator},
+ * {@link org.apache.calcite.sql.SqlPostfixOperator}.
*
* And there are singleton classes for special syntactic constructs
- * {@link org.eigenbase.sql.SqlSelectOperator}
-
- * and {@link org.eigenbase.sql.SqlJoin.SqlJoinOperator}. (These special operators
- * even have their own sub-types of {@link org.eigenbase.sql.SqlCall}:
- * {@link org.eigenbase.sql.SqlSelect}
- * and {@link org.eigenbase.sql.SqlJoin}.)</p>
+ * {@link org.apache.calcite.sql.SqlSelectOperator}
+ * and {@link org.apache.calcite.sql.SqlJoin.SqlJoinOperator}. (These
+ * special operators even have their own sub-types of
+ * {@link org.apache.calcite.sql.SqlCall}:
+ * {@link org.apache.calcite.sql.SqlSelect} and
+ * {@link org.apache.calcite.sql.SqlJoin}.)</p>
*
- * <p>A {@link org.eigenbase.sql.SqlOperatorTable} is a collection of operators. By
- * supplying your own operator table, you can customize the dialect of SQL
- * without
- * modifying the parser.</p>
+ * <p>A {@link org.apache.calcite.sql.SqlOperatorTable} is a collection of
+ * operators. By supplying your own operator table, you can customize the
+ * dialect of SQL without modifying the parser.</p>
*
* <h2>Validation</h2>
*
- * <p>{@link org.eigenbase.sql.validate.SqlValidator} checks that
- * a tree of {@link org.eigenbase.sql.SqlNode}s is
- * semantically valid. You supply a {@link org.eigenbase.sql.SqlOperatorTable}
- * to
- * describe the available functions and operators, and a
- * {@link org.eigenbase.sql.validate.SqlValidatorCatalogReader}
- * for access to the database's catalog.</p>
+ * <p>{@link org.apache.calcite.sql.validate.SqlValidator} checks that
+ * a tree of {@link org.apache.calcite.sql.SqlNode}s is
+ * semantically valid. You supply a
+ * {@link org.apache.calcite.sql.SqlOperatorTable} to describe the available
+ * functions and operators, and a
+ * {@link org.apache.calcite.sql.validate.SqlValidatorCatalogReader} for
+ * access to the database's catalog.</p>
*
* <h2>Generating SQL</h2>
*
- * <p>A {@link org.eigenbase.sql.SqlWriter} converts a tree of {@link
- * org.eigenbase.sql.SqlNode}s into a
- * SQL string. A {@link org.eigenbase.sql.SqlDialect} defines how this
- * happens.</p>
- *
+ * <p>A {@link org.apache.calcite.sql.SqlWriter} converts a tree of
+ * {@link org.apache.calcite.sql.SqlNode}s into a SQL string. A
+ * {@link org.apache.calcite.sql.SqlDialect} defines how this happens.</p>
*/
-package org.eigenbase.sql;
+package org.apache.calcite.sql;
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/parser/SqlAbstractParserImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/SqlAbstractParserImpl.java b/core/src/main/java/org/apache/calcite/sql/parser/SqlAbstractParserImpl.java
index b9998c2..13f761b 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/SqlAbstractParserImpl.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/SqlAbstractParserImpl.java
@@ -14,22 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.parser;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.fun.*;
-import org.eigenbase.util.*;
-
-import net.hydromatic.avatica.Casing;
+package org.apache.calcite.sql.parser;
+
+import org.apache.calcite.avatica.Casing;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSyntax;
+import org.apache.calcite.sql.SqlUnresolvedFunction;
+import org.apache.calcite.sql.fun.SqlStdOperatorTable;
+import org.apache.calcite.util.Util;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
/**
* Abstract base for parsers generated from CommonParser.jj.
*/
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/parser/SqlParseException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/SqlParseException.java b/core/src/main/java/org/apache/calcite/sql/parser/SqlParseException.java
index 3ae8072..62af5d9 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/SqlParseException.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/SqlParseException.java
@@ -14,18 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.parser;
+package org.apache.calcite.sql.parser;
-import java.util.*;
+import org.apache.calcite.util.CalciteParserException;
-import org.eigenbase.util14.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.TreeSet;
/**
- * SqlParseException defines a checked exception corresponding to {@link
- * SqlParser}.
+ * SqlParseException defines a checked exception corresponding to
+ * {@link SqlParser}.
*/
public class SqlParseException extends Exception
- implements EigenbaseParserException {
+ implements CalciteParserException {
//~ Instance fields --------------------------------------------------------
private final SqlParserPos pos;
@@ -160,8 +163,8 @@ public class SqlParseException extends Exception
* written during serialization.
*
* <p>SqlParseException is serializable but is not available on the client.
- * This implementation converts this SqlParseException into a vanilla {@link
- * RuntimeException} with the same message.
+ * This implementation converts this SqlParseException into a vanilla
+ * {@link RuntimeException} with the same message.
*/
private Object writeReplace() {
return new RuntimeException(
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java b/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java
index 29c49dc..2555b5d 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.parser;
+package org.apache.calcite.sql.parser;
-import java.io.*;
+import org.apache.calcite.avatica.Casing;
+import org.apache.calcite.avatica.Quoting;
+import org.apache.calcite.runtime.CalciteContextException;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.parser.impl.SqlParserImpl;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.parser.impl.*;
-import org.eigenbase.util.*;
-
-import net.hydromatic.avatica.Casing;
-import net.hydromatic.avatica.Quoting;
+import java.io.StringReader;
/**
* A <code>SqlParser</code> parses a SQL statement.
@@ -101,9 +100,9 @@ public class SqlParser {
try {
return parser.parseSqlExpressionEof();
} catch (Throwable ex) {
- if ((ex instanceof EigenbaseContextException)
+ if ((ex instanceof CalciteContextException)
&& (originalInput != null)) {
- ((EigenbaseContextException) ex).setOriginalStatement(
+ ((CalciteContextException) ex).setOriginalStatement(
originalInput);
}
throw parser.normalizeException(ex);
@@ -113,8 +112,8 @@ public class SqlParser {
/**
* Parses a <code>SELECT</code> statement.
*
- * @return A {@link org.eigenbase.sql.SqlSelect} for a regular <code>
- * SELECT</code> statement; a {@link org.eigenbase.sql.SqlBinaryOperator}
+ * @return A {@link org.apache.calcite.sql.SqlSelect} for a regular <code>
+ * SELECT</code> statement; a {@link org.apache.calcite.sql.SqlBinaryOperator}
* for a <code>UNION</code>, <code>INTERSECT</code>, or <code>EXCEPT</code>.
* @throws SqlParseException if there is a parse error
*/
@@ -122,9 +121,9 @@ public class SqlParser {
try {
return parser.parseSqlStmtEof();
} catch (Throwable ex) {
- if ((ex instanceof EigenbaseContextException)
+ if ((ex instanceof CalciteContextException)
&& (originalInput != null)) {
- ((EigenbaseContextException) ex).setOriginalStatement(
+ ((CalciteContextException) ex).setOriginalStatement(
originalInput);
}
throw parser.normalizeException(ex);
@@ -141,9 +140,9 @@ public class SqlParser {
try {
return parser.parseSqlStmtEof();
} catch (Throwable ex) {
- if ((ex instanceof EigenbaseContextException)
+ if ((ex instanceof CalciteContextException)
&& (originalInput != null)) {
- ((EigenbaseContextException) ex).setOriginalStatement(
+ ((CalciteContextException) ex).setOriginalStatement(
originalInput);
}
throw parser.normalizeException(ex);
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/parser/SqlParserImplFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/SqlParserImplFactory.java b/core/src/main/java/org/apache/calcite/sql/parser/SqlParserImplFactory.java
index 2a271a1..6830af3 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/SqlParserImplFactory.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/SqlParserImplFactory.java
@@ -14,16 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.parser;
+package org.apache.calcite.sql.parser;
import java.io.Reader;
/**
- * Factory for {@link org.eigenbase.sql.parser.SqlAbstractParserImpl} objects.
+ * Factory for
+ * {@link org.apache.calcite.sql.parser.SqlAbstractParserImpl} objects.
*
* <p>A parser factory allows you to include a custom parser in
- * {@link net.hydromatic.optiq.tools.Planner} created through
- * {@link net.hydromatic.optiq.tools.Frameworks}.</p>
+ * {@link org.apache.calcite.tools.Planner} created through
+ * {@link org.apache.calcite.tools.Frameworks}.</p>
*/
public interface SqlParserImplFactory {
@@ -34,3 +35,5 @@ public interface SqlParserImplFactory {
*/
SqlAbstractParserImpl getParser(Reader stream);
}
+
+// End SqlParserImplFactory.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/parser/SqlParserPos.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/SqlParserPos.java b/core/src/main/java/org/apache/calcite/sql/parser/SqlParserPos.java
index f4ddd3f..95d704c 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/SqlParserPos.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/SqlParserPos.java
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.parser;
+package org.apache.calcite.sql.parser;
-import java.io.*;
-import java.util.*;
+import org.apache.calcite.sql.SqlNode;
-import org.eigenbase.sql.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
-import static org.eigenbase.util.Static.RESOURCE;
+import static org.apache.calcite.util.Static.RESOURCE;
/**
* SqlParserPos represents the position of a parsed token within SQL statement
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/parser/SqlParserUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/SqlParserUtil.java b/core/src/main/java/org/apache/calcite/sql/parser/SqlParserUtil.java
index 1297f35..b184a86 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/SqlParserUtil.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/SqlParserUtil.java
@@ -14,22 +14,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.parser;
-
-import java.math.*;
-import java.nio.charset.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.*;
-
-import org.eigenbase.reltype.RelDataTypeSystem;
-import org.eigenbase.sql.*;
-import org.eigenbase.trace.*;
-import org.eigenbase.util.*;
-
-import net.hydromatic.avatica.Casing;
-
-import static org.eigenbase.util.Static.RESOURCE;
+package org.apache.calcite.sql.parser;
+
+import org.apache.calcite.avatica.Casing;
+import org.apache.calcite.rel.type.RelDataTypeSystem;
+import org.apache.calcite.runtime.CalciteContextException;
+import org.apache.calcite.sql.SqlBinaryOperator;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIntervalLiteral;
+import org.apache.calcite.sql.SqlIntervalQualifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlPostfixOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.util.SaffronProperties;
+import org.apache.calcite.util.Util;
+import org.apache.calcite.util.trace.CalciteTrace;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Locale;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static org.apache.calcite.util.Static.RESOURCE;
/**
* Utility methods relating to parsing SQL.
@@ -37,7 +51,7 @@ import static org.eigenbase.util.Static.RESOURCE;
public final class SqlParserUtil {
//~ Static fields/initializers ---------------------------------------------
- static final Logger LOGGER = EigenbaseTrace.getParserTracer();
+ static final Logger LOGGER = CalciteTrace.getParserTracer();
//~ Constructors -----------------------------------------------------------
@@ -138,7 +152,7 @@ public final class SqlParserUtil {
ret = intervalQualifier.evaluateIntervalLiteral(literal,
intervalQualifier.getParserPosition(), RelDataTypeSystem.DEFAULT);
assert ret != null;
- } catch (EigenbaseContextException e) {
+ } catch (CalciteContextException e) {
throw Util.newInternal(
e, "while parsing day-to-second interval " + literal);
}
@@ -180,7 +194,7 @@ public final class SqlParserUtil {
ret = intervalQualifier.evaluateIntervalLiteral(literal,
intervalQualifier.getParserPosition(), RelDataTypeSystem.DEFAULT);
assert ret != null;
- } catch (EigenbaseContextException e) {
+ } catch (CalciteContextException e) {
throw Util.newInternal(
e, "error parsing year-to-month interval " + literal);
}
@@ -762,6 +776,7 @@ public final class SqlParserUtil {
//~ Inner Classes ----------------------------------------------------------
+ /** The components of a collation definition, per the SQL standard. */
public static class ParsedCollation {
private final Charset charset;
private final Locale locale;
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java b/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java
index d5544b1..281cf49 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/impl/package-info.java
@@ -17,8 +17,8 @@
/**
* Contains generated code for the
- * {@link org.eigenbase.sql.parser Eigenbase SQL parser}.
+ * {@link org.apache.calcite.sql.parser Calcite SQL parser}.
*/
-package org.eigenbase.sql.parser.impl;
+package org.apache.calcite.sql.parser.impl;
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/parser/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/parser/package-info.java b/core/src/main/java/org/apache/calcite/sql/parser/package-info.java
index 0ee4abb..f518710 100644
--- a/core/src/main/java/org/apache/calcite/sql/parser/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/parser/package-info.java
@@ -18,6 +18,6 @@
/**
* Provides a SQL parser.
*/
-package org.eigenbase.sql.parser;
+package org.apache.calcite.sql.parser;
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/pretty/SqlFormatOptions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/pretty/SqlFormatOptions.java b/core/src/main/java/org/apache/calcite/sql/pretty/SqlFormatOptions.java
index 01bc0a0..93a6eed 100644
--- a/core/src/main/java/org/apache/calcite/sql/pretty/SqlFormatOptions.java
+++ b/core/src/main/java/org/apache/calcite/sql/pretty/SqlFormatOptions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.pretty;
+package org.apache.calcite.sql.pretty;
/**
* Data structure to hold options for
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java b/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java
index 4eddfe8..d064e33 100644
--- a/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java
+++ b/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java
@@ -14,19 +14,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.pretty;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.logging.*;
-
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.util.*;
-import org.eigenbase.trace.*;
-import org.eigenbase.util.*;
-
-import net.hydromatic.optiq.runtime.Spaces;
+package org.apache.calcite.sql.pretty;
+
+import org.apache.calcite.runtime.Spaces;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.util.SqlBuilder;
+import org.apache.calcite.sql.util.SqlString;
+import org.apache.calcite.util.Util;
+import org.apache.calcite.util.trace.CalciteLogger;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Stack;
+import java.util.logging.Logger;
/**
* Pretty printer for SQL statements.
@@ -90,10 +99,11 @@ import net.hydromatic.optiq.runtime.Spaces;
* </tr>
* <tr>
* <td>{@link #setSubqueryStyle SubqueryStyle}</td>
- * <td>Style for formatting sub-queries. Values are: {@link
- * org.eigenbase.sql.SqlWriter.SubqueryStyle#HYDE Hyde}, {@link
- * org.eigenbase.sql.SqlWriter.SubqueryStyle#BLACK Black}.</td>
- * <td>{@link org.eigenbase.sql.SqlWriter.SubqueryStyle#HYDE Hyde}</td>
+ * <td>Style for formatting sub-queries. Values are:
+ * {@link org.apache.calcite.sql.SqlWriter.SubqueryStyle#HYDE Hyde},
+ * {@link org.apache.calcite.sql.SqlWriter.SubqueryStyle#BLACK Black}.</td>
+ *
+ * <td>{@link org.apache.calcite.sql.SqlWriter.SubqueryStyle#HYDE Hyde}</td>
* </tr>
* <tr>
* <td>{@link #setLineLength LineLength}</td>
@@ -106,9 +116,9 @@ import net.hydromatic.optiq.runtime.Spaces;
public class SqlPrettyWriter implements SqlWriter {
//~ Static fields/initializers ---------------------------------------------
- protected static final EigenbaseLogger LOGGER =
- new EigenbaseLogger(
- Logger.getLogger("org.eigenbase.sql.pretty.SqlPrettyWriter"));
+ protected static final CalciteLogger LOGGER =
+ new CalciteLogger(
+ Logger.getLogger("org.apache.calcite.sql.pretty.SqlPrettyWriter"));
/**
* Bean holding the default property values.
@@ -182,8 +192,8 @@ public class SqlPrettyWriter implements SqlWriter {
}
/**
- * Sets the subquery style. Default is {@link
- * org.eigenbase.sql.SqlWriter.SubqueryStyle#HYDE}.
+ * Sets the subquery style. Default is
+ * {@link org.apache.calcite.sql.SqlWriter.SubqueryStyle#HYDE}.
*/
public void setSubqueryStyle(SubqueryStyle subqueryStyle) {
this.subqueryStyle = subqueryStyle;
@@ -299,7 +309,7 @@ public class SqlPrettyWriter implements SqlWriter {
String key = propertyNames[i];
final Object value = bean.get(key);
final Object defaultValue = DEFAULT_BEAN.get(key);
- if (Util.equal(value, defaultValue)) {
+ if (com.google.common.base.Objects.equal(value, defaultValue)) {
continue;
}
if (count++ > 0) {
@@ -751,7 +761,7 @@ public class SqlPrettyWriter implements SqlWriter {
Util.pre(
frame == this.frame,
"Frame " + endedFrame.frameType
- + " does not match current frame " + this.frame.frameType);
+ + " does not match current frame " + this.frame.frameType);
if (this.frame == null) {
throw new RuntimeException("No list started");
}
@@ -959,7 +969,7 @@ public class SqlPrettyWriter implements SqlWriter {
//~ Inner Classes ----------------------------------------------------------
/**
- * Implementation of {@link org.eigenbase.sql.SqlWriter.Frame}.
+ * Implementation of {@link org.apache.calcite.sql.SqlWriter.Frame}.
*/
protected class FrameImpl implements Frame {
final FrameType frameType;
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java b/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java
index 71783c5..bd30861 100644
--- a/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java
+++ b/core/src/main/java/org/apache/calcite/sql/pretty/package-info.java
@@ -18,6 +18,6 @@
/**
* Provides a pretty-printer for SQL statements.
*/
-package org.eigenbase.sql.pretty;
+package org.apache.calcite.sql.pretty;
// End package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/AbstractSqlType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/AbstractSqlType.java b/core/src/main/java/org/apache/calcite/sql/type/AbstractSqlType.java
index f9a798b..4baa04d 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/AbstractSqlType.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/AbstractSqlType.java
@@ -14,12 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.io.*;
-import java.util.List;
+import org.apache.calcite.rel.type.RelDataType;
+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.eigenbase.reltype.*;
+import java.io.Serializable;
+import java.util.List;
/**
* Abstract base class for SQL implementations of {@link RelDataType}.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/ArraySqlType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/ArraySqlType.java b/core/src/main/java/org/apache/calcite/sql/type/ArraySqlType.java
index 7794d52..8ab656e 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/ArraySqlType.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/ArraySqlType.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.reltype.RelDataType;
-import org.eigenbase.reltype.RelDataTypeFamily;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFamily;
/**
* SQL array type.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/AssignableOperandTypeChecker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/AssignableOperandTypeChecker.java b/core/src/main/java/org/apache/calcite/sql/type/AssignableOperandTypeChecker.java
index 29574a6..3f9f9ba 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/AssignableOperandTypeChecker.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/AssignableOperandTypeChecker.java
@@ -14,18 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.util.List;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.util.Pair;
-
-import net.hydromatic.linq4j.Ord;
+import org.apache.calcite.linq4j.Ord;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.util.Pair;
import com.google.common.collect.ImmutableList;
+import java.util.List;
+
/**
* AssignableOperandTypeChecker implements {@link SqlOperandTypeChecker} by
* verifying that the type of each argument is assignable to a predefined set of
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java b/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java
index 796f45b..949019f 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.nio.charset.*;
+import org.apache.calcite.rel.type.RelDataTypeSystem;
+import org.apache.calcite.sql.SqlCollation;
+import org.apache.calcite.util.SerializableCharset;
+import org.apache.calcite.util.Util;
-import org.eigenbase.reltype.RelDataTypeSystem;
-import org.eigenbase.sql.*;
-import org.eigenbase.util.*;
+import java.nio.charset.Charset;
/**
* BasicSqlType represents a standard atomic SQL type (excluding interval
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/ComparableOperandTypeChecker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/ComparableOperandTypeChecker.java b/core/src/main/java/org/apache/calcite/sql/type/ComparableOperandTypeChecker.java
index 0bf0029..454897d 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/ComparableOperandTypeChecker.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/ComparableOperandTypeChecker.java
@@ -14,12 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.util.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeComparability;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlOperatorBinding;
+import org.apache.calcite.sql.SqlUtil;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+import java.util.Collections;
/**
* Type checking strategy which verifies that types have the required attributes
@@ -77,8 +81,9 @@ public class ComparableOperandTypeChecker extends SameOperandTypeChecker {
}
/**
- * Similar functionality to {@link #checkOperandTypes(SqlCallBinding,
- * boolean)}, but not part of the interface, and cannot throw an error.
+ * Similar functionality to
+ * {@link #checkOperandTypes(SqlCallBinding, boolean)}, but not part of the
+ * interface, and cannot throw an error.
*/
public boolean checkOperandTypes(
SqlOperatorBinding callBinding) {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/CompositeOperandTypeChecker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/CompositeOperandTypeChecker.java b/core/src/main/java/org/apache/calcite/sql/type/CompositeOperandTypeChecker.java
index 2046bc5..4c174ab 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/CompositeOperandTypeChecker.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/CompositeOperandTypeChecker.java
@@ -14,17 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.util.*;
-
-import org.eigenbase.sql.*;
-import org.eigenbase.util.*;
-
-import net.hydromatic.linq4j.Ord;
+import org.apache.calcite.linq4j.Ord;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.util.Util;
import com.google.common.collect.ImmutableList;
+import java.util.AbstractList;
+import java.util.List;
+
/**
* This class allows multiple existing {@link SqlOperandTypeChecker} rules to be
* combined into one rule. For example, allowing an operand to be either string
@@ -76,6 +79,7 @@ public class CompositeOperandTypeChecker
implements SqlSingleOperandTypeChecker {
//~ Enums ------------------------------------------------------------------
+ /** How operands are composed. */
public enum Composition {
AND, OR, SEQUENCE
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/CursorReturnTypeInference.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/CursorReturnTypeInference.java b/core/src/main/java/org/apache/calcite/sql/type/CursorReturnTypeInference.java
index bb4f9cf..117283d 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/CursorReturnTypeInference.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/CursorReturnTypeInference.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlOperatorBinding;
/**
* Returns the rowtype of a cursor of the operand at a particular 0-based
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/ExplicitOperandTypeInference.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/ExplicitOperandTypeInference.java b/core/src/main/java/org/apache/calcite/sql/type/ExplicitOperandTypeInference.java
index 8eeef4b..684388e 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/ExplicitOperandTypeInference.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/ExplicitOperandTypeInference.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlCallBinding;
import com.google.common.collect.ImmutableList;
@@ -32,7 +32,8 @@ public class ExplicitOperandTypeInference implements SqlOperandTypeInference {
//~ Constructors -----------------------------------------------------------
- /** Use {@link org.eigenbase.sql.type.InferTypes#explicit(java.util.List)}. */
+ /** Use
+ * {@link org.apache.calcite.sql.type.InferTypes#explicit(java.util.List)}. */
ExplicitOperandTypeInference(ImmutableList<RelDataType> paramTypes) {
this.paramTypes = paramTypes;
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/ExplicitReturnTypeInference.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/ExplicitReturnTypeInference.java b/core/src/main/java/org/apache/calcite/sql/type/ExplicitReturnTypeInference.java
index c3c0117..7d891ec 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/ExplicitReturnTypeInference.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/ExplicitReturnTypeInference.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.rel.type.RelProtoDataType;
+import org.apache.calcite.sql.SqlOperatorBinding;
/**
* A {@link SqlReturnTypeInference} which always returns the same SQL type.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/ExtraSqlTypes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/ExtraSqlTypes.java b/core/src/main/java/org/apache/calcite/sql/type/ExtraSqlTypes.java
index 2664f85..1774625 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/ExtraSqlTypes.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/ExtraSqlTypes.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
/**
* Holds constants associated with SQL types introduced after the earliest
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/FamilyOperandTypeChecker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/FamilyOperandTypeChecker.java b/core/src/main/java/org/apache/calcite/sql/type/FamilyOperandTypeChecker.java
index 109529c..c421727 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/FamilyOperandTypeChecker.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/FamilyOperandTypeChecker.java
@@ -14,18 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.util.*;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-
-import net.hydromatic.linq4j.Ord;
+import org.apache.calcite.linq4j.Ord;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlUtil;
import com.google.common.collect.ImmutableList;
-import static org.eigenbase.util.Static.RESOURCE;
+import java.util.List;
+
+import static org.apache.calcite.util.Static.RESOURCE;
/**
* Operand type-checking strategy which checks operands for inclusion in type
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/InferTypes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/InferTypes.java b/core/src/main/java/org/apache/calcite/sql/type/InferTypes.java
index d9d56f9..f4ab473 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/InferTypes.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/InferTypes.java
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.util.List;
-
-import org.eigenbase.reltype.RelDataType;
-import org.eigenbase.reltype.RelDataTypeFactory;
-import org.eigenbase.sql.SqlCallBinding;
-import org.eigenbase.sql.SqlNode;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlNode;
import com.google.common.collect.ImmutableList;
+import java.util.List;
+
/**
* Strategies for inferring operand types.
*
- * @see org.eigenbase.sql.type.SqlOperandTypeInference
- * @see org.eigenbase.sql.type.ReturnTypes
+ * @see org.apache.calcite.sql.type.SqlOperandTypeInference
+ * @see org.apache.calcite.sql.type.ReturnTypes
*/
public abstract class InferTypes {
private InferTypes() {}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/IntervalSqlType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/IntervalSqlType.java b/core/src/main/java/org/apache/calcite/sql/type/IntervalSqlType.java
index c82671c..73188b4 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/IntervalSqlType.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/IntervalSqlType.java
@@ -14,13 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
-import org.eigenbase.sql.parser.*;
-import org.eigenbase.sql.pretty.SqlPrettyWriter;
-import org.eigenbase.sql.util.SqlString;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactoryImpl;
+import org.apache.calcite.rel.type.RelDataTypeSystem;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.SqlIntervalQualifier;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.sql.pretty.SqlPrettyWriter;
+import org.apache.calcite.sql.util.SqlString;
/**
* IntervalSqlType represents a standard SQL datetime interval type.
@@ -145,8 +148,7 @@ public class IntervalSqlType extends AbstractSqlType {
return intervalQualifier.getStartPrecision(typeSystem);
}
- @Override
- public int getScale() {
+ @Override public int getScale() {
return intervalQualifier.getFractionalSecondPrecision(typeSystem);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/JavaToSqlTypeConversionRules.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/JavaToSqlTypeConversionRules.java b/core/src/main/java/org/apache/calcite/sql/type/JavaToSqlTypeConversionRules.java
index 0dfbddc..dd5097d 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/JavaToSqlTypeConversionRules.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/JavaToSqlTypeConversionRules.java
@@ -14,15 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
-
-import java.math.*;
-import java.sql.*;
-import java.sql.Date;
-import java.util.*;
+package org.apache.calcite.sql.type;
import com.google.common.collect.ImmutableMap;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Map;
+
/**
* JavaToSqlTypeConversionRules defines mappings from common Java types to
* corresponding SQL types.
@@ -72,8 +75,9 @@ public class JavaToSqlTypeConversionRules {
//~ Methods ----------------------------------------------------------------
/**
- * Returns the {@link org.eigenbase.util.Glossary#SINGLETON_PATTERN
- * singleton} instance.
+ * Returns the
+ * {@link org.apache.calcite.util.Glossary#SINGLETON_PATTERN singleton}
+ * instance.
*/
public static JavaToSqlTypeConversionRules instance() {
return INSTANCE;
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/LiteralOperandTypeChecker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/LiteralOperandTypeChecker.java b/core/src/main/java/org/apache/calcite/sql/type/LiteralOperandTypeChecker.java
index 4d50598..83161d1 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/LiteralOperandTypeChecker.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/LiteralOperandTypeChecker.java
@@ -14,12 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.sql.*;
-import org.eigenbase.util.*;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlUtil;
+import org.apache.calcite.util.Util;
-import static org.eigenbase.util.Static.RESOURCE;
+import static org.apache.calcite.util.Static.RESOURCE;
/**
* Parameter type-checking strategy type must be a literal (whether null is
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/MapSqlType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/MapSqlType.java b/core/src/main/java/org/apache/calcite/sql/type/MapSqlType.java
index 8a8e4f8..61f8b79 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/MapSqlType.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/MapSqlType.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.reltype.RelDataType;
-import org.eigenbase.reltype.RelDataTypeFamily;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFamily;
/**
* SQL map type.
@@ -46,13 +46,11 @@ public class MapSqlType extends AbstractSqlType {
//~ Methods ----------------------------------------------------------------
- @Override
- public RelDataType getValueType() {
+ @Override public RelDataType getValueType() {
return valueType;
}
- @Override
- public RelDataType getKeyType() {
+ @Override public RelDataType getKeyType() {
return keyType;
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/MatchReturnTypeInference.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/MatchReturnTypeInference.java b/core/src/main/java/org/apache/calcite/sql/type/MatchReturnTypeInference.java
index 99d3533..5c60187 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/MatchReturnTypeInference.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/MatchReturnTypeInference.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.util.List;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlOperatorBinding;
import com.google.common.collect.ImmutableList;
+import java.util.List;
+
/**
* Returns the first type that matches a set of given {@link SqlTypeName}s. If
* no match could be found, null is returned.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/MultisetOperandTypeChecker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/MultisetOperandTypeChecker.java b/core/src/main/java/org/apache/calcite/sql/type/MultisetOperandTypeChecker.java
index ae78142..5b33fce 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/MultisetOperandTypeChecker.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/MultisetOperandTypeChecker.java
@@ -14,14 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlOperator;
import com.google.common.collect.ImmutableList;
-import static org.eigenbase.util.Static.RESOURCE;
+import static org.apache.calcite.util.Static.RESOURCE;
/**
* Parameter type-checking strategy types must be [nullable] Multiset,
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/MultisetSqlType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/MultisetSqlType.java b/core/src/main/java/org/apache/calcite/sql/type/MultisetSqlType.java
index 0d30b4b..eae3d62 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/MultisetSqlType.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/MultisetSqlType.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import org.eigenbase.reltype.*;
-import org.eigenbase.util.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFamily;
/**
* MultisetSqlType represents a standard SQL2003 multiset type.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/ObjectSqlType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/ObjectSqlType.java b/core/src/main/java/org/apache/calcite/sql/type/ObjectSqlType.java
index 78d3cf1..dac49f2 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/ObjectSqlType.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/ObjectSqlType.java
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.util.List;
+import org.apache.calcite.rel.type.RelDataTypeComparability;
+import org.apache.calcite.rel.type.RelDataTypeFamily;
+import org.apache.calcite.rel.type.RelDataTypeField;
+import org.apache.calcite.sql.SqlIdentifier;
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+import java.util.List;
/**
* ObjectSqlType represents an SQL structured user-defined type.
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java b/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java
index 7e7572e..2466351 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java
@@ -14,23 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
+package org.apache.calcite.sql.type;
-import java.util.*;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeComparability;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlUtil;
import com.google.common.collect.ImmutableList;
-import static org.eigenbase.util.Static.RESOURCE;
+import java.util.List;
+
+import static org.apache.calcite.util.Static.RESOURCE;
/**
* Strategies for checking operand types.
*
* <p>This class defines singleton instances of strategy objects for operand
- * type checking. {@link org.eigenbase.sql.type.ReturnTypes}
- * and {@link org.eigenbase.sql.type.InferTypes} provide similar strategies
+ * type checking. {@link org.apache.calcite.sql.type.ReturnTypes}
+ * and {@link org.apache.calcite.sql.type.InferTypes} provide similar strategies
* for operand type inference and operator return type inference.
*
* <p>Note to developers: avoid anonymous inner classes here except for unique,
@@ -38,9 +44,9 @@ import static org.eigenbase.util.Static.RESOURCE;
* class. If you find yourself copying and pasting an existing strategy's
* anonymous inner class, you're making a mistake.
*
- * @see org.eigenbase.sql.type.SqlOperandTypeChecker
- * @see org.eigenbase.sql.type.ReturnTypes
- * @see org.eigenbase.sql.type.InferTypes
+ * @see org.apache.calcite.sql.type.SqlOperandTypeChecker
+ * @see org.apache.calcite.sql.type.ReturnTypes
+ * @see org.apache.calcite.sql.type.InferTypes
*/
public abstract class OperandTypes {
private OperandTypes() {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/core/src/main/java/org/apache/calcite/sql/type/OperandsTypeChecking.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/type/OperandsTypeChecking.java b/core/src/main/java/org/apache/calcite/sql/type/OperandsTypeChecking.java
index 4a9bafb..ebc01f5 100644
--- a/core/src/main/java/org/apache/calcite/sql/type/OperandsTypeChecking.java
+++ b/core/src/main/java/org/apache/calcite/sql/type/OperandsTypeChecking.java
@@ -14,10 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eigenbase.sql.type;
-
-import org.eigenbase.reltype.*;
-import org.eigenbase.sql.*;
+package org.apache.calcite.sql.type;
/**
* Strategies to check for allowed operand types of an operator call.