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:59 UTC
[51/58] [abbrv] [partial] incubator-calcite git commit: [CALCITE-306]
Standardize code style for "import package.*; "
[CALCITE-306] Standardize code style for "import package.*;"
Rename classes and packages and generally fix things up after [CALCITE-296] and [CALCITE-419].
Make many inner classes of EnumerableRules (e.g. EnumerableFilter, EnumerableFilterRule) top-level classes.
Apply a consistent formatting convention for string literals split over multiple lines.
Rename generated file org.eigenbase.resource.Resources to org.apache.calcite.runtime.Resources.
Change occurrences of "optiq" and "eigenbase" in java code to "calcite".
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/a0ba73cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/a0ba73cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/a0ba73cd
Branch: refs/heads/master
Commit: a0ba73cd2de76696b96a1cd828d2aa4d3ef9eb55
Parents: a611d64
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Nov 13 18:11:34 2014 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Nov 13 18:22:06 2014 -0800
----------------------------------------------------------------------
avatica/pom.xml | 4 +-
.../org/apache/calcite/avatica/ArrayImpl.java | 12 +-
.../calcite/avatica/AvaticaConnection.java | 31 +-
.../avatica/AvaticaDatabaseMetaData.java | 23 +-
.../apache/calcite/avatica/AvaticaFactory.java | 2 +-
.../calcite/avatica/AvaticaJdbc40Factory.java | 2 +-
.../calcite/avatica/AvaticaJdbc41Factory.java | 8 +-
.../calcite/avatica/AvaticaParameter.java | 13 +-
.../calcite/avatica/AvaticaPrepareResult.java | 2 +-
.../avatica/AvaticaPreparedStatement.java | 15 +-
.../calcite/avatica/AvaticaResultSet.java | 23 +-
.../avatica/AvaticaResultSetMetaData.java | 2 +-
.../calcite/avatica/AvaticaStatement.java | 12 +-
.../avatica/BuiltInConnectionProperty.java | 5 +-
.../org/apache/calcite/avatica/ByteString.java | 14 +-
.../java/org/apache/calcite/avatica/Casing.java | 2 +-
.../apache/calcite/avatica/ColumnMetaData.java | 10 +-
.../calcite/avatica/ConnectStringParser.java | 16 +-
.../calcite/avatica/ConnectionConfig.java | 2 +-
.../calcite/avatica/ConnectionConfigImpl.java | 4 +-
.../calcite/avatica/ConnectionProperty.java | 2 +-
.../java/org/apache/calcite/avatica/Cursor.java | 19 +-
.../apache/calcite/avatica/DriverVersion.java | 2 +-
.../org/apache/calcite/avatica/Handler.java | 2 +-
.../org/apache/calcite/avatica/HandlerImpl.java | 2 +-
.../java/org/apache/calcite/avatica/Helper.java | 2 +-
.../calcite/avatica/InternalProperty.java | 8 +-
.../java/org/apache/calcite/avatica/Meta.java | 2 +-
.../org/apache/calcite/avatica/Quoting.java | 2 +-
.../calcite/avatica/UnregisteredDriver.java | 26 +-
.../apache/calcite/avatica/package-info.java | 2 +-
.../calcite/avatica/test/AvaticaSuite.java | 2 +-
.../avatica/test/ConnectStringParserTest.java | 18 +-
.../calcite/avatica/test/package-info.java | 2 +-
core/pom.xml | 6 +-
core/src/main/codegen/config.fmpp | 8 +-
core/src/main/codegen/templates/Parser.jj | 110 +-
.../java/org/apache/calcite/DataContext.java | 19 +-
core/src/main/java/org/apache/calcite/Demo.java | 2 +-
.../calcite/adapter/clone/ArrayTable.java | 45 +-
.../calcite/adapter/clone/CloneSchema.java | 39 +-
.../calcite/adapter/clone/ColumnLoader.java | 37 +-
.../apache/calcite/adapter/clone/ListTable.java | 29 +-
.../calcite/adapter/clone/package-info.java | 2 +-
.../adapter/enumerable/AggAddContext.java | 22 +-
.../calcite/adapter/enumerable/AggContext.java | 30 +-
.../calcite/adapter/enumerable/AggImpState.java | 9 +-
.../adapter/enumerable/AggImplementor.java | 17 +-
.../adapter/enumerable/AggResetContext.java | 12 +-
.../adapter/enumerable/AggResultContext.java | 12 +-
.../adapter/enumerable/CallImplementor.java | 17 +-
.../calcite/adapter/enumerable/EnumUtils.java | 115 +
.../adapter/enumerable/EnumerableAggregate.java | 425 +++
.../enumerable/EnumerableAggregateRule.java | 54 +
.../adapter/enumerable/EnumerableCalc.java | 221 ++
.../adapter/enumerable/EnumerableCalcRule.java | 61 +
.../adapter/enumerable/EnumerableCollect.java | 71 +
.../enumerable/EnumerableCollectRule.java | 49 +
.../enumerable/EnumerableConvention.java | 13 +-
.../adapter/enumerable/EnumerableEmptyRule.java | 48 +
.../adapter/enumerable/EnumerableFilter.java | 50 +
.../enumerable/EnumerableFilterRule.java | 56 +
.../enumerable/EnumerableFilterToCalcRule.java | 62 +
.../enumerable/EnumerableInterpreter.java | 79 +
.../adapter/enumerable/EnumerableIntersect.java | 83 +
.../enumerable/EnumerableIntersectRule.java | 48 +
.../adapter/enumerable/EnumerableJoin.java | 221 ++
.../adapter/enumerable/EnumerableJoinRule.java | 89 +
.../adapter/enumerable/EnumerableLimit.java | 104 +
.../adapter/enumerable/EnumerableLimitRule.java | 68 +
.../adapter/enumerable/EnumerableMinus.java | 81 +
.../adapter/enumerable/EnumerableMinusRule.java | 49 +
.../enumerable/EnumerableOneRowRule.java | 50 +
.../adapter/enumerable/EnumerableProject.java | 54 +
.../enumerable/EnumerableProjectRule.java | 59 +
.../enumerable/EnumerableProjectToCalcRule.java | 57 +
.../adapter/enumerable/EnumerableRel.java | 31 +-
.../enumerable/EnumerableRelImplementor.java | 58 +-
.../adapter/enumerable/EnumerableRules.java | 3306 +-----------------
.../adapter/enumerable/EnumerableSemiJoin.java | 114 +
.../enumerable/EnumerableSemiJoinRule.java | 64 +
.../adapter/enumerable/EnumerableSort.java | 80 +
.../adapter/enumerable/EnumerableSortRule.java | 55 +
.../enumerable/EnumerableTableFunctionScan.java | 73 +
.../EnumerableTableFunctionScanRule.java | 45 +
.../enumerable/EnumerableTableModify.java | 149 +
.../enumerable/EnumerableTableModifyRule.java | 57 +
.../adapter/enumerable/EnumerableTableScan.java | 153 +
.../adapter/enumerable/EnumerableUncollect.java | 72 +
.../enumerable/EnumerableUncollectRule.java | 48 +
.../adapter/enumerable/EnumerableUnion.java | 82 +
.../adapter/enumerable/EnumerableUnionRule.java | 44 +
.../adapter/enumerable/EnumerableValues.java | 96 +
.../enumerable/EnumerableValuesRule.java | 44 +
.../adapter/enumerable/EnumerableWindow.java | 952 +++++
.../enumerable/EnumerableWindowRule.java | 48 +
.../adapter/enumerable/JavaRelImplementor.java | 19 +-
.../adapter/enumerable/JavaRowFormat.java | 58 +-
.../adapter/enumerable/NestedBlockBuilder.java | 14 +-
.../enumerable/NestedBlockBuilderImpl.java | 22 +-
.../adapter/enumerable/NotNullImplementor.java | 14 +-
.../calcite/adapter/enumerable/NullPolicy.java | 4 +-
.../calcite/adapter/enumerable/PhysType.java | 17 +-
.../adapter/enumerable/PhysTypeImpl.java | 82 +-
.../ReflectiveCallNotNullImplementor.java | 13 +-
.../calcite/adapter/enumerable/RexImpTable.java | 355 +-
.../adapter/enumerable/RexToLixTranslator.java | 112 +-
.../enumerable/StrictAggImplementor.java | 29 +-
.../enumerable/StrictWinAggImplementor.java | 28 +-
.../adapter/enumerable/WinAggAddContext.java | 10 +-
.../adapter/enumerable/WinAggContext.java | 4 +-
.../adapter/enumerable/WinAggFrameContext.java | 8 +-
.../enumerable/WinAggFrameResultContext.java | 4 +-
.../adapter/enumerable/WinAggImplementor.java | 10 +-
.../adapter/enumerable/WinAggResetContext.java | 11 +-
.../adapter/enumerable/WinAggResultContext.java | 21 +-
.../enumerable/impl/AggAddContextImpl.java | 14 +-
.../enumerable/impl/AggResetContextImpl.java | 16 +-
.../enumerable/impl/AggResultContextImpl.java | 14 +-
.../enumerable/impl/WinAggAddContextImpl.java | 22 +-
.../enumerable/impl/WinAggResetContextImpl.java | 13 +-
.../impl/WinAggResultContextImpl.java | 20 +-
.../adapter/enumerable/impl/package-info.java | 4 +-
.../adapter/enumerable/package-info.java | 2 +-
.../adapter/java/AbstractQueryableTable.java | 13 +-
.../calcite/adapter/java/JavaTypeFactory.java | 6 +-
.../calcite/adapter/java/ReflectiveSchema.java | 76 +-
.../calcite/adapter/java/package-info.java | 2 +-
.../calcite/adapter/jdbc/JdbcConvention.java | 24 +-
.../calcite/adapter/jdbc/JdbcImplementor.java | 76 +-
.../calcite/adapter/jdbc/JdbcQueryProvider.java | 7 +-
.../apache/calcite/adapter/jdbc/JdbcRel.java | 4 +-
.../apache/calcite/adapter/jdbc/JdbcRules.java | 440 +--
.../apache/calcite/adapter/jdbc/JdbcSchema.java | 53 +-
.../apache/calcite/adapter/jdbc/JdbcTable.java | 67 +-
.../calcite/adapter/jdbc/JdbcTableScan.java | 15 +-
.../adapter/jdbc/JdbcToEnumerableConverter.java | 87 +-
.../jdbc/JdbcToEnumerableConverterRule.java | 11 +-
.../apache/calcite/adapter/jdbc/JdbcUtils.java | 36 +-
.../calcite/adapter/jdbc/package-info.java | 2 +-
.../apache/calcite/adapter/package-info.java | 23 +-
.../calcite/config/CalciteConnectionConfig.java | 34 +-
.../config/CalciteConnectionConfigImpl.java | 44 +-
.../config/CalciteConnectionProperty.java | 27 +-
.../java/org/apache/calcite/config/Lex.java | 6 +-
.../org/apache/calcite/config/package-info.java | 2 +-
.../org/apache/calcite/interpreter/Context.java | 2 +-
.../apache/calcite/interpreter/FilterNode.java | 9 +-
.../apache/calcite/interpreter/Interpreter.java | 40 +-
.../org/apache/calcite/interpreter/Node.java | 2 +-
.../org/apache/calcite/interpreter/Nodes.java | 92 +-
.../apache/calcite/interpreter/ProjectNode.java | 11 +-
.../org/apache/calcite/interpreter/Row.java | 2 +-
.../org/apache/calcite/interpreter/Scalar.java | 2 +-
.../apache/calcite/interpreter/ScanNode.java | 47 +-
.../org/apache/calcite/interpreter/Sink.java | 2 +-
.../apache/calcite/interpreter/SortNode.java | 16 +-
.../org/apache/calcite/interpreter/Source.java | 2 +-
.../apache/calcite/interpreter/ValuesNode.java | 13 +-
.../calcite/interpreter/package-info.java | 2 +-
.../apache/calcite/jdbc/CalciteConnection.java | 19 +-
.../calcite/jdbc/CalciteConnectionImpl.java | 186 +-
.../org/apache/calcite/jdbc/CalciteFactory.java | 19 +-
.../calcite/jdbc/CalciteJdbc40Factory.java | 10 +-
.../calcite/jdbc/CalciteJdbc41Factory.java | 89 +-
.../org/apache/calcite/jdbc/CalcitePrepare.java | 84 +-
.../calcite/jdbc/CalcitePreparedStatement.java | 35 +-
.../apache/calcite/jdbc/CalciteResultSet.java | 57 +-
.../apache/calcite/jdbc/CalciteRootSchema.java | 10 +-
.../org/apache/calcite/jdbc/CalciteSchema.java | 202 +-
.../apache/calcite/jdbc/CalciteStatement.java | 40 +-
.../java/org/apache/calcite/jdbc/Driver.java | 67 +-
.../org/apache/calcite/jdbc/JavaRecordType.java | 6 +-
.../calcite/jdbc/JavaTypeFactoryImpl.java | 39 +-
.../java/org/apache/calcite/jdbc/MetaImpl.java | 150 +-
.../org/apache/calcite/jdbc/MetadataSchema.java | 20 +-
.../calcite/jdbc/SqlTimeoutException.java | 2 +-
.../org/apache/calcite/jdbc/package-info.java | 2 +-
.../org/apache/calcite/materialize/Lattice.java | 115 +-
.../materialize/MaterializationActor.java | 31 +-
.../calcite/materialize/MaterializationKey.java | 11 +-
.../materialize/MaterializationService.java | 116 +-
.../org/apache/calcite/materialize/TileKey.java | 9 +-
.../calcite/materialize/TileSuggester.java | 2 +-
.../calcite/materialize/package-info.java | 6 +-
.../org/apache/calcite/model/JsonColumn.java | 2 +-
.../apache/calcite/model/JsonCustomSchema.java | 9 +-
.../apache/calcite/model/JsonCustomTable.java | 4 +-
.../org/apache/calcite/model/JsonFunction.java | 2 +-
.../apache/calcite/model/JsonJdbcSchema.java | 5 +-
.../org/apache/calcite/model/JsonLattice.java | 2 +-
.../org/apache/calcite/model/JsonMapSchema.java | 8 +-
.../calcite/model/JsonMaterialization.java | 5 +-
.../org/apache/calcite/model/JsonMeasure.java | 6 +-
.../java/org/apache/calcite/model/JsonRoot.java | 4 +-
.../org/apache/calcite/model/JsonSchema.java | 7 +-
.../org/apache/calcite/model/JsonTable.java | 2 +-
.../java/org/apache/calcite/model/JsonTile.java | 4 +-
.../java/org/apache/calcite/model/JsonView.java | 5 +-
.../org/apache/calcite/model/ModelHandler.java | 77 +-
.../org/apache/calcite/model/package-info.java | 8 +-
.../java/org/apache/calcite/package-info.java | 2 +-
.../calcite/plan/AbstractRelOptPlanner.java | 38 +-
.../calcite/plan/CommonRelSubExprRule.java | 2 +-
.../java/org/apache/calcite/plan/Context.java | 4 +-
.../java/org/apache/calcite/plan/Contexts.java | 14 +-
.../org/apache/calcite/plan/Convention.java | 4 +-
.../apache/calcite/plan/ConventionTraitDef.java | 24 +-
.../calcite/plan/MulticastRelOptListener.java | 5 +-
.../org/apache/calcite/plan/RelImplementor.java | 13 +-
.../calcite/plan/RelOptAbstractTable.java | 19 +-
.../org/apache/calcite/plan/RelOptCluster.java | 20 +-
.../apache/calcite/plan/RelOptConnection.java | 2 +-
.../org/apache/calcite/plan/RelOptCost.java | 6 +-
.../apache/calcite/plan/RelOptCostFactory.java | 2 +-
.../org/apache/calcite/plan/RelOptCostImpl.java | 7 +-
.../org/apache/calcite/plan/RelOptLattice.java | 27 +-
.../org/apache/calcite/plan/RelOptListener.java | 7 +-
.../calcite/plan/RelOptMaterialization.java | 109 +-
.../org/apache/calcite/plan/RelOptNode.java | 6 +-
.../org/apache/calcite/plan/RelOptPlanner.java | 55 +-
.../calcite/plan/RelOptPredicateList.java | 6 +-
.../org/apache/calcite/plan/RelOptQuery.java | 16 +-
.../org/apache/calcite/plan/RelOptRule.java | 28 +-
.../org/apache/calcite/plan/RelOptRuleCall.java | 37 +-
.../apache/calcite/plan/RelOptRuleOperand.java | 27 +-
.../plan/RelOptRuleOperandChildPolicy.java | 2 +-
.../calcite/plan/RelOptRuleOperandChildren.java | 6 +-
.../calcite/plan/RelOptSamplingParameters.java | 6 +-
.../org/apache/calcite/plan/RelOptSchema.java | 6 +-
.../calcite/plan/RelOptSchemaWithSampling.java | 2 +-
.../org/apache/calcite/plan/RelOptTable.java | 22 +-
.../org/apache/calcite/plan/RelOptUtil.java | 324 +-
.../java/org/apache/calcite/plan/RelTrait.java | 8 +-
.../org/apache/calcite/plan/RelTraitDef.java | 26 +-
.../plan/RelTraitPropagationVisitor.java | 7 +-
.../org/apache/calcite/plan/RelTraitSet.java | 24 +-
.../java/org/apache/calcite/plan/Strong.java | 12 +-
.../calcite/plan/SubstitutionVisitor.java | 275 +-
.../org/apache/calcite/plan/TableAccessMap.java | 19 +-
.../apache/calcite/plan/VisitorRelVisitor.java | 14 +-
.../apache/calcite/plan/hep/HepInstruction.java | 18 +-
.../apache/calcite/plan/hep/HepMatchOrder.java | 2 +-
.../org/apache/calcite/plan/hep/HepPlanner.java | 69 +-
.../org/apache/calcite/plan/hep/HepProgram.java | 14 +-
.../calcite/plan/hep/HepProgramBuilder.java | 28 +-
.../plan/hep/HepRelMetadataProvider.java | 7 +-
.../apache/calcite/plan/hep/HepRelVertex.java | 39 +-
.../apache/calcite/plan/hep/HepRuleCall.java | 13 +-
.../apache/calcite/plan/hep/package-info.java | 4 +-
.../org/apache/calcite/plan/package-info.java | 2 +-
.../calcite/plan/volcano/AbstractConverter.java | 32 +-
.../ChainedPhaseRuleMappingInitializer.java | 13 +-
.../org/apache/calcite/plan/volcano/RelSet.java | 28 +-
.../apache/calcite/plan/volcano/RelSubset.java | 56 +-
.../apache/calcite/plan/volcano/RuleQueue.java | 49 +-
.../calcite/plan/volcano/VolcanoCost.java | 13 +-
.../calcite/plan/volcano/VolcanoPlanner.java | 198 +-
.../plan/volcano/VolcanoPlannerPhase.java | 8 +-
...lcanoPlannerPhaseRuleMappingInitializer.java | 17 +-
.../volcano/VolcanoRelMetadataProvider.java | 7 +-
.../calcite/plan/volcano/VolcanoRuleCall.java | 32 +-
.../calcite/plan/volcano/VolcanoRuleMatch.java | 8 +-
.../calcite/plan/volcano/package-info.java | 89 +-
.../calcite/prepare/CalciteCatalogReader.java | 93 +-
.../calcite/prepare/CalciteMaterializer.java | 96 +-
.../calcite/prepare/CalcitePrepareImpl.java | 329 +-
.../calcite/prepare/CalciteSqlValidator.java | 29 +-
.../calcite/prepare/LixToRelTranslator.java | 55 +-
.../org/apache/calcite/prepare/PlannerImpl.java | 89 +-
.../org/apache/calcite/prepare/Prepare.java | 112 +-
.../calcite/prepare/QueryableRelBuilder.java | 61 +-
.../apache/calcite/prepare/RelOptTableImpl.java | 51 +-
.../apache/calcite/prepare/package-info.java | 2 +-
.../org/apache/calcite/rel/AbstractRelNode.java | 73 +-
.../org/apache/calcite/rel/Aggregation.java | 70 -
.../apache/calcite/rel/InvalidRelException.java | 2 +-
.../org/apache/calcite/rel/RelCollation.java | 6 +-
.../apache/calcite/rel/RelCollationImpl.java | 17 +-
.../calcite/rel/RelCollationTraitDef.java | 21 +-
.../apache/calcite/rel/RelFieldCollation.java | 2 +-
.../apache/calcite/rel/RelImplementorImpl.java | 19 +-
.../java/org/apache/calcite/rel/RelInput.java | 15 +-
.../java/org/apache/calcite/rel/RelNode.java | 72 +-
.../java/org/apache/calcite/rel/RelShuttle.java | 39 +-
.../org/apache/calcite/rel/RelShuttleImpl.java | 53 +-
.../java/org/apache/calcite/rel/RelVisitor.java | 10 +-
.../java/org/apache/calcite/rel/RelWriter.java | 13 +-
.../java/org/apache/calcite/rel/SingleRel.java | 59 +-
.../apache/calcite/rel/convert/Converter.java | 27 +-
.../calcite/rel/convert/ConverterImpl.java | 31 +-
.../calcite/rel/convert/ConverterRule.java | 15 +-
.../calcite/rel/convert/NoneConverter.java | 24 +-
.../calcite/rel/convert/TraitMatchingRule.java | 11 +-
.../calcite/rel/convert/package-info.java | 2 +-
.../org/apache/calcite/rel/core/Aggregate.java | 98 +-
.../apache/calcite/rel/core/AggregateCall.java | 72 +-
.../java/org/apache/calcite/rel/core/Calc.java | 53 +-
.../org/apache/calcite/rel/core/Collect.java | 49 +-
.../apache/calcite/rel/core/Correlation.java | 2 +-
.../org/apache/calcite/rel/core/Correlator.java | 53 +-
.../java/org/apache/calcite/rel/core/Empty.java | 52 +-
.../org/apache/calcite/rel/core/Filter.java | 63 +-
.../org/apache/calcite/rel/core/Intersect.java | 39 +-
.../java/org/apache/calcite/rel/core/Join.java | 77 +-
.../org/apache/calcite/rel/core/JoinInfo.java | 31 +-
.../apache/calcite/rel/core/JoinRelType.java | 2 +-
.../java/org/apache/calcite/rel/core/Minus.java | 43 +-
.../org/apache/calcite/rel/core/OneRow.java | 38 +-
.../org/apache/calcite/rel/core/Project.java | 99 +-
.../apache/calcite/rel/core/RelFactories.java | 85 +-
.../org/apache/calcite/rel/core/Sample.java | 52 +-
.../org/apache/calcite/rel/core/SemiJoin.java | 61 +-
.../java/org/apache/calcite/rel/core/SetOp.java | 85 +-
.../java/org/apache/calcite/rel/core/Sort.java | 73 +-
.../calcite/rel/core/TableFunctionScan.java | 62 +-
.../apache/calcite/rel/core/TableModify.java | 49 +-
.../org/apache/calcite/rel/core/TableScan.java | 52 +-
.../org/apache/calcite/rel/core/Uncollect.java | 38 +-
.../java/org/apache/calcite/rel/core/Union.java | 29 +-
.../org/apache/calcite/rel/core/Values.java | 59 +-
.../org/apache/calcite/rel/core/Window.java | 136 +-
.../apache/calcite/rel/core/package-info.java | 36 +
.../apache/calcite/rel/externalize/RelJson.java | 75 +-
.../calcite/rel/externalize/RelJsonReader.java | 56 +-
.../calcite/rel/externalize/RelJsonWriter.java | 18 +-
.../calcite/rel/externalize/RelWriterImpl.java | 27 +-
.../calcite/rel/externalize/RelXmlWriter.java | 14 +-
.../calcite/rel/externalize/package-info.java | 24 +
.../apache/calcite/rel/jdbc/package-info.java | 2 +-
.../calcite/rel/logical/LogicalAggregate.java | 38 +-
.../apache/calcite/rel/logical/LogicalCalc.java | 55 +-
.../calcite/rel/logical/LogicalFilter.java | 46 +-
.../calcite/rel/logical/LogicalIntersect.java | 42 +-
.../apache/calcite/rel/logical/LogicalJoin.java | 71 +-
.../calcite/rel/logical/LogicalMinus.java | 36 +-
.../calcite/rel/logical/LogicalOneRow.java | 33 +-
.../calcite/rel/logical/LogicalProject.java | 56 +-
.../rel/logical/LogicalTableFunctionScan.java | 42 +-
.../calcite/rel/logical/LogicalTableModify.java | 32 +-
.../calcite/rel/logical/LogicalTableScan.java | 30 +-
.../calcite/rel/logical/LogicalUnion.java | 33 +-
.../calcite/rel/logical/LogicalValues.java | 51 +-
.../calcite/rel/logical/LogicalWindow.java | 144 +-
.../calcite/rel/logical/package-info.java | 36 +
.../calcite/rel/metadata/BuiltInMetadata.java | 21 +-
.../metadata/CachingRelMetadataProvider.java | 19 +-
.../metadata/ChainedRelMetadataProvider.java | 14 +-
.../metadata/DefaultRelMetadataProvider.java | 10 +-
.../apache/calcite/rel/metadata/Metadata.java | 10 +-
.../calcite/rel/metadata/MetadataFactory.java | 4 +-
.../rel/metadata/MetadataFactoryImpl.java | 13 +-
.../metadata/ReflectiveRelMetadataProvider.java | 40 +-
.../calcite/rel/metadata/RelColumnMapping.java | 6 +-
.../calcite/rel/metadata/RelColumnOrigin.java | 6 +-
.../rel/metadata/RelMdColumnOrigins.java | 55 +-
.../rel/metadata/RelMdColumnUniqueness.java | 58 +-
.../rel/metadata/RelMdDistinctRowCount.java | 63 +-
.../rel/metadata/RelMdExplainVisibility.java | 11 +-
.../metadata/RelMdPercentageOriginalRows.java | 36 +-
.../rel/metadata/RelMdPopulationSize.java | 57 +-
.../calcite/rel/metadata/RelMdPredicates.java | 133 +-
.../calcite/rel/metadata/RelMdRowCount.java | 50 +-
.../calcite/rel/metadata/RelMdSelectivity.java | 59 +-
.../calcite/rel/metadata/RelMdUniqueKeys.java | 60 +-
.../apache/calcite/rel/metadata/RelMdUtil.java | 63 +-
.../rel/metadata/RelMetadataProvider.java | 8 +-
.../calcite/rel/metadata/RelMetadataQuery.java | 48 +-
.../calcite/rel/metadata/package-info.java | 2 +-
.../org/apache/calcite/rel/package-info.java | 27 +-
.../AggregateExpandDistinctAggregatesRule.java | 99 +-
.../rel/rules/AggregateFilterTransposeRule.java | 61 +-
.../rel/rules/AggregateProjectMergeRule.java | 51 +-
.../AggregateProjectPullUpConstantsRule.java | 69 +-
.../rel/rules/AggregateReduceFunctionsRule.java | 127 +-
.../calcite/rel/rules/AggregateRemoveRule.java | 34 +-
.../rel/rules/AggregateStarTableRule.java | 105 +-
.../rel/rules/AggregateUnionAggregateRule.java | 73 +-
.../rel/rules/AggregateUnionTransposeRule.java | 74 +-
.../apache/calcite/rel/rules/CalcMergeRule.java | 42 +-
.../calcite/rel/rules/CalcRelSplitter.java | 104 +-
.../calcite/rel/rules/CalcRemoveRule.java | 32 +-
.../calcite/rel/rules/CoerceInputsRule.java | 13 +-
.../calcite/rel/rules/EmptyPruneRules.java | 103 +-
.../org/apache/calcite/rel/rules/EquiJoin.java | 33 +-
.../rel/rules/FilterAggregateTransposeRule.java | 43 +-
.../calcite/rel/rules/FilterCalcMergeRule.java | 50 +-
.../calcite/rel/rules/FilterJoinRule.java | 97 +-
.../calcite/rel/rules/FilterMergeRule.java | 53 +-
.../rel/rules/FilterMultiJoinMergeRule.java | 63 +-
.../rel/rules/FilterProjectTransposeRule.java | 49 +-
.../FilterRemoveIsNotDistinctFromRule.java | 46 +-
.../rel/rules/FilterSetOpTransposeRule.java | 52 +-
.../rules/FilterTableFunctionTransposeRule.java | 62 +-
.../calcite/rel/rules/FilterTableRule.java | 64 +-
.../calcite/rel/rules/FilterToCalcRule.java | 43 +-
.../rel/rules/JoinAddRedundantSemiJoinRule.java | 34 +-
.../calcite/rel/rules/JoinAssociateRule.java | 67 +-
.../calcite/rel/rules/JoinCommuteRule.java | 72 +-
.../rel/rules/JoinExtractFilterRule.java | 36 +-
.../rel/rules/JoinProjectTransposeRule.java | 115 +-
.../rel/rules/JoinPushThroughJoinRule.java | 73 +-
.../rules/JoinPushTransitivePredicatesRule.java | 47 +-
.../calcite/rel/rules/JoinToCorrelatorRule.java | 54 +-
.../calcite/rel/rules/JoinToMultiJoinRule.java | 173 +-
.../rel/rules/JoinUnionTransposeRule.java | 52 +-
.../apache/calcite/rel/rules/LoptJoinTree.java | 17 +-
.../apache/calcite/rel/rules/LoptMultiJoin.java | 68 +-
.../calcite/rel/rules/LoptOptimizeJoinRule.java | 101 +-
.../rel/rules/LoptSemiJoinOptimizer.java | 92 +-
.../org/apache/calcite/rel/rules/MultiJoin.java | 55 +-
.../rel/rules/MultiJoinOptimizeBushyRule.java | 67 +-
.../rules/MultiJoinProjectTransposeRule.java | 106 +-
.../calcite/rel/rules/ProjectCalcMergeRule.java | 61 +-
.../rel/rules/ProjectFilterTransposeRule.java | 44 +-
.../rel/rules/ProjectJoinTransposeRule.java | 43 +-
.../calcite/rel/rules/ProjectMergeRule.java | 72 +-
.../rel/rules/ProjectMultiJoinMergeRule.java | 47 +-
.../calcite/rel/rules/ProjectRemoveRule.java | 68 +-
.../rel/rules/ProjectSetOpTransposeRule.java | 58 +-
.../rel/rules/ProjectSortTransposeRule.java | 43 +-
.../calcite/rel/rules/ProjectTableRule.java | 89 +-
.../calcite/rel/rules/ProjectToCalcRule.java | 37 +-
.../calcite/rel/rules/ProjectToWindowRule.java | 133 +-
.../apache/calcite/rel/rules/PushProjector.java | 57 +-
.../calcite/rel/rules/ReduceDecimalsRule.java | 109 +-
.../rel/rules/ReduceExpressionsRule.java | 118 +-
.../rel/rules/SemiJoinFilterTransposeRule.java | 56 +-
.../rel/rules/SemiJoinJoinTransposeRule.java | 61 +-
.../rel/rules/SemiJoinProjectTransposeRule.java | 95 +-
.../calcite/rel/rules/SemiJoinRemoveRule.java | 37 +-
.../apache/calcite/rel/rules/SemiJoinRule.java | 63 +-
.../rel/rules/SortProjectTransposeRule.java | 55 +-
.../calcite/rel/rules/SortRemoveRule.java | 37 +-
.../apache/calcite/rel/rules/TableScanRule.java | 27 +-
.../calcite/rel/rules/UnionEliminatorRule.java | 13 +-
.../calcite/rel/rules/UnionMergeRule.java | 71 +-
.../calcite/rel/rules/UnionToDistinctRule.java | 25 +-
.../calcite/rel/rules/ValuesReduceRule.java | 97 +-
.../apache/calcite/rel/rules/package-info.java | 30 +-
.../apache/calcite/rel/type/RelCrossType.java | 18 +-
.../apache/calcite/rel/type/RelDataType.java | 18 +-
.../rel/type/RelDataTypeComparability.java | 4 +-
.../calcite/rel/type/RelDataTypeFactory.java | 24 +-
.../rel/type/RelDataTypeFactoryImpl.java | 55 +-
.../calcite/rel/type/RelDataTypeFamily.java | 2 +-
.../calcite/rel/type/RelDataTypeField.java | 6 +-
.../calcite/rel/type/RelDataTypeFieldImpl.java | 10 +-
.../calcite/rel/type/RelDataTypeImpl.java | 39 +-
.../rel/type/RelDataTypePrecedenceList.java | 2 +-
.../calcite/rel/type/RelDataTypeSystem.java | 6 +-
.../calcite/rel/type/RelDataTypeSystemImpl.java | 7 +-
.../calcite/rel/type/RelProtoDataType.java | 8 +-
.../apache/calcite/rel/type/RelRecordType.java | 21 +-
.../apache/calcite/rel/type/package-info.java | 2 +-
.../java/org/apache/calcite/rex/RexAction.java | 2 +-
.../java/org/apache/calcite/rex/RexBuilder.java | 67 +-
.../java/org/apache/calcite/rex/RexCall.java | 21 +-
.../org/apache/calcite/rex/RexCallBinding.java | 23 +-
.../java/org/apache/calcite/rex/RexChecker.java | 27 +-
.../java/org/apache/calcite/rex/RexCopier.java | 2 +-
.../apache/calcite/rex/RexCorrelVariable.java | 9 +-
.../org/apache/calcite/rex/RexDynamicParam.java | 6 +-
.../org/apache/calcite/rex/RexExecutable.java | 24 +-
.../org/apache/calcite/rex/RexExecutorImpl.java | 50 +-
.../org/apache/calcite/rex/RexFieldAccess.java | 7 +-
.../apache/calcite/rex/RexFieldCollation.java | 15 +-
.../org/apache/calcite/rex/RexInputRef.java | 14 +-
.../java/org/apache/calcite/rex/RexLiteral.java | 61 +-
.../org/apache/calcite/rex/RexLocalRef.java | 13 +-
.../org/apache/calcite/rex/RexMultisetUtil.java | 13 +-
.../java/org/apache/calcite/rex/RexNode.java | 18 +-
.../java/org/apache/calcite/rex/RexOver.java | 18 +-
.../java/org/apache/calcite/rex/RexPattern.java | 2 +-
.../calcite/rex/RexPermutationShuttle.java | 4 +-
.../calcite/rex/RexPermuteInputsShuttle.java | 22 +-
.../java/org/apache/calcite/rex/RexProgram.java | 59 +-
.../apache/calcite/rex/RexProgramBuilder.java | 39 +-
.../org/apache/calcite/rex/RexRangeRef.java | 15 +-
.../java/org/apache/calcite/rex/RexShuttle.java | 14 +-
.../java/org/apache/calcite/rex/RexSlot.java | 9 +-
.../apache/calcite/rex/RexSqlConvertlet.java | 4 +-
.../calcite/rex/RexSqlConvertletTable.java | 2 +-
.../rex/RexSqlReflectiveConvertletTable.java | 11 +-
.../rex/RexSqlStandardConvertletTable.java | 20 +-
.../calcite/rex/RexToSqlNodeConverter.java | 6 +-
.../calcite/rex/RexToSqlNodeConverterImpl.java | 13 +-
.../org/apache/calcite/rex/RexTransformer.java | 17 +-
.../java/org/apache/calcite/rex/RexUtil.java | 63 +-
.../org/apache/calcite/rex/RexVariable.java | 4 +-
.../java/org/apache/calcite/rex/RexVisitor.java | 6 +-
.../org/apache/calcite/rex/RexVisitorImpl.java | 4 +-
.../java/org/apache/calcite/rex/RexWindow.java | 13 +-
.../org/apache/calcite/rex/RexWindowBound.java | 73 +-
.../org/apache/calcite/rex/package-info.java | 72 +-
.../org/apache/calcite/rules/package-info.java | 23 -
.../apache/calcite/runtime/AbstractCursor.java | 119 +-
.../apache/calcite/runtime/ArrayComparator.java | 2 +-
.../calcite/runtime/ArrayEnumeratorCursor.java | 8 +-
.../apache/calcite/runtime/BinarySearch.java | 10 +-
.../org/apache/calcite/runtime/Bindable.java | 7 +-
.../runtime/CalciteContextException.java | 23 +-
.../calcite/runtime/CalciteException.java | 20 +-
.../apache/calcite/runtime/CalciteResource.java | 94 +-
.../org/apache/calcite/runtime/Enumerables.java | 22 +-
.../calcite/runtime/EnumeratorCursor.java | 10 +-
.../org/apache/calcite/runtime/Feature.java | 6 +-
.../org/apache/calcite/runtime/FlatLists.java | 12 +-
.../java/org/apache/calcite/runtime/Hook.java | 2 +-
.../java/org/apache/calcite/runtime/Like.java | 2 +-
.../calcite/runtime/ObjectEnumeratorCursor.java | 8 +-
.../calcite/runtime/RecordEnumeratorCursor.java | 8 +-
.../calcite/runtime/ResultSetEnumerable.java | 22 +-
.../apache/calcite/runtime/SortedMultiMap.java | 10 +-
.../java/org/apache/calcite/runtime/Spacer.java | 2 +-
.../java/org/apache/calcite/runtime/Spaces.java | 12 +-
.../apache/calcite/runtime/SqlFunctions.java | 36 +-
.../java/org/apache/calcite/runtime/Typed.java | 4 +-
.../java/org/apache/calcite/runtime/Unit.java | 2 +-
.../org/apache/calcite/runtime/Utilities.java | 2 +-
.../apache/calcite/runtime/package-info.java | 2 +-
.../calcite/schema/AggregateFunction.java | 6 +-
.../apache/calcite/schema/FilterableTable.java | 8 +-
.../org/apache/calcite/schema/Function.java | 2 +-
.../calcite/schema/FunctionParameter.java | 6 +-
.../schema/ImplementableAggFunction.java | 12 +-
.../calcite/schema/ImplementableFunction.java | 10 +-
.../java/org/apache/calcite/schema/Member.java | 11 +-
.../apache/calcite/schema/ModifiableTable.java | 16 +-
.../schema/ProjectableFilterableTable.java | 12 +-
.../apache/calcite/schema/QueryableTable.java | 8 +-
.../apache/calcite/schema/ScalarFunction.java | 6 +-
.../apache/calcite/schema/ScannableTable.java | 5 +-
.../java/org/apache/calcite/schema/Schema.java | 11 +-
.../apache/calcite/schema/SchemaFactory.java | 6 +-
.../org/apache/calcite/schema/SchemaPlus.java | 4 +-
.../java/org/apache/calcite/schema/Schemas.java | 222 +-
.../calcite/schema/SemiMutableSchema.java | 2 +-
.../org/apache/calcite/schema/Statistic.java | 2 +-
.../org/apache/calcite/schema/Statistics.java | 7 +-
.../java/org/apache/calcite/schema/Table.java | 14 +-
.../org/apache/calcite/schema/TableFactory.java | 4 +-
.../apache/calcite/schema/TableFunction.java | 10 +-
.../org/apache/calcite/schema/TableMacro.java | 2 +-
.../calcite/schema/TranslatableTable.java | 8 +-
.../calcite/schema/impl/AbstractSchema.java | 26 +-
.../calcite/schema/impl/AbstractTable.java | 7 +-
.../schema/impl/AbstractTableQueryable.java | 18 +-
.../schema/impl/AggregateFunctionImpl.java | 18 +-
.../calcite/schema/impl/DelegatingSchema.java | 17 +-
.../schema/impl/MaterializedViewTable.java | 47 +-
.../schema/impl/ReflectiveFunctionBase.java | 12 +-
.../calcite/schema/impl/ScalarFunctionImpl.java | 32 +-
.../apache/calcite/schema/impl/StarTable.java | 33 +-
.../calcite/schema/impl/TableFunctionImpl.java | 37 +-
.../calcite/schema/impl/TableMacroImpl.java | 10 +-
.../apache/calcite/schema/impl/ViewTable.java | 51 +-
.../calcite/schema/impl/package-info.java | 23 +
.../org/apache/calcite/schema/package-info.java | 27 +
.../apache/calcite/server/CalciteServer.java | 10 +-
.../calcite/server/CalciteServerStatement.java | 14 +-
.../org/apache/calcite/server/package-info.java | 2 +-
.../calcite/sql/ExplicitOperatorBinding.java | 17 +-
.../apache/calcite/sql/JoinConditionType.java | 4 +-
.../java/org/apache/calcite/sql/JoinType.java | 4 +-
.../calcite/sql/SqlAbstractDateTimeLiteral.java | 28 +-
.../calcite/sql/SqlAbstractStringLiteral.java | 8 +-
.../org/apache/calcite/sql/SqlAccessEnum.java | 2 +-
.../org/apache/calcite/sql/SqlAccessType.java | 4 +-
.../org/apache/calcite/sql/SqlAggFunction.java | 13 +-
.../org/apache/calcite/sql/SqlAsOperator.java | 21 +-
.../org/apache/calcite/sql/SqlBasicCall.java | 11 +-
.../apache/calcite/sql/SqlBinaryOperator.java | 27 +-
.../calcite/sql/SqlBinaryStringLiteral.java | 12 +-
.../java/org/apache/calcite/sql/SqlCall.java | 21 +-
.../org/apache/calcite/sql/SqlCallBinding.java | 28 +-
.../calcite/sql/SqlCharStringLiteral.java | 14 +-
.../org/apache/calcite/sql/SqlCollation.java | 36 +-
.../org/apache/calcite/sql/SqlDataTypeSpec.java | 30 +-
.../org/apache/calcite/sql/SqlDateLiteral.java | 13 +-
.../java/org/apache/calcite/sql/SqlDelete.java | 12 +-
.../java/org/apache/calcite/sql/SqlDialect.java | 24 +-
.../org/apache/calcite/sql/SqlDynamicParam.java | 10 +-
.../java/org/apache/calcite/sql/SqlExplain.java | 11 +-
.../org/apache/calcite/sql/SqlExplainLevel.java | 4 +-
.../org/apache/calcite/sql/SqlFunction.java | 25 +-
.../apache/calcite/sql/SqlFunctionCategory.java | 4 +-
.../calcite/sql/SqlFunctionalOperator.java | 6 +-
.../org/apache/calcite/sql/SqlIdentifier.java | 23 +-
.../apache/calcite/sql/SqlInfixOperator.java | 9 +-
.../java/org/apache/calcite/sql/SqlInsert.java | 11 +-
.../apache/calcite/sql/SqlInsertKeyword.java | 2 +-
.../apache/calcite/sql/SqlInternalOperator.java | 6 +-
.../apache/calcite/sql/SqlIntervalLiteral.java | 8 +-
.../calcite/sql/SqlIntervalQualifier.java | 85 +-
.../apache/calcite/sql/SqlJdbcFunctionCall.java | 29 +-
.../java/org/apache/calcite/sql/SqlJoin.java | 12 +-
.../java/org/apache/calcite/sql/SqlKind.java | 6 +-
.../java/org/apache/calcite/sql/SqlLiteral.java | 41 +-
.../java/org/apache/calcite/sql/SqlMerge.java | 18 +-
.../java/org/apache/calcite/sql/SqlNode.java | 43 +-
.../org/apache/calcite/sql/SqlNodeList.java | 20 +-
.../apache/calcite/sql/SqlNullSemantics.java | 2 +-
.../apache/calcite/sql/SqlNumericLiteral.java | 13 +-
.../calcite/sql/SqlOperandCountRange.java | 2 +-
.../org/apache/calcite/sql/SqlOperator.java | 53 +-
.../apache/calcite/sql/SqlOperatorBinding.java | 20 +-
.../apache/calcite/sql/SqlOperatorTable.java | 4 +-
.../java/org/apache/calcite/sql/SqlOrderBy.java | 15 +-
.../org/apache/calcite/sql/SqlOverOperator.java | 29 +-
.../apache/calcite/sql/SqlPostfixOperator.java | 16 +-
.../apache/calcite/sql/SqlPrefixOperator.java | 18 +-
.../calcite/sql/SqlProcedureCallOperator.java | 10 +-
.../org/apache/calcite/sql/SqlRankFunction.java | 19 +-
.../org/apache/calcite/sql/SqlSampleSpec.java | 10 +-
.../java/org/apache/calcite/sql/SqlSelect.java | 14 +-
.../apache/calcite/sql/SqlSelectKeyword.java | 4 +-
.../apache/calcite/sql/SqlSelectOperator.java | 15 +-
.../org/apache/calcite/sql/SqlSetOperator.java | 11 +-
.../org/apache/calcite/sql/SqlSetOption.java | 25 +-
.../apache/calcite/sql/SqlSpecialOperator.java | 20 +-
.../org/apache/calcite/sql/SqlStateCodes.java | 7 +-
.../java/org/apache/calcite/sql/SqlSyntax.java | 7 +-
.../org/apache/calcite/sql/SqlTimeLiteral.java | 10 +-
.../apache/calcite/sql/SqlTimestampLiteral.java | 10 +-
.../apache/calcite/sql/SqlUnnestOperator.java | 8 +-
.../calcite/sql/SqlUnresolvedFunction.java | 17 +-
.../java/org/apache/calcite/sql/SqlUpdate.java | 17 +-
.../java/org/apache/calcite/sql/SqlUtil.java | 64 +-
.../apache/calcite/sql/SqlValuesOperator.java | 2 +-
.../java/org/apache/calcite/sql/SqlWindow.java | 46 +-
.../java/org/apache/calcite/sql/SqlWith.java | 26 +-
.../org/apache/calcite/sql/SqlWithItem.java | 18 +-
.../java/org/apache/calcite/sql/SqlWriter.java | 13 +-
.../apache/calcite/sql/advise/SqlAdvisor.java | 45 +-
.../sql/advise/SqlAdvisorGetHintsFunction.java | 43 +-
.../calcite/sql/advise/SqlAdvisorHint.java | 14 +-
.../calcite/sql/advise/SqlAdvisorValidator.java | 44 +-
.../calcite/sql/advise/SqlSimpleParser.java | 11 +-
.../apache/calcite/sql/advise/package-info.java | 4 +-
.../sql/fun/SqlAbstractTimeFunction.java | 21 +-
.../sql/fun/SqlArrayQueryConstructor.java | 5 +-
.../sql/fun/SqlArrayValueConstructor.java | 13 +-
.../calcite/sql/fun/SqlAvgAggFunction.java | 17 +-
.../calcite/sql/fun/SqlBetweenOperator.java | 43 +-
.../org/apache/calcite/sql/fun/SqlCase.java | 15 +-
.../apache/calcite/sql/fun/SqlCaseOperator.java | 38 +-
.../apache/calcite/sql/fun/SqlCastFunction.java | 43 +-
.../apache/calcite/sql/fun/SqlCeilFunction.java | 13 +-
.../calcite/sql/fun/SqlCoalesceFunction.java | 20 +-
.../sql/fun/SqlCollectionTableOperator.java | 12 +-
.../sql/fun/SqlColumnListConstructor.java | 11 +-
.../calcite/sql/fun/SqlConvertFunction.java | 8 +-
.../calcite/sql/fun/SqlCountAggFunction.java | 22 +-
.../calcite/sql/fun/SqlCovarAggFunction.java | 20 +-
.../calcite/sql/fun/SqlCurrentDateFunction.java | 16 +-
.../calcite/sql/fun/SqlCursorConstructor.java | 16 +-
.../sql/fun/SqlDatetimeSubtractionOperator.java | 16 +-
.../calcite/sql/fun/SqlExtractFunction.java | 13 +-
.../sql/fun/SqlFirstLastValueAggFunction.java | 17 +-
.../calcite/sql/fun/SqlFloorFunction.java | 13 +-
.../sql/fun/SqlHistogramAggFunction.java | 16 +-
.../apache/calcite/sql/fun/SqlInOperator.java | 33 +-
.../apache/calcite/sql/fun/SqlItemOperator.java | 43 +-
.../calcite/sql/fun/SqlLeadLagAggFunction.java | 34 +-
.../apache/calcite/sql/fun/SqlLikeOperator.java | 34 +-
.../sql/fun/SqlLiteralChainOperator.java | 49 +-
.../calcite/sql/fun/SqlMapQueryConstructor.java | 4 +-
.../calcite/sql/fun/SqlMapValueConstructor.java | 23 +-
.../calcite/sql/fun/SqlMinMaxAggFunction.java | 16 +-
.../sql/fun/SqlMonotonicBinaryOperator.java | 16 +-
.../sql/fun/SqlMonotonicUnaryFunction.java | 14 +-
.../sql/fun/SqlMultisetMemberOfOperator.java | 16 +-
.../sql/fun/SqlMultisetQueryConstructor.java | 25 +-
.../calcite/sql/fun/SqlMultisetSetOperator.java | 13 +-
.../sql/fun/SqlMultisetValueConstructor.java | 21 +-
.../apache/calcite/sql/fun/SqlNewOperator.java | 9 +-
.../calcite/sql/fun/SqlNtileAggFunction.java | 18 +-
.../calcite/sql/fun/SqlNullifFunction.java | 19 +-
.../calcite/sql/fun/SqlOverlapsOperator.java | 23 +-
.../calcite/sql/fun/SqlOverlayFunction.java | 12 +-
.../calcite/sql/fun/SqlPositionFunction.java | 12 +-
.../apache/calcite/sql/fun/SqlRowOperator.java | 19 +-
.../sql/fun/SqlSingleValueAggFunction.java | 16 +-
.../calcite/sql/fun/SqlStdOperatorTable.java | 50 +-
.../sql/fun/SqlStringContextVariable.java | 14 +-
.../calcite/sql/fun/SqlSubstringFunction.java | 36 +-
.../calcite/sql/fun/SqlSumAggFunction.java | 16 +-
.../sql/fun/SqlSumEmptyIsZeroAggFunction.java | 17 +-
.../calcite/sql/fun/SqlThrowOperator.java | 10 +-
.../apache/calcite/sql/fun/SqlTrimFunction.java | 30 +-
.../apache/calcite/sql/fun/package-info.java | 6 +-
.../org/apache/calcite/sql/package-info.java | 96 +-
.../sql/parser/SqlAbstractParserImpl.java | 34 +-
.../calcite/sql/parser/SqlParseException.java | 19 +-
.../apache/calcite/sql/parser/SqlParser.java | 31 +-
.../sql/parser/SqlParserImplFactory.java | 11 +-
.../apache/calcite/sql/parser/SqlParserPos.java | 11 +-
.../calcite/sql/parser/SqlParserUtil.java | 53 +-
.../calcite/sql/parser/impl/package-info.java | 4 +-
.../apache/calcite/sql/parser/package-info.java | 2 +-
.../calcite/sql/pretty/SqlFormatOptions.java | 2 +-
.../calcite/sql/pretty/SqlPrettyWriter.java | 60 +-
.../apache/calcite/sql/pretty/package-info.java | 2 +-
.../calcite/sql/type/AbstractSqlType.java | 12 +-
.../apache/calcite/sql/type/ArraySqlType.java | 6 +-
.../sql/type/AssignableOperandTypeChecker.java | 18 +-
.../apache/calcite/sql/type/BasicSqlType.java | 11 +-
.../sql/type/ComparableOperandTypeChecker.java | 17 +-
.../sql/type/CompositeOperandTypeChecker.java | 18 +-
.../sql/type/CursorReturnTypeInference.java | 6 +-
.../sql/type/ExplicitOperandTypeInference.java | 9 +-
.../sql/type/ExplicitReturnTypeInference.java | 8 +-
.../apache/calcite/sql/type/ExtraSqlTypes.java | 2 +-
.../sql/type/FamilyOperandTypeChecker.java | 19 +-
.../org/apache/calcite/sql/type/InferTypes.java | 18 +-
.../calcite/sql/type/IntervalSqlType.java | 18 +-
.../sql/type/JavaToSqlTypeConversionRules.java | 20 +-
.../sql/type/LiteralOperandTypeChecker.java | 12 +-
.../org/apache/calcite/sql/type/MapSqlType.java | 12 +-
.../sql/type/MatchReturnTypeInference.java | 10 +-
.../sql/type/MultisetOperandTypeChecker.java | 12 +-
.../calcite/sql/type/MultisetSqlType.java | 6 +-
.../apache/calcite/sql/type/ObjectSqlType.java | 10 +-
.../apache/calcite/sql/type/OperandTypes.java | 28 +-
.../calcite/sql/type/OperandsTypeChecking.java | 5 +-
.../sql/type/OrdinalReturnTypeInference.java | 7 +-
.../apache/calcite/sql/type/ReturnTypes.java | 45 +-
.../sql/type/SameOperandTypeChecker.java | 25 +-
.../sql/type/SetopOperandTypeChecker.java | 21 +-
.../calcite/sql/type/SqlOperandCountRanges.java | 5 +-
.../calcite/sql/type/SqlOperandTypeChecker.java | 10 +-
.../sql/type/SqlOperandTypeInference.java | 6 +-
.../sql/type/SqlReturnTypeInference.java | 12 +-
.../sql/type/SqlReturnTypeInferenceChain.java | 8 +-
.../sql/type/SqlSingleOperandTypeChecker.java | 5 +-
.../sql/type/SqlTypeAssignmentRules.java | 9 +-
.../sql/type/SqlTypeExplicitPrecedenceList.java | 14 +-
.../calcite/sql/type/SqlTypeFactoryImpl.java | 19 +-
.../apache/calcite/sql/type/SqlTypeFamily.java | 12 +-
.../apache/calcite/sql/type/SqlTypeName.java | 32 +-
.../calcite/sql/type/SqlTypeTransform.java | 10 +-
.../sql/type/SqlTypeTransformCascade.java | 10 +-
.../calcite/sql/type/SqlTypeTransforms.java | 17 +-
.../apache/calcite/sql/type/SqlTypeUtil.java | 58 +-
.../type/TableFunctionReturnTypeInference.java | 18 +-
.../apache/calcite/sql/type/package-info.java | 2 +-
.../sql/util/ChainedSqlOperatorTable.java | 11 +-
.../calcite/sql/util/ListSqlOperatorTable.java | 12 +-
.../sql/util/ReflectiveSqlOperatorTable.java | 32 +-
.../calcite/sql/util/SqlBasicVisitor.java | 29 +-
.../org/apache/calcite/sql/util/SqlBuilder.java | 13 +-
.../org/apache/calcite/sql/util/SqlShuttle.java | 18 +-
.../org/apache/calcite/sql/util/SqlString.java | 13 +-
.../org/apache/calcite/sql/util/SqlVisitor.java | 18 +-
.../apache/calcite/sql/util/package-info.java | 2 +-
.../calcite/sql/validate/AbstractNamespace.java | 18 +-
.../apache/calcite/sql/validate/AggChecker.java | 15 +-
.../apache/calcite/sql/validate/AggFinder.java | 23 +-
.../calcite/sql/validate/AggregatingScope.java | 4 +-
.../sql/validate/AggregatingSelectScope.java | 14 +-
.../calcite/sql/validate/AliasNamespace.java | 21 +-
.../calcite/sql/validate/CollectNamespace.java | 8 +-
.../calcite/sql/validate/CollectScope.java | 5 +-
.../sql/validate/DelegatingNamespace.java | 10 +-
.../calcite/sql/validate/DelegatingScope.java | 26 +-
.../DelegatingSqlValidatorCatalogReader.java | 10 +-
.../validate/DelegatingSqlValidatorTable.java | 10 +-
.../apache/calcite/sql/validate/EmptyScope.java | 17 +-
.../calcite/sql/validate/FieldNamespace.java | 6 +-
.../sql/validate/IdentifierNamespace.java | 24 +-
.../calcite/sql/validate/JoinNamespace.java | 8 +-
.../apache/calcite/sql/validate/JoinScope.java | 6 +-
.../apache/calcite/sql/validate/ListScope.java | 15 +-
.../calcite/sql/validate/OrderByScope.java | 12 +-
.../apache/calcite/sql/validate/OverScope.java | 9 +-
.../sql/validate/ParameterNamespace.java | 6 +-
.../calcite/sql/validate/ParameterScope.java | 13 +-
.../sql/validate/ProcedureNamespace.java | 10 +-
.../calcite/sql/validate/SelectNamespace.java | 9 +-
.../calcite/sql/validate/SelectScope.java | 22 +-
.../calcite/sql/validate/SetopNamespace.java | 12 +-
.../calcite/sql/validate/SqlConformance.java | 2 +-
.../sql/validate/SqlIdentifierMoniker.java | 8 +-
.../apache/calcite/sql/validate/SqlMoniker.java | 6 +-
.../sql/validate/SqlMonikerComparator.java | 8 +-
.../calcite/sql/validate/SqlMonikerImpl.java | 12 +-
.../calcite/sql/validate/SqlMonikerType.java | 2 +-
.../calcite/sql/validate/SqlMonotonicity.java | 2 +-
.../calcite/sql/validate/SqlScopedShuttle.java | 10 +-
.../sql/validate/SqlUserDefinedAggFunction.java | 25 +-
.../sql/validate/SqlUserDefinedFunction.java | 20 +-
.../validate/SqlUserDefinedTableFunction.java | 25 +-
.../sql/validate/SqlUserDefinedTableMacro.java | 65 +-
.../calcite/sql/validate/SqlValidator.java | 106 +-
.../sql/validate/SqlValidatorCatalogReader.java | 9 +-
.../sql/validate/SqlValidatorException.java | 20 +-
.../calcite/sql/validate/SqlValidatorImpl.java | 138 +-
.../sql/validate/SqlValidatorNamespace.java | 36 +-
.../calcite/sql/validate/SqlValidatorScope.java | 31 +-
.../calcite/sql/validate/SqlValidatorTable.java | 8 +-
.../calcite/sql/validate/SqlValidatorUtil.java | 54 +-
.../sql/validate/SqlValidatorWithHints.java | 16 +-
.../sql/validate/TableConstructorNamespace.java | 10 +-
.../calcite/sql/validate/TableNamespace.java | 9 +-
.../calcite/sql/validate/UnnestNamespace.java | 11 +-
.../calcite/sql/validate/WithItemNamespace.java | 19 +-
.../calcite/sql/validate/WithNamespace.java | 10 +-
.../apache/calcite/sql/validate/WithScope.java | 14 +-
.../calcite/sql/validate/package-info.java | 2 +-
.../calcite/sql2rel/DefaultValueFactory.java | 12 +-
.../sql2rel/ReflectiveConvertletTable.java | 24 +-
.../apache/calcite/sql2rel/RelDecorrelator.java | 576 +--
.../apache/calcite/sql2rel/RelFieldTrimmer.java | 139 +-
.../sql2rel/RelStructuredTypeFlattener.java | 167 +-
.../calcite/sql2rel/SqlNodeToRexConverter.java | 14 +-
.../sql2rel/SqlNodeToRexConverterImpl.java | 37 +-
.../apache/calcite/sql2rel/SqlRexContext.java | 21 +-
.../calcite/sql2rel/SqlRexConvertlet.java | 7 +-
.../calcite/sql2rel/SqlRexConvertletTable.java | 4 +-
.../calcite/sql2rel/SqlToRelConverter.java | 405 ++-
.../sql2rel/StandardConvertletTable.java | 83 +-
.../calcite/sql2rel/SubqueryConverter.java | 6 +-
.../apache/calcite/sql2rel/package-info.java | 2 +-
.../apache/calcite/tools/FrameworkConfig.java | 25 +-
.../org/apache/calcite/tools/Frameworks.java | 67 +-
.../java/org/apache/calcite/tools/Planner.java | 20 +-
.../java/org/apache/calcite/tools/Program.java | 10 +-
.../java/org/apache/calcite/tools/Programs.java | 157 +-
.../calcite/tools/RelConversionException.java | 4 +-
.../java/org/apache/calcite/tools/RuleSet.java | 4 +-
.../java/org/apache/calcite/tools/RuleSets.java | 12 +-
.../calcite/tools/ValidationException.java | 2 +-
.../org/apache/calcite/tools/package-info.java | 2 +-
.../calcite/util/BarfingInvocationHandler.java | 6 +-
.../org/apache/calcite/util/BasicDatetime.java | 10 +-
.../java/org/apache/calcite/util/Benchmark.java | 10 +-
.../java/org/apache/calcite/util/BitSets.java | 12 +-
.../java/org/apache/calcite/util/BitString.java | 19 +-
.../main/java/org/apache/calcite/util/Bug.java | 4 +-
.../org/apache/calcite/util/BuiltInMethod.java | 94 +-
.../calcite/util/CalciteParserException.java | 11 +-
.../calcite/util/CalciteValidatorException.java | 11 +-
.../org/apache/calcite/util/CancelFlag.java | 2 +-
.../org/apache/calcite/util/CastingList.java | 11 +-
.../java/org/apache/calcite/util/ChunkList.java | 23 +-
.../apache/calcite/util/ClosableAllocation.java | 2 +-
.../calcite/util/ClosableAllocationOwner.java | 2 +-
.../org/apache/calcite/util/Compatible.java | 15 +-
.../apache/calcite/util/CompatibleGuava11.java | 80 +-
.../org/apache/calcite/util/CompositeList.java | 7 +-
.../org/apache/calcite/util/CompositeMap.java | 7 +-
.../util/CompoundClosableAllocation.java | 6 +-
.../calcite/util/ControlFlowException.java | 2 +-
.../org/apache/calcite/util/ConversionUtil.java | 12 +-
.../org/apache/calcite/util/DateTimeUtil.java | 10 +-
.../util/DelegatingInvocationHandler.java | 6 +-
.../org/apache/calcite/util/Filterator.java | 13 +-
.../java/org/apache/calcite/util/Glossary.java | 2 +-
.../java/org/apache/calcite/util/Holder.java | 2 +-
.../apache/calcite/util/ImmutableIntList.java | 43 +-
.../calcite/util/ImmutableNullableList.java | 9 +-
.../java/org/apache/calcite/util/IntList.java | 7 +-
.../apache/calcite/util/IntegerIntervalSet.java | 18 +-
.../org/apache/calcite/util/JsonBuilder.java | 6 +-
.../java/org/apache/calcite/util/NlsString.java | 30 +-
.../org/apache/calcite/util/NumberUtil.java | 9 +-
.../main/java/org/apache/calcite/util/Pair.java | 27 +-
.../calcite/util/PartiallyOrderedSet.java | 47 +-
.../org/apache/calcite/util/Permutation.java | 19 +-
.../org/apache/calcite/util/ReflectUtil.java | 37 +-
.../calcite/util/ReflectiveVisitDispatcher.java | 14 +-
.../apache/calcite/util/ReflectiveVisitor.java | 6 +-
.../java/org/apache/calcite/util/RhBase64.java | 23 +-
.../apache/calcite/util/SaffronProperties.java | 42 +-
.../calcite/util/SerializableCharset.java | 14 +-
.../org/apache/calcite/util/StackWriter.java | 15 +-
.../java/org/apache/calcite/util/Stacks.java | 2 +-
.../java/org/apache/calcite/util/Static.java | 34 +-
.../java/org/apache/calcite/util/Template.java | 11 +-
.../calcite/util/UnmodifiableArrayList.java | 6 +-
.../main/java/org/apache/calcite/util/Util.java | 226 +-
.../java/org/apache/calcite/util/XmlOutput.java | 14 +-
.../org/apache/calcite/util/ZonelessDate.java | 13 +-
.../apache/calcite/util/ZonelessDatetime.java | 23 +-
.../org/apache/calcite/util/ZonelessTime.java | 7 +-
.../apache/calcite/util/ZonelessTimestamp.java | 9 +-
.../util/graph/BreadthFirstIterator.java | 2 +-
.../calcite/util/graph/CycleDetector.java | 3 +-
.../util/graph/DefaultDirectedGraph.java | 17 +-
.../apache/calcite/util/graph/DefaultEdge.java | 8 +-
.../calcite/util/graph/DepthFirstIterator.java | 8 +-
.../calcite/util/graph/DirectedGraph.java | 2 +-
.../org/apache/calcite/util/graph/Graphs.java | 12 +-
.../util/graph/TopologicalOrderIterator.java | 9 +-
.../apache/calcite/util/graph/package-info.java | 2 +-
.../calcite/util/javac/JaninoCompiler.java | 22 +-
.../apache/calcite/util/javac/JavaCompiler.java | 2 +-
.../calcite/util/javac/JavaCompilerArgs.java | 14 +-
.../apache/calcite/util/javac/package-info.java | 2 +-
.../util/mapping/AbstractSourceMapping.java | 8 +-
.../util/mapping/AbstractTargetMapping.java | 6 +-
.../apache/calcite/util/mapping/IntPair.java | 2 +-
.../apache/calcite/util/mapping/Mapping.java | 8 +-
.../calcite/util/mapping/MappingType.java | 22 +-
.../apache/calcite/util/mapping/Mappings.java | 53 +-
.../calcite/util/mapping/package-info.java | 2 +-
.../org/apache/calcite/util/package-info.java | 2 +-
.../calcite/util/trace/CalciteLogger.java | 46 +-
.../calcite/util/trace/CalciteTimingTracer.java | 16 +-
.../apache/calcite/util/trace/CalciteTrace.java | 76 +-
.../apache/calcite/util/trace/package-info.java | 2 +-
.../resources/META-INF/services/java.sql.Driver | 2 +-
.../calcite/runtime/CalciteResource.properties | 6 +-
.../calcite/adapter/clone/ArrayTableTest.java | 21 +-
.../calcite/adapter/generate/RangeTable.java | 32 +-
.../examples/foodmart/java/JdbcExample.java | 32 +-
.../calcite/plan/RelOptPlanReaderTest.java | 44 +-
.../org/apache/calcite/plan/RelOptUtilTest.java | 20 +-
.../org/apache/calcite/plan/RelWriterTest.java | 76 +-
.../plan/volcano/VolcanoPlannerTest.java | 87 +-
.../plan/volcano/VolcanoPlannerTraitTest.java | 77 +-
.../org/apache/calcite/rex/RexExecutorTest.java | 47 +-
.../calcite/runtime/BinarySearchTest.java | 4 +-
.../apache/calcite/runtime/EnumerablesTest.java | 10 +-
.../calcite/sql/parser/SqlParserTest.java | 1140 +++---
.../calcite/sql/parser/SqlUnParserTest.java | 2 +-
.../calcite/sql/test/DefaultSqlTestFactory.java | 32 +-
.../sql/test/DelegatingSqlTestFactory.java | 23 +-
.../apache/calcite/sql/test/SqlAdvisorTest.java | 271 +-
.../calcite/sql/test/SqlOperatorBaseTest.java | 169 +-
.../calcite/sql/test/SqlOperatorTest.java | 6 +-
.../calcite/sql/test/SqlPrettyWriterTest.java | 75 +-
.../apache/calcite/sql/test/SqlTestFactory.java | 14 +-
.../org/apache/calcite/sql/test/SqlTester.java | 22 +-
.../apache/calcite/sql/test/SqlTesterImpl.java | 79 +-
.../org/apache/calcite/sql/test/SqlTests.java | 33 +-
.../calcite/sql/test/SqlTypeNameTest.java | 11 +-
.../apache/calcite/sql/test/package-info.java | 2 +-
.../org/apache/calcite/test/CalciteAssert.java | 327 +-
.../calcite/test/CalciteResourceTest.java | 21 +-
.../calcite/test/CalciteSqlOperatorTest.java | 25 +-
.../org/apache/calcite/test/CalciteSuite.java | 53 +-
.../org/apache/calcite/test/DiffRepository.java | 51 +-
.../org/apache/calcite/test/DiffTestCase.java | 37 +-
.../calcite/test/ExceptionMessageTest.java | 23 +-
.../org/apache/calcite/test/FilteratorTest.java | 18 +-
.../org/apache/calcite/test/FoodmartTest.java | 39 +-
.../org/apache/calcite/test/HepPlannerTest.java | 46 +-
.../apache/calcite/test/InterpreterTest.java | 38 +-
.../apache/calcite/test/JdbcAdapterTest.java | 39 +-
.../test/JdbcFrontJdbcBackLinqMiddleTest.java | 121 +-
.../calcite/test/JdbcFrontJdbcBackTest.java | 49 +-
.../calcite/test/JdbcFrontLinqBackTest.java | 120 +-
.../java/org/apache/calcite/test/JdbcTest.java | 2969 ++++++++--------
.../org/apache/calcite/test/LatticeTest.java | 128 +-
.../calcite/test/LinqFrontJdbcBackTest.java | 22 +-
.../calcite/test/MaterializationTest.java | 112 +-
.../apache/calcite/test/MockCatalogReader.java | 61 +-
.../org/apache/calcite/test/MockRelOptCost.java | 10 +-
.../apache/calcite/test/MockRelOptPlanner.java | 32 +-
.../calcite/test/MockSqlOperatorTable.java | 26 +-
.../java/org/apache/calcite/test/ModelTest.java | 176 +-
.../calcite/test/MultiJdbcSchemaJoinTest.java | 80 +-
.../calcite/test/ReflectiveSchemaTest.java | 222 +-
.../apache/calcite/test/RelMetadataTest.java | 108 +-
.../apache/calcite/test/RelOptRulesTest.java | 529 ++-
.../org/apache/calcite/test/RelOptTestBase.java | 36 +-
.../org/apache/calcite/test/RexProgramTest.java | 135 +-
.../apache/calcite/test/RexTransformerTest.java | 22 +-
.../apache/calcite/test/ScannableTableTest.java | 117 +-
.../apache/calcite/test/SqlFunctionsTest.java | 49 +-
.../org/apache/calcite/test/SqlLimitsTest.java | 33 +-
.../org/apache/calcite/test/SqlTestGen.java | 54 +-
.../test/SqlToRelConverterExtendedTest.java | 25 +-
.../calcite/test/SqlToRelConverterTest.java | 270 +-
.../apache/calcite/test/SqlToRelTestBase.java | 83 +-
.../calcite/test/SqlValidatorFeatureTest.java | 45 +-
.../apache/calcite/test/SqlValidatorTest.java | 969 +++--
.../calcite/test/SqlValidatorTestCase.java | 56 +-
.../calcite/test/TableInRootSchemaTest.java | 74 +-
.../test/concurrent/ConcurrentTestCommand.java | 2 +-
.../ConcurrentTestCommandExecutor.java | 15 +-
.../ConcurrentTestCommandGenerator.java | 83 +-
.../concurrent/ConcurrentTestCommandScript.java | 116 +-
.../test/concurrent/ConcurrentTestPlugin.java | 2 +-
.../concurrent/ConcurrentTestPluginCommand.java | 3 +-
.../ConcurrentTestTimedCommandGenerator.java | 19 +-
.../calcite/test/concurrent/SamplePlugin.java | 12 +-
.../calcite/test/concurrent/package-info.java | 14 +-
.../org/apache/calcite/test/package-info.java | 4 +-
.../apache/calcite/tools/FrameworksTest.java | 73 +-
.../org/apache/calcite/tools/PlannerTest.java | 491 +--
.../org/apache/calcite/tools/TpchSchema.java | 8 +-
.../org/apache/calcite/util/BitSetsTest.java | 24 +-
.../org/apache/calcite/util/ChunkListTest.java | 28 +-
.../calcite/util/PartiallyOrderedSetTest.java | 39 +-
.../calcite/util/PermutationTestCase.java | 7 +-
.../apache/calcite/util/ReflectVisitorTest.java | 20 +-
.../java/org/apache/calcite/util/TestUtil.java | 10 +-
.../java/org/apache/calcite/util/UtilTest.java | 131 +-
.../calcite/util/graph/DirectedGraphTest.java | 23 +-
.../calcite/util/mapping/MappingTest.java | 18 +-
.../org/apache/calcite/test/HepPlannerTest.xml | 192 +-
.../org/apache/calcite/test/RelOptRulesTest.xml | 2216 ++++++------
.../calcite/test/SqlToRelConverterTest.xml | 1190 +++----
core/src/test/resources/sql/misc.oq | 166 +-
core/src/test/resources/sql/subquery.oq | 50 +-
.../calcite/adapter/csv/CsvEnumerator.java | 21 +-
.../calcite/adapter/csv/CsvFieldType.java | 10 +-
.../calcite/adapter/csv/CsvFilterableTable.java | 20 +-
.../adapter/csv/CsvProjectTableScanRule.java | 31 +-
.../calcite/adapter/csv/CsvScannableTable.java | 16 +-
.../apache/calcite/adapter/csv/CsvSchema.java | 14 +-
.../calcite/adapter/csv/CsvSchemaFactory.java | 8 +-
.../apache/calcite/adapter/csv/CsvTable.java | 11 +-
.../calcite/adapter/csv/CsvTableFactory.java | 12 +-
.../calcite/adapter/csv/CsvTableScan.java | 45 +-
.../adapter/csv/CsvTranslatableTable.java | 30 +-
.../calcite/adapter/csv/JsonEnumerator.java | 9 +-
.../apache/calcite/adapter/csv/JsonTable.java | 24 +-
.../calcite/adapter/csv/package-info.java | 2 +-
.../java/org/apache/calcite/test/CsvTest.java | 50 +-
.../org/apache/calcite/test/package-info.java | 23 -
example/csv/src/test/resources/bug.json | 2 +-
.../src/test/resources/filterable-model.json | 2 +-
.../test/resources/model-with-custom-table.json | 2 +-
.../csv/src/test/resources/model-with-view.json | 2 +-
example/csv/src/test/resources/model.json | 2 +-
example/csv/src/test/resources/smart.json | 2 +-
linq4j/pom.xml | 2 +-
.../calcite/linq4j/AbstractEnumerable.java | 2 +-
.../calcite/linq4j/AbstractEnumerable2.java | 6 +-
.../calcite/linq4j/AbstractQueryable.java | 2 +-
.../apache/calcite/linq4j/BaseQueryable.java | 4 +-
.../linq4j/CartesianProductEnumerator.java | 2 +-
.../calcite/linq4j/DefaultEnumerable.java | 30 +-
.../apache/calcite/linq4j/DefaultQueryable.java | 73 +-
.../org/apache/calcite/linq4j/Enumerable.java | 2 +-
.../calcite/linq4j/EnumerableDefaults.java | 78 +-
.../linq4j/EnumerableOrderedQueryable.java | 10 +-
.../calcite/linq4j/EnumerableQueryable.java | 51 +-
.../org/apache/calcite/linq4j/Enumerator.java | 2 +-
.../calcite/linq4j/ExtendedEnumerable.java | 26 +-
.../linq4j/ExtendedOrderedEnumerable.java | 9 +-
.../linq4j/ExtendedOrderedQueryable.java | 6 +-
.../calcite/linq4j/ExtendedQueryable.java | 32 +-
.../org/apache/calcite/linq4j/Extensions.java | 18 +-
.../org/apache/calcite/linq4j/Grouping.java | 2 +-
.../org/apache/calcite/linq4j/GroupingImpl.java | 11 +-
.../java/org/apache/calcite/linq4j/Linq4j.java | 40 +-
.../java/org/apache/calcite/linq4j/Lookup.java | 4 +-
.../org/apache/calcite/linq4j/LookupImpl.java | 17 +-
.../java/org/apache/calcite/linq4j/OpType.java | 2 +-
.../java/org/apache/calcite/linq4j/Ord.java | 8 +-
.../calcite/linq4j/OrderedEnumerable.java | 4 +-
.../apache/calcite/linq4j/OrderedQueryable.java | 2 +-
.../apache/calcite/linq4j/QueryProvider.java | 8 +-
.../calcite/linq4j/QueryProviderImpl.java | 7 +-
.../org/apache/calcite/linq4j/Queryable.java | 2 +-
.../calcite/linq4j/QueryableDefaults.java | 49 +-
.../apache/calcite/linq4j/QueryableFactory.java | 22 +-
.../calcite/linq4j/QueryableRecorder.java | 29 +-
.../apache/calcite/linq4j/RawEnumerable.java | 2 +-
.../org/apache/calcite/linq4j/RawQueryable.java | 4 +-
.../linq4j/function/BigDecimalFunction1.java | 2 +-
.../calcite/linq4j/function/Deterministic.java | 2 +-
.../linq4j/function/DoubleFunction1.java | 2 +-
.../linq4j/function/EqualityComparer.java | 2 +-
.../calcite/linq4j/function/FloatFunction1.java | 2 +-
.../calcite/linq4j/function/Function.java | 2 +-
.../calcite/linq4j/function/Function0.java | 2 +-
.../calcite/linq4j/function/Function1.java | 2 +-
.../calcite/linq4j/function/Function2.java | 2 +-
.../calcite/linq4j/function/Functions.java | 13 +-
.../linq4j/function/IntegerFunction1.java | 2 +-
.../calcite/linq4j/function/LongFunction1.java | 2 +-
.../linq4j/function/NonDeterministic.java | 2 +-
.../function/NullableBigDecimalFunction1.java | 2 +-
.../function/NullableDoubleFunction1.java | 2 +-
.../linq4j/function/NullableFloatFunction1.java | 2 +-
.../function/NullableIntegerFunction1.java | 2 +-
.../linq4j/function/NullableLongFunction1.java | 2 +-
.../calcite/linq4j/function/Predicate1.java | 2 +-
.../calcite/linq4j/function/Predicate2.java | 6 +-
.../calcite/linq4j/function/package-info.java | 2 +-
.../org/apache/calcite/linq4j/package-info.java | 2 +-
.../calcite/linq4j/tree/AbstractNode.java | 11 +-
.../linq4j/tree/ArrayLengthRecordField.java | 10 +-
.../calcite/linq4j/tree/BinaryExpression.java | 19 +-
.../calcite/linq4j/tree/BlockBuilder.java | 21 +-
.../calcite/linq4j/tree/BlockStatement.java | 17 +-
.../org/apache/calcite/linq4j/tree/Blocks.java | 8 +-
.../calcite/linq4j/tree/CallSiteBinder.java | 2 +-
.../apache/calcite/linq4j/tree/CatchBlock.java | 8 +-
.../calcite/linq4j/tree/ClassDeclaration.java | 8 +-
.../linq4j/tree/ClassDeclarationFinder.java | 16 +-
.../linq4j/tree/ConditionalExpression.java | 11 +-
.../linq4j/tree/ConditionalStatement.java | 14 +-
.../calcite/linq4j/tree/ConstantExpression.java | 18 +-
.../linq4j/tree/ConstantUntypedNull.java | 13 +-
.../linq4j/tree/ConstructorDeclaration.java | 15 +-
.../linq4j/tree/DeclarationStatement.java | 14 +-
.../calcite/linq4j/tree/DefaultExpression.java | 5 +-
.../linq4j/tree/DeterministicCodeOptimizer.java | 48 +-
.../calcite/linq4j/tree/DynamicExpression.java | 5 +-
.../apache/calcite/linq4j/tree/ElementInit.java | 4 +-
.../apache/calcite/linq4j/tree/Evaluator.java | 2 +-
.../apache/calcite/linq4j/tree/Expression.java | 5 +-
.../calcite/linq4j/tree/ExpressionType.java | 2 +-
.../calcite/linq4j/tree/ExpressionVisitor.java | 4 +-
.../calcite/linq4j/tree/ExpressionWriter.java | 9 +-
.../apache/calcite/linq4j/tree/Expressions.java | 28 +-
.../calcite/linq4j/tree/FieldDeclaration.java | 11 +-
.../calcite/linq4j/tree/ForStatement.java | 16 +-
.../calcite/linq4j/tree/FunctionExpression.java | 33 +-
.../calcite/linq4j/tree/GotoExpressionKind.java | 2 +-
.../calcite/linq4j/tree/GotoStatement.java | 17 +-
.../calcite/linq4j/tree/IndexExpression.java | 14 +-
.../linq4j/tree/InvocationExpression.java | 5 +-
.../calcite/linq4j/tree/LabelStatement.java | 11 +-
.../apache/calcite/linq4j/tree/LabelTarget.java | 8 +-
.../calcite/linq4j/tree/LambdaExpression.java | 5 +-
.../calcite/linq4j/tree/ListInitExpression.java | 5 +-
.../calcite/linq4j/tree/MemberAssignment.java | 2 +-
.../calcite/linq4j/tree/MemberBinding.java | 2 +-
.../calcite/linq4j/tree/MemberDeclaration.java | 2 +-
.../calcite/linq4j/tree/MemberExpression.java | 14 +-
.../linq4j/tree/MemberInitExpression.java | 5 +-
.../calcite/linq4j/tree/MemberListBinding.java | 2 +-
.../linq4j/tree/MemberMemberBinding.java | 2 +-
.../linq4j/tree/MethodCallExpression.java | 17 +-
.../calcite/linq4j/tree/MethodDeclaration.java | 15 +-
.../calcite/linq4j/tree/NewArrayExpression.java | 14 +-
.../calcite/linq4j/tree/NewExpression.java | 14 +-
.../org/apache/calcite/linq4j/tree/Node.java | 2 +-
.../calcite/linq4j/tree/OptimizeVisitor.java | 28 +-
.../linq4j/tree/ParameterExpression.java | 21 +-
.../apache/calcite/linq4j/tree/Primitive.java | 9 +-
.../apache/calcite/linq4j/tree/PseudoField.java | 2 +-
.../linq4j/tree/ReflectedPseudoField.java | 10 +-
.../apache/calcite/linq4j/tree/Statement.java | 8 +-
.../apache/calcite/linq4j/tree/SwitchCase.java | 2 +-
.../calcite/linq4j/tree/SwitchStatement.java | 5 +-
.../calcite/linq4j/tree/TernaryExpression.java | 11 +-
.../calcite/linq4j/tree/ThrowStatement.java | 14 +-
.../calcite/linq4j/tree/TryStatement.java | 14 +-
.../linq4j/tree/TypeBinaryExpression.java | 11 +-
.../org/apache/calcite/linq4j/tree/Types.java | 37 +-
.../calcite/linq4j/tree/UnaryExpression.java | 11 +-
.../org/apache/calcite/linq4j/tree/Visitor.java | 4 +-
.../calcite/linq4j/tree/WhileStatement.java | 14 +-
.../calcite/linq4j/tree/package-info.java | 4 +-
.../test/java/com/example/Linq4jExample.java | 7 +-
.../calcite/linq4j/function/FunctionTest.java | 6 +-
.../calcite/linq4j/function/package-info.java | 2 +-
.../calcite/linq4j/test/BlockBuilderBase.java | 9 +-
.../calcite/linq4j/test/BlockBuilderTest.java | 24 +-
.../calcite/linq4j/test/DeterministicTest.java | 89 +-
.../calcite/linq4j/test/ExpressionTest.java | 430 +--
.../apache/calcite/linq4j/test/InlinerTest.java | 45 +-
.../apache/calcite/linq4j/test/Linq4jSuite.java | 6 +-
.../apache/calcite/linq4j/test/Linq4jTest.java | 161 +-
.../calcite/linq4j/test/OptimizerTest.java | 106 +-
.../calcite/linq4j/test/PrimitiveTest.java | 38 +-
.../calcite/linq4j/test/package-info.java | 2 +-
.../apache/calcite/linq4j/tree/TypeTest.java | 4 +-
.../calcite/linq4j/tree/package-info.java | 2 +-
mongodb/pom.xml | 21 +-
.../calcite/adapter/mongodb/MongoAggregate.java | 53 +-
.../adapter/mongodb/MongoEnumerator.java | 17 +-
.../calcite/adapter/mongodb/MongoFilter.java | 49 +-
.../calcite/adapter/mongodb/MongoMethod.java | 6 +-
.../calcite/adapter/mongodb/MongoProject.java | 42 +-
.../calcite/adapter/mongodb/MongoRel.java | 10 +-
.../calcite/adapter/mongodb/MongoRules.java | 161 +-
.../calcite/adapter/mongodb/MongoSchema.java | 12 +-
.../adapter/mongodb/MongoSchemaFactory.java | 6 +-
.../calcite/adapter/mongodb/MongoSort.java | 46 +-
.../calcite/adapter/mongodb/MongoTable.java | 56 +-
.../calcite/adapter/mongodb/MongoTableScan.java | 30 +-
.../mongodb/MongoToEnumerableConverter.java | 49 +-
.../mongodb/MongoToEnumerableConverterRule.java | 14 +-
.../calcite/adapter/mongodb/package-info.java | 2 +-
.../apache/calcite/test/MongoAdapterTest.java | 342 +-
.../test/resources/mongo-foodmart-model.json | 2 +-
.../src/test/resources/mongo-zips-model.json | 2 +-
plus/pom.xml | 2 +-
.../calcite/adapter/tpcds/TpcdsSchema.java | 46 +-
.../adapter/tpcds/TpcdsSchemaFactory.java | 11 +-
.../calcite/adapter/tpcds/package-info.java | 2 +-
.../apache/calcite/adapter/tpch/TpchSchema.java | 40 +-
.../calcite/adapter/tpch/TpchSchemaFactory.java | 11 +-
.../calcite/adapter/tpch/package-info.java | 2 +-
.../apache/calcite/adapter/tpcds/TpcdsTest.java | 195 ++
.../apache/calcite/adapter/tpch/TpcdsTest.java | 197 --
.../apache/calcite/adapter/tpch/TpchTest.java | 939 +++++
.../org/apache/calcite/impl/tpch/TpchTest.java | 941 -----
.../java/org/apache/calcite/test/PlusSuite.java | 6 +-
pom.xml | 2 +-
spark/pom.xml | 22 +-
.../spark/EnumerableToSparkConverter.java | 36 +-
.../spark/EnumerableToSparkConverterRule.java | 13 +-
.../calcite/adapter/spark/HttpServer.java | 24 +-
.../adapter/spark/JdbcToSparkConverter.java | 54 +-
.../adapter/spark/JdbcToSparkConverterRule.java | 18 +-
.../calcite/adapter/spark/SparkHandlerImpl.java | 39 +-
.../calcite/adapter/spark/SparkMethod.java | 11 +-
.../apache/calcite/adapter/spark/SparkRel.java | 18 +-
.../calcite/adapter/spark/SparkRules.java | 168 +-
.../calcite/adapter/spark/SparkRuntime.java | 18 +-
.../spark/SparkToEnumerableConverter.java | 46 +-
.../calcite/adapter/spark/package-info.java | 2 +-
.../apache/calcite/test/SparkAdapterTest.java | 35 +-
splunk/pom.xml | 2 +-
.../calcite/adapter/splunk/SplunkDriver.java | 30 +-
.../adapter/splunk/SplunkDriverVersion.java | 6 +-
.../adapter/splunk/SplunkPushDownRule.java | 135 +-
.../calcite/adapter/splunk/SplunkQuery.java | 16 +-
.../calcite/adapter/splunk/SplunkSchema.java | 10 +-
.../calcite/adapter/splunk/SplunkTable.java | 27 +-
.../calcite/adapter/splunk/SplunkTableScan.java | 65 +-
.../calcite/adapter/splunk/package-info.java | 2 +-
.../splunk/search/SearchResultListener.java | 2 +-
.../adapter/splunk/search/SplunkConnection.java | 4 +-
.../splunk/search/SplunkConnectionImpl.java | 33 +-
.../adapter/splunk/search/package-info.java | 2 +-
.../calcite/adapter/splunk/util/HttpUtils.java | 20 +-
.../adapter/splunk/util/SocketFactoryImpl.java | 31 +-
.../adapter/splunk/util/StringUtils.java | 2 +-
.../splunk/util/TrustAllSslSocketFactory.java | 31 +-
.../adapter/splunk/util/package-info.java | 2 +-
.../apache/calcite/test/SplunkAdapterTest.java | 90 +-
src/main/config/checkstyle/checker.xml | 21 +-
src/main/config/checkstyle/suppressions.xml | 100 +-
.../java/org/apache/calcite/StatementTest.java | 41 +-
1236 files changed, 30434 insertions(+), 25248 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index 7220758..b06291d 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -39,9 +39,7 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>net/hydromatic/**/AvaticaTest.java</exclude>
- </excludes>
+ <excludes/>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/ArrayImpl.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/ArrayImpl.java b/avatica/src/main/java/org/apache/calcite/avatica/ArrayImpl.java
index e21ab48..f31aa42 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/ArrayImpl.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/ArrayImpl.java
@@ -14,10 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
-
-import java.sql.*;
-import java.util.*;
+package org.apache.calcite.avatica;
+
+import java.sql.Array;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.List;
+import java.util.Map;
/** Implementation of JDBC {@link Array}. */
public class ArrayImpl implements Array {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java
index 411e250..ef5aa9a 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java
@@ -14,10 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
-
-import java.sql.*;
-import java.util.*;
+package org.apache.calcite.avatica;
+
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TimeZone;
import java.util.concurrent.Executor;
/**
@@ -422,14 +441,14 @@ public abstract class AvaticaConnection implements Connection {
}
/** A means for anyone who has a trojan to call the protected method
- * {@link net.hydromatic.avatica.AvaticaResultSet#execute()}.
+ * {@link org.apache.calcite.avatica.AvaticaResultSet#execute()}.
* @throws SQLException if execute fails for some reason. */
public ResultSet execute(AvaticaResultSet resultSet) throws SQLException {
return resultSet.execute();
}
/** A means for anyone who has a trojan to call the protected method
- * {@link net.hydromatic.avatica.AvaticaStatement#getParameterValues()}. */
+ * {@link org.apache.calcite.avatica.AvaticaStatement#getParameterValues()}. */
public List<Object> getParameterValues(AvaticaStatement statement) {
return statement.getParameterValues();
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java
index 0e22eff..86e90d7 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java
@@ -14,12 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
-
-import java.sql.*;
-import java.util.*;
-
-import static net.hydromatic.avatica.InternalProperty.*;
+package org.apache.calcite.avatica;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.RowIdLifetime;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.calcite.avatica.InternalProperty.CASE_SENSITIVE;
+import static org.apache.calcite.avatica.InternalProperty.NULL_SORTING;
+import static org.apache.calcite.avatica.InternalProperty.NullSorting;
+import static org.apache.calcite.avatica.InternalProperty.QUOTED_CASING;
+import static org.apache.calcite.avatica.InternalProperty.QUOTING;
+import static org.apache.calcite.avatica.InternalProperty.UNQUOTED_CASING;
/**
* Implementation of {@link java.sql.DatabaseMetaData}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaFactory.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaFactory.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaFactory.java
index 37610c3..826fb59 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaFactory.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
+package org.apache.calcite.avatica;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc40Factory.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc40Factory.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc40Factory.java
index 41006cc..cc2dfaf 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc40Factory.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc40Factory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
+package org.apache.calcite.avatica;
/**
* Implementation of {@link AvaticaFactory}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java
index 219be0c..9e2d269 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java
@@ -14,11 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
+package org.apache.calcite.avatica;
import java.io.InputStream;
import java.io.Reader;
-import java.sql.*;
+import java.sql.NClob;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLXML;
import java.util.List;
import java.util.Properties;
import java.util.TimeZone;
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaParameter.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaParameter.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaParameter.java
index 2b51060..0cf77ae 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaParameter.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaParameter.java
@@ -14,13 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
+package org.apache.calcite.avatica;
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.Ref;
+import java.sql.RowId;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
import java.util.Calendar;
/**
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPrepareResult.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPrepareResult.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPrepareResult.java
index 9ce74b2..0836ccf 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPrepareResult.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPrepareResult.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
+package org.apache.calcite.avatica;
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPreparedStatement.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPreparedStatement.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPreparedStatement.java
index 947177a..7b8b9fa 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPreparedStatement.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaPreparedStatement.java
@@ -14,13 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
+package org.apache.calcite.avatica;
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Date;
+import java.sql.ParameterMetaData;
+import java.sql.PreparedStatement;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSet.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSet.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSet.java
index 9746ec1..4a2e06e 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSet.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSet.java
@@ -14,15 +14,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
+package org.apache.calcite.avatica;
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
import java.sql.Date;
-import java.util.*;
+import java.sql.NClob;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
/**
* Implementation of {@link java.sql.ResultSet}
@@ -153,7 +168,7 @@ public class AvaticaResultSet implements ResultSet, ArrayImpl.Factory {
* constructor occurs while the statement is locked, to make sure that
* execute/cancel don't happen at the same time.</p>
*
- * @see net.hydromatic.avatica.AvaticaConnection.Trojan#execute(AvaticaResultSet)
+ * @see org.apache.calcite.avatica.AvaticaConnection.Trojan#execute(AvaticaResultSet)
*
* @throws SQLException if execute fails for some reason.
*/
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a0ba73cd/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSetMetaData.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSetMetaData.java b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSetMetaData.java
index f166102..1043aa8 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSetMetaData.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/AvaticaResultSetMetaData.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.hydromatic.avatica;
+package org.apache.calcite.avatica;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;