[CALCITE-1963] Upgrade checkstyle, and fix code to comply Upgrade maven-checkstyle-plugin from 2.12.1 (checkstyle 5.7) to 2.17 (checkstyle 6.11.2).
Ensure compliance with the new version: lots of cosmetic changes, especially whitespace, no functionality changes. I would have liked to set Indentation.forceStrictCondition=true, to ensure that parameter and argument lists are indented correctly. But it generates lots of false-negatives in nested expressions, so we can't do it at this point. Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/9ab47c00 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/9ab47c00 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/9ab47c00 Branch: refs/heads/master Commit: 9ab47c0000732ec99c3162954e1eb74eaa30cddf Parents: 210fa86 Author: Julian Hyde <[email protected]> Authored: Wed Aug 23 18:14:13 2017 -0700 Committer: Julian Hyde <[email protected]> Committed: Wed Aug 23 18:14:41 2017 -0700 ---------------------------------------------------------------------- .../adapter/cassandra/CassandraEnumerator.java | 2 +- .../adapter/cassandra/CassandraLimit.java | 8 +- .../adapter/cassandra/CassandraRules.java | 14 +- .../adapter/cassandra/CassandraTable.java | 13 +- .../CassandraToEnumerableConverter.java | 4 +- .../CassandraToEnumerableConverterRule.java | 2 +- .../apache/calcite/test/CassandraAdapterIT.java | 2 +- .../calcite/adapter/clone/ArrayTable.java | 24 +- .../calcite/adapter/clone/ColumnLoader.java | 4 +- .../apache/calcite/adapter/clone/ListTable.java | 2 +- .../adapter/enumerable/EnumerableAggregate.java | 22 +- .../enumerable/EnumerableInterpretable.java | 2 +- .../adapter/enumerable/EnumerableMergeJoin.java | 8 +- .../enumerable/EnumerableRelImplementor.java | 13 +- .../adapter/enumerable/EnumerableRules.java | 16 +- .../adapter/enumerable/EnumerableWindow.java | 4 +- .../calcite/adapter/enumerable/RexImpTable.java | 24 +- .../adapter/enumerable/WinAggImplementor.java | 2 +- .../calcite/adapter/java/ReflectiveSchema.java | 4 +- .../apache/calcite/adapter/jdbc/JdbcRules.java | 2 +- .../apache/calcite/adapter/jdbc/JdbcTable.java | 13 +- .../calcite/interpreter/AbstractSingleNode.java | 2 +- .../apache/calcite/interpreter/Interpreter.java | 6 +- .../calcite/jdbc/CachingCalciteSchema.java | 4 +- .../calcite/jdbc/CalciteConnectionImpl.java | 8 +- .../calcite/jdbc/CalciteJdbc41Factory.java | 2 +- .../apache/calcite/jdbc/CalciteMetaImpl.java | 14 +- .../org/apache/calcite/jdbc/CalcitePrepare.java | 8 +- .../calcite/jdbc/JavaTypeFactoryImpl.java | 4 +- .../CachingLatticeStatisticProvider.java | 2 +- .../org/apache/calcite/materialize/Lattice.java | 2 +- .../calcite/materialize/TileSuggester.java | 4 +- .../apache/calcite/plan/ConventionTraitDef.java | 3 +- .../apache/calcite/plan/RelCompositeTrait.java | 4 +- .../org/apache/calcite/plan/RelOptListener.java | 14 +- .../org/apache/calcite/plan/RelOptRule.java | 2 +- .../org/apache/calcite/plan/RelOptUtil.java | 6 +- .../calcite/plan/RexImplicationChecker.java | 4 +- .../org/apache/calcite/plan/TableAccessMap.java | 2 +- .../apache/calcite/plan/hep/HepInstruction.java | 4 +- .../plan/hep/HepRelMetadataProvider.java | 8 +- .../org/apache/calcite/plan/volcano/RelSet.java | 12 +- .../calcite/plan/volcano/VolcanoPlanner.java | 4 +- .../volcano/VolcanoRelMetadataProvider.java | 8 +- .../calcite/prepare/CalciteMaterializer.java | 2 +- .../calcite/prepare/CalcitePrepareImpl.java | 8 +- .../calcite/prepare/CalciteSqlValidator.java | 2 +- .../calcite/prepare/LixToRelTranslator.java | 2 +- .../calcite/prepare/QueryableRelBuilder.java | 2 +- .../apache/calcite/prepare/RelOptTableImpl.java | 2 +- .../java/org/apache/calcite/rel/core/Match.java | 4 +- .../apache/calcite/rel/core/RelFactories.java | 4 +- .../calcite/rel/logical/LogicalWindow.java | 20 +- .../metadata/CachingRelMetadataProvider.java | 10 +- .../metadata/ChainedRelMetadataProvider.java | 10 +- .../rel/metadata/JaninoRelMetadataProvider.java | 23 +- .../metadata/ReflectiveRelMetadataProvider.java | 20 +- .../rel/metadata/RelMdColumnUniqueness.java | 2 +- .../calcite/rel/metadata/RelMdPredicates.java | 2 +- .../apache/calcite/rel/metadata/RelMdUtil.java | 2 +- .../rel/metadata/RelMetadataProvider.java | 9 +- .../calcite/rel/metadata/RelMetadataQuery.java | 2 +- .../calcite/rel/rel2sql/RelToSqlConverter.java | 2 +- .../rel/rules/AbstractMaterializedViewRule.java | 2 +- .../rel/rules/AggregateJoinTransposeRule.java | 4 +- .../rel/rules/AggregateUnionTransposeRule.java | 2 +- .../calcite/rel/rules/CalcRelSplitter.java | 6 +- .../FilterRemoveIsNotDistinctFromRule.java | 2 +- .../calcite/rel/rules/JoinToMultiJoinRule.java | 2 +- .../rel/rules/LoptSemiJoinOptimizer.java | 2 +- .../calcite/rel/rules/ProjectToWindowRule.java | 88 +- .../apache/calcite/rel/rules/PushProjector.java | 6 +- .../calcite/rel/rules/SubQueryRemoveRule.java | 2 +- .../calcite/rel/type/RelDataTypeSystemImpl.java | 2 +- .../org/apache/calcite/rex/RexCallBinding.java | 2 +- .../org/apache/calcite/rex/RexExecutorImpl.java | 2 +- .../java/org/apache/calcite/rex/RexOver.java | 2 +- .../java/org/apache/calcite/rex/RexProgram.java | 4 +- .../apache/calcite/rex/RexProgramBuilder.java | 2 +- .../java/org/apache/calcite/rex/RexUtil.java | 16 +- .../org/apache/calcite/rex/RexWindowBound.java | 8 +- .../apache/calcite/runtime/CalciteResource.java | 3 +- .../org/apache/calcite/runtime/Enumerables.java | 4 +- .../org/apache/calcite/runtime/FlatLists.java | 29 +- .../java/org/apache/calcite/runtime/Like.java | 28 +- .../calcite/runtime/ResultSetEnumerable.java | 11 +- .../apache/calcite/runtime/SqlFunctions.java | 33 +- .../java/org/apache/calcite/schema/Schemas.java | 4 +- .../apache/calcite/schema/TableFunction.java | 2 +- .../apache/calcite/sql/SqlDescribeSchema.java | 4 +- .../apache/calcite/sql/SqlDescribeTable.java | 8 +- .../java/org/apache/calcite/sql/SqlDialect.java | 4 +- .../calcite/sql/SqlIntervalQualifier.java | 2 +- .../apache/calcite/sql/SqlMatchRecognize.java | 2 +- .../calcite/sql/SqlSplittableAggFunction.java | 4 +- .../java/org/apache/calcite/sql/SqlUtil.java | 5 +- .../org/apache/calcite/sql/SqlWithItem.java | 2 +- .../sql/advise/SqlAdvisorGetHintsFunction.java | 18 +- .../sql/fun/SqlArgumentAssignmentOperator.java | 2 +- .../calcite/sql/fun/SqlDefaultOperator.java | 2 +- .../calcite/sql/fun/SqlExtendOperator.java | 2 +- .../calcite/sql/fun/SqlGroupIdFunction.java | 2 +- .../calcite/sql/fun/SqlGroupingFunction.java | 2 +- .../calcite/sql/fun/SqlGroupingIdFunction.java | 2 +- .../apache/calcite/sql/fun/SqlItemOperator.java | 2 +- .../calcite/sql/fun/SqlOverlapsOperator.java | 8 +- .../calcite/sql/fun/SqlRollupOperator.java | 2 +- .../calcite/sql/fun/SqlStdOperatorTable.java | 4 +- .../apache/calcite/sql/type/BasicSqlType.java | 2 +- .../apache/calcite/sql/type/OperandTypes.java | 18 +- .../apache/calcite/sql/type/ReturnTypes.java | 8 +- .../calcite/sql/type/SqlOperandCountRanges.java | 2 +- .../sql/type/SqlTypeExplicitPrecedenceList.java | 2 +- .../calcite/sql/util/SqlBasicVisitor.java | 6 +- .../calcite/sql/validate/DelegatingScope.java | 4 +- .../apache/calcite/sql/validate/EmptyScope.java | 4 +- .../sql/validate/ParameterNamespace.java | 2 +- .../validate/SqlUserDefinedTableFunction.java | 8 +- .../calcite/sql/validate/SqlValidatorImpl.java | 32 +- .../calcite/sql/validate/SqlValidatorUtil.java | 17 +- .../calcite/sql/validate/TableNamespace.java | 2 +- .../apache/calcite/sql2rel/RelDecorrelator.java | 10 +- .../calcite/sql2rel/SqlToRelConverter.java | 54 +- .../sql2rel/StandardConvertletTable.java | 4 +- .../org/apache/calcite/tools/Frameworks.java | 10 +- .../org/apache/calcite/tools/RelBuilder.java | 6 +- .../java/org/apache/calcite/tools/RuleSets.java | 2 +- .../java/org/apache/calcite/util/BitSets.java | 2 +- .../apache/calcite/util/CompatibleGuava11.java | 32 +- .../apache/calcite/util/ImmutableBitSet.java | 2 +- .../apache/calcite/util/ImmutableIntList.java | 4 +- .../calcite/util/ImmutableNullableList.java | 2 + .../calcite/util/PartiallyOrderedSet.java | 6 +- .../org/apache/calcite/util/ReflectUtil.java | 3 +- .../main/java/org/apache/calcite/util/Util.java | 4 +- .../java/org/apache/calcite/util/XmlOutput.java | 2 +- .../org/apache/calcite/util/graph/Graphs.java | 4 +- .../calcite/util/javac/JaninoCompiler.java | 2 +- .../calcite/util/mapping/MappingType.java | 2 +- .../apache/calcite/util/mapping/Mappings.java | 2 +- .../apache/calcite/util/trace/CalciteTrace.java | 3 +- core/src/test/java/RootHr.java | 6 +- .../calcite/adapter/clone/ArrayTableTest.java | 2 +- .../examples/foodmart/java/JdbcExample.java | 10 +- .../calcite/jdbc/CalciteRemoteDriverTest.java | 49 +- .../plan/volcano/TraitPropagationTest.java | 8 +- .../plan/volcano/VolcanoPlannerTest.java | 2 +- .../plan/volcano/VolcanoPlannerTraitTest.java | 10 +- .../calcite/sql/parser/SqlParserTest.java | 6 +- .../ExtensionSqlParserTest.java | 4 +- .../apache/calcite/sql/test/SqlAdvisorTest.java | 2 +- .../calcite/sql/test/SqlOperatorBaseTest.java | 130 +-- .../org/apache/calcite/test/CalciteAssert.java | 10 +- .../org/apache/calcite/test/CalciteSuite.java | 2 +- .../calcite/test/ExceptionMessageTest.java | 4 +- .../org/apache/calcite/test/FilteratorTest.java | 10 +- .../org/apache/calcite/test/FoodmartTest.java | 94 +- .../apache/calcite/test/InterpreterTest.java | 2 +- .../java/org/apache/calcite/test/JdbcTest.java | 358 +++--- .../calcite/test/MaterializationTest.java | 1030 +++++++++--------- .../apache/calcite/test/MockCatalogReader.java | 2 +- .../calcite/test/ReflectiveSchemaTest.java | 42 +- .../apache/calcite/test/RelMetadataTest.java | 2 +- .../apache/calcite/test/RelOptRulesTest.java | 8 +- .../apache/calcite/test/ScannableTableTest.java | 11 +- .../calcite/test/SqlToRelConverterTest.java | 30 +- .../apache/calcite/test/SqlToRelTestBase.java | 7 +- .../calcite/test/SqlValidatorFeatureTest.java | 2 +- .../calcite/test/SqlValidatorMatchTest.java | 90 +- .../apache/calcite/test/SqlValidatorTest.java | 4 +- .../org/apache/calcite/test/StreamTest.java | 16 +- .../test/concurrent/ConcurrentTestCommand.java | 2 +- .../ConcurrentTestCommandExecutor.java | 2 +- .../ConcurrentTestCommandGenerator.java | 3 +- .../concurrent/ConcurrentTestCommandScript.java | 184 ++-- .../ConcurrentTestTimedCommandGenerator.java | 2 + .../org/apache/calcite/tools/PlannerTest.java | 18 +- .../java/org/apache/calcite/util/Smalls.java | 28 +- .../java/org/apache/calcite/util/UtilTest.java | 36 +- .../adapter/druid/DruidConnectionImpl.java | 4 +- .../calcite/adapter/druid/DruidRules.java | 14 +- .../apache/calcite/adapter/druid/QueryType.java | 2 +- .../org/apache/calcite/test/DruidAdapterIT.java | 18 +- .../elasticsearch/ElasticsearchFilter.java | 11 +- .../elasticsearch/ElasticsearchProject.java | 10 +- .../elasticsearch/ElasticsearchRules.java | 12 +- .../elasticsearch/ElasticsearchSchema.java | 5 +- .../elasticsearch/ElasticsearchTable.java | 2 + .../calcite/test/ElasticsearchAdapterIT.java | 4 +- .../calcite/adapter/csv/CsvEnumerator.java | 16 +- .../calcite/adapter/csv/CsvFieldType.java | 3 +- .../calcite/adapter/csv/JsonEnumerator.java | 2 +- .../java/org/apache/calcite/test/CsvTest.java | 8 +- .../org/apache/calcite/example/maze/Maze.java | 2 +- .../apache/calcite/adapter/file/SqlTest.java | 10 +- .../calcite/linq4j/EnumerableDefaults.java | 113 +- .../java/org/apache/calcite/linq4j/Linq4j.java | 40 +- .../java/org/apache/calcite/linq4j/Ord.java | 18 +- .../calcite/linq4j/QueryProviderImpl.java | 2 + .../calcite/linq4j/QueryableDefaults.java | 20 +- .../calcite/linq4j/function/Functions.java | 20 +- .../calcite/linq4j/tree/BlockBuilder.java | 2 +- .../linq4j/tree/ClassDeclarationFinder.java | 7 +- .../calcite/linq4j/tree/ExpressionWriter.java | 6 +- .../apache/calcite/linq4j/tree/Expressions.java | 27 +- .../calcite/linq4j/tree/FunctionExpression.java | 7 +- .../calcite/linq4j/tree/OptimizeShuttle.java | 9 +- .../test/java/com/example/Linq4jExample.java | 8 +- .../calcite/linq4j/test/CorrelateJoinTest.java | 40 +- .../calcite/linq4j/test/DeterministicTest.java | 2 +- .../calcite/linq4j/test/ExpressionTest.java | 16 +- .../apache/calcite/linq4j/test/Linq4jSuite.java | 2 +- .../apache/calcite/linq4j/test/Linq4jTest.java | 56 +- .../adapter/mongodb/MongoEnumerator.java | 2 +- .../calcite/adapter/mongodb/MongoRules.java | 16 +- .../calcite/adapter/mongodb/MongoTable.java | 4 +- .../calcite/adapter/pig/PigAggFunction.java | 4 +- .../apache/calcite/adapter/pig/PigDataType.java | 2 +- .../calcite/adapter/pig/PigTableScan.java | 4 +- .../pig/PigToEnumerableConverterRule.java | 2 +- .../org/apache/calcite/test/PigAdapterTest.java | 210 ++-- .../java/org/apache/calcite/piglet/Handler.java | 4 +- .../org/apache/calcite/test/CalciteHandler.java | 2 +- .../java/org/apache/calcite/test/Fluent.java | 2 +- .../calcite/adapter/os/FilesTableFunction.java | 88 +- .../apache/calcite/adapter/os/Processes.java | 2 +- .../calcite/adapter/os/PsTableFunction.java | 14 +- .../calcite/adapter/os/VmstatTableFunction.java | 7 +- .../calcite/adapter/tpcds/TpcdsSchema.java | 4 +- .../apache/calcite/adapter/tpch/TpchSchema.java | 4 +- .../apache/calcite/adapter/tpcds/TpcdsTest.java | 5 +- .../java/org/apache/calcite/test/PlusSuite.java | 2 +- pom.xml | 8 +- .../apache/calcite/adapter/spark/SparkRel.java | 4 +- .../calcite/adapter/spark/SparkRuntime.java | 5 +- .../spark/SparkToEnumerableConverter.java | 2 +- .../calcite/adapter/splunk/SplunkDriver.java | 2 +- .../calcite/adapter/splunk/SplunkTable.java | 6 +- .../splunk/search/SplunkConnectionImpl.java | 28 +- .../apache/calcite/test/SplunkAdapterTest.java | 122 +-- .../calcite/benchmarks/StatementTest.java | 26 +- 241 files changed, 2258 insertions(+), 2117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java ---------------------------------------------------------------------- diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java index a7436fd..43153f4 100644 --- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java +++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java @@ -42,7 +42,7 @@ class CassandraEnumerator implements Enumerator<Object> { * @param results Cassandra result set ({@link com.datastax.driver.core.ResultSet}) * @param protoRowType The type of resulting rows */ - public CassandraEnumerator(ResultSet results, RelProtoDataType protoRowType) { + CassandraEnumerator(ResultSet results, RelProtoDataType protoRowType) { this.iterator = results.iterator(); this.current = null; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java ---------------------------------------------------------------------- diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java index cca7e19..41a11b9 100644 --- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java +++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java @@ -56,8 +56,12 @@ public class CassandraLimit extends SingleRel implements CassandraRel { public void implement(Implementor implementor) { implementor.visitChild(0, getInput()); - if (offset != null) { implementor.offset = RexLiteral.intValue(offset); } - if (fetch != null) { implementor.fetch = RexLiteral.intValue(fetch); } + if (offset != null) { + implementor.offset = RexLiteral.intValue(offset); + } + if (fetch != null) { + implementor.fetch = RexLiteral.intValue(fetch); + } } public RelWriter explainTerms(RelWriter pw) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java ---------------------------------------------------------------------- diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java index 095df16..6236542 100644 --- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java +++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java @@ -58,10 +58,10 @@ public class CassandraRules { private CassandraRules() {} public static final RelOptRule[] RULES = { - CassandraFilterRule.INSTANCE, - CassandraProjectRule.INSTANCE, - CassandraSortRule.INSTANCE, - CassandraLimitRule.INSTANCE + CassandraFilterRule.INSTANCE, + CassandraProjectRule.INSTANCE, + CassandraSortRule.INSTANCE, + CassandraLimitRule.INSTANCE }; static List<String> cassandraFieldNames(final RelDataType rowType) { @@ -92,14 +92,12 @@ public class CassandraRules { abstract static class CassandraConverterRule extends ConverterRule { protected final Convention out; - public CassandraConverterRule( - Class<? extends RelNode> clazz, + CassandraConverterRule(Class<? extends RelNode> clazz, String description) { this(clazz, Predicates.<RelNode>alwaysTrue(), description); } - public <R extends RelNode> CassandraConverterRule( - Class<R> clazz, + <R extends RelNode> CassandraConverterRule(Class<R> clazz, Predicate<? super R> predicate, String description) { super(clazz, predicate, Convention.NONE, CassandraRel.CONVENTION, description); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java ---------------------------------------------------------------------- diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java index 26ea303..57293b5 100644 --- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java +++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java @@ -183,7 +183,9 @@ public class CassandraTable extends AbstractQueryableTable } int limit = offset; - if (fetch >= 0) { limit += fetch; } + if (fetch >= 0) { + limit += fetch; + } if (limit > 0) { queryBuilder.append(" LIMIT " + limit); } @@ -196,8 +198,9 @@ public class CassandraTable extends AbstractQueryableTable // Skip results until we get to the right offset int skip = 0; Enumerator<Object> enumerator = new CassandraEnumerator(results, resultRowType); - while (skip < offset && enumerator.moveNext()) { skip++; } - + while (skip < offset && enumerator.moveNext()) { + skip++; + } return enumerator; } }; @@ -217,7 +220,9 @@ public class CassandraTable extends AbstractQueryableTable } /** Implementation of {@link org.apache.calcite.linq4j.Queryable} based on - * a {@link org.apache.calcite.adapter.cassandra.CassandraTable}. */ + * a {@link org.apache.calcite.adapter.cassandra.CassandraTable}. + * + * @param <T> element type */ public static class CassandraQueryable<T> extends AbstractTableQueryable<T> { public CassandraQueryable(QueryProvider queryProvider, SchemaPlus schema, CassandraTable table, String tableName) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java ---------------------------------------------------------------------- diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java index 66db1ff..ab55fff 100644 --- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java +++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java @@ -51,8 +51,8 @@ import java.util.Map; * Relational expression representing a scan of a table in a Cassandra data source. */ public class CassandraToEnumerableConverter - extends ConverterImpl - implements EnumerableRel { + extends ConverterImpl + implements EnumerableRel { protected CassandraToEnumerableConverter( RelOptCluster cluster, RelTraitSet traits, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java ---------------------------------------------------------------------- diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java index 2ded8c8..dae992d 100644 --- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java +++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java @@ -27,7 +27,7 @@ import org.apache.calcite.rel.convert.ConverterRule; */ public class CassandraToEnumerableConverterRule extends ConverterRule { public static final ConverterRule INSTANCE = - new CassandraToEnumerableConverterRule(); + new CassandraToEnumerableConverterRule(); private CassandraToEnumerableConverterRule() { super(RelNode.class, CassandraRel.CONVENTION, EnumerableConvention.INSTANCE, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java ---------------------------------------------------------------------- diff --git a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java index bca9233..ffb0010 100644 --- a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java +++ b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java @@ -47,7 +47,7 @@ public class CassandraAdapterIT { * included if "it" profile is activated ({@code -Pit}). To disable, * specify {@code -Dcalcite.test.cassandra=false} on the Java command line. */ public static final boolean ENABLED = - Util.getBooleanProperty("calcite.test.cassandra", true); + Util.getBooleanProperty("calcite.test.cassandra", true); /** Whether to run this test. */ protected boolean enabled() { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java b/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java index d87165c..c4b02d2 100644 --- a/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java +++ b/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java @@ -60,7 +60,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { private final Supplier<Content> supplier; /** Creates an ArrayTable. */ - public ArrayTable(Type elementType, RelProtoDataType protoRowType, + ArrayTable(Type elementType, RelProtoDataType protoRowType, Supplier<Content> supplier) { super(elementType); this.protoRowType = protoRowType; @@ -265,7 +265,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { public static class ObjectArray implements Representation { final int ordinal; - public ObjectArray(int ordinal) { + ObjectArray(int ordinal) { this.ordinal = ordinal; } @@ -317,7 +317,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { private final Primitive primitive; private final Primitive p; - public PrimitiveArray(int ordinal, Primitive primitive, Primitive p) { + PrimitiveArray(int ordinal, Primitive primitive, Primitive p) { this.ordinal = ordinal; this.primitive = primitive; this.p = p; @@ -364,7 +364,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { /** Representation that stores column values in a dictionary of * primitive values, then uses a short code for each row. */ public static class PrimitiveDictionary implements Representation { - public PrimitiveDictionary() { + PrimitiveDictionary() { } public String toString() { @@ -406,7 +406,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { final int ordinal; final Representation representation; - public ObjectDictionary( + ObjectDictionary( int ordinal, Representation representation) { this.ordinal = ordinal; @@ -475,7 +475,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { /** Representation that stores string column values. */ public static class StringDictionary implements Representation { - public StringDictionary() { + StringDictionary() { } @Override public String toString() { @@ -513,7 +513,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { /** Representation that stores byte-string column values. */ public static class ByteStringDictionary implements Representation { - public ByteStringDictionary() { + ByteStringDictionary() { } public String toString() { @@ -553,7 +553,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { public static class Constant implements Representation { final int ordinal; - public Constant(int ordinal) { + Constant(int ordinal) { this.ordinal = ordinal; } @@ -804,7 +804,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { private final int size; private final ImmutableList<RelCollation> collations; - public Content(List<? extends Column> columns, int size, + Content(List<? extends Column> columns, int size, Iterable<? extends RelCollation> collations) { this.columns = ImmutableList.copyOf(columns); this.size = size; @@ -812,7 +812,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { } @Deprecated // to be removed before 2.0 - public Content(List<? extends Column> columns, int size, int sortField) { + Content(List<? extends Column> columns, int size, int sortField) { this(columns, size, sortField >= 0 ? RelCollations.createSingleton(sortField) @@ -840,7 +840,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { final Representation representation; int i = -1; - public ObjectEnumerator(int rowCount, Column column) { + ObjectEnumerator(int rowCount, Column column) { this.rowCount = rowCount; this.dataSet = column.dataSet; this.representation = column.representation; @@ -869,7 +869,7 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable { final List<Column> columns; int i = -1; - public ArrayEnumerator(int rowCount, List<Column> columns) { + ArrayEnumerator(int rowCount, List<Column> columns) { this.rowCount = rowCount; this.columns = columns; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java b/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java index d33ee61..acc4adc 100644 --- a/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java +++ b/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java @@ -50,7 +50,7 @@ class ColumnLoader<T> { static final int[] INT_B = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000}; static final int[] INT_S = {1, 2, 4, 8, 16}; static final long[] LONG_B = { - 0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000, 0xFFFFFFFF00000000L}; + 0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000, 0xFFFFFFFF00000000L}; static final int[] LONG_S = {1, 2, 4, 8, 16, 32}; private static final Function<Timestamp, Long> TIMESTAMP_TO_LONG = @@ -461,7 +461,7 @@ class ColumnLoader<T> { private final int source; private final Comparable key; - public Kev(int source, Comparable key) { + Kev(int source, Comparable key) { this.source = source; this.key = key; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java b/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java index e75fb07..3a0b9e8 100644 --- a/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java +++ b/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java @@ -48,7 +48,7 @@ class ListTable extends AbstractQueryableTable { private final List list; /** Creates a ListTable. */ - public ListTable( + ListTable( Type elementType, RelProtoDataType protoRowType, Expression expression, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java index c6b74e2..2d8c497 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java @@ -259,25 +259,23 @@ public class EnumerableAggregate extends Aggregate implements EnumerableRel { // We have to initialize the SyntheticRecordType instance this way, to avoid using // class constructor with too many parameters. JavaTypeFactoryImpl.SyntheticRecordType synType = - (JavaTypeFactoryImpl.SyntheticRecordType) accPhysType.getJavaRowType(); + (JavaTypeFactoryImpl.SyntheticRecordType) + accPhysType.getJavaRowType(); final ParameterExpression record0_ = - Expressions.parameter(accPhysType.getJavaRowType(), "record0"); + Expressions.parameter(accPhysType.getJavaRowType(), "record0"); initBlock.add(Expressions.declare(0, record0_, null)); initBlock.add( - Expressions.statement( - Expressions.assign( - record0_, - Expressions.new_(accPhysType.getJavaRowType())))); + Expressions.statement( + Expressions.assign(record0_, + Expressions.new_(accPhysType.getJavaRowType())))); List<Types.RecordField> fieldList = synType.getRecordFields(); for (int i = 0; i < initExpressions.size(); i++) { Expression right = initExpressions.get(i); initBlock.add( - Expressions.statement( - Expressions.assign( - Expressions.field( - record0_, - fieldList.get(i)), - right))); + Expressions.statement( + Expressions.assign( + Expressions.field(record0_, fieldList.get(i)), + right))); } initBlock.add(record0_); } else { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java index 19d5f2a..ef5af1e 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java @@ -186,7 +186,7 @@ public class EnumerableInterpretable extends ConverterImpl private final Enumerable<Object[]> enumerable; private final Sink sink; - public EnumerableNode(Enumerable<Object[]> enumerable, + EnumerableNode(Enumerable<Object[]> enumerable, Interpreter interpreter, EnumerableInterpretable rel) { this.enumerable = enumerable; this.sink = interpreter.sink(rel); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java index 6b72e08..975665d 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java @@ -154,11 +154,11 @@ public class EnumerableMergeJoin extends EquiJoin implements EnumerableRel { right.getRowType().getFieldList().get(pair.right).getType())); final Type keyClass = typeFactory.getJavaClass(keyType); leftExpressions.add( - Types.castIfNecessary(keyClass, - leftResult.physType.fieldReference(left_, pair.left))); + Types.castIfNecessary(keyClass, + leftResult.physType.fieldReference(left_, pair.left))); rightExpressions.add( - Types.castIfNecessary(keyClass, - rightResult.physType.fieldReference(right_, pair.right))); + Types.castIfNecessary(keyClass, + rightResult.physType.fieldReference(right_, pair.right))); } final PhysType leftKeyPhysType = leftResult.physType.project(leftKeys, JavaRowFormat.LIST); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java index 288652f..cc86fea 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java @@ -79,13 +79,12 @@ public class EnumerableRelImplementor extends JavaRelImplementor { private final Map<Object, ParameterExpression> stashedParameters = Maps.newIdentityHashMap(); - protected final Function1<String, RexToLixTranslator.InputGetter> - allCorrelateVariables = - new Function1<String, RexToLixTranslator.InputGetter>() { - public RexToLixTranslator.InputGetter apply(String name) { - return getCorrelVariableGetter(name); - } - }; + protected final Function1<String, RexToLixTranslator.InputGetter> allCorrelateVariables = + new Function1<String, RexToLixTranslator.InputGetter>() { + public RexToLixTranslator.InputGetter apply(String name) { + return getCorrelVariableGetter(name); + } + }; public EnumerableRelImplementor(RexBuilder rexBuilder, Map<String, Object> internalParameters) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java index 29ee347..5a4874f 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java @@ -72,8 +72,8 @@ public class EnumerableRules { public static final EnumerableMinusRule ENUMERABLE_MINUS_RULE = new EnumerableMinusRule(); - public static final EnumerableTableModifyRule - ENUMERABLE_TABLE_MODIFICATION_RULE = new EnumerableTableModifyRule(); + public static final EnumerableTableModifyRule ENUMERABLE_TABLE_MODIFICATION_RULE = + new EnumerableTableModifyRule(); public static final EnumerableValuesRule ENUMERABLE_VALUES_RULE = new EnumerableValuesRule(); @@ -87,17 +87,17 @@ public class EnumerableRules { public static final EnumerableUncollectRule ENUMERABLE_UNCOLLECT_RULE = new EnumerableUncollectRule(); - public static final EnumerableFilterToCalcRule - ENUMERABLE_FILTER_TO_CALC_RULE = new EnumerableFilterToCalcRule(); + public static final EnumerableFilterToCalcRule ENUMERABLE_FILTER_TO_CALC_RULE = + new EnumerableFilterToCalcRule(); - public static final EnumerableProjectToCalcRule - ENUMERABLE_PROJECT_TO_CALC_RULE = new EnumerableProjectToCalcRule(); + public static final EnumerableProjectToCalcRule ENUMERABLE_PROJECT_TO_CALC_RULE = + new EnumerableProjectToCalcRule(); public static final EnumerableTableScanRule ENUMERABLE_TABLE_SCAN_RULE = new EnumerableTableScanRule(); - public static final EnumerableTableFunctionScanRule - ENUMERABLE_TABLE_FUNCTION_SCAN_RULE = new EnumerableTableFunctionScanRule(); + public static final EnumerableTableFunctionScanRule ENUMERABLE_TABLE_FUNCTION_SCAN_RULE = + new EnumerableTableFunctionScanRule(); } // End EnumerableRules.java http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java index 59a8564..9afee80 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java @@ -276,7 +276,7 @@ public class EnumerableWindow extends Window implements EnumerableRel { final List<Expression> outputRow = new ArrayList<Expression>(); int fieldCountWithAggResults = - inputPhysType.getRowType().getFieldCount(); + inputPhysType.getRowType().getFieldCount(); for (int i = 0; i < fieldCountWithAggResults; i++) { outputRow.add( inputPhysType.fieldReference( @@ -520,7 +520,7 @@ public class EnumerableWindow extends Window implements EnumerableRel { } private Function<BlockBuilder, WinAggFrameResultContext> - getBlockBuilderWinAggFrameResultContextFunction( + getBlockBuilderWinAggFrameResultContextFunction( final JavaTypeFactory typeFactory, final Result result, final List<Expression> translatedConstants, final Expression comparator_, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java index dc69ebb..00e9764 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java @@ -212,8 +212,8 @@ public class RexImpTable { private final Map<SqlOperator, CallImplementor> map = new HashMap<>(); private final Map<SqlAggFunction, Supplier<? extends AggImplementor>> aggMap = Maps.newHashMap(); - private final Map<SqlAggFunction, Supplier<? extends WinAggImplementor>> - winAggMap = Maps.newHashMap(); + private final Map<SqlAggFunction, Supplier<? extends WinAggImplementor>> winAggMap = + Maps.newHashMap(); RexImpTable() { defineMethod(ROW, BuiltInMethod.ARRAY.method, NullPolicy.ANY); @@ -268,8 +268,8 @@ public class RexImpTable { defineImplementor(RAND, NullPolicy.STRICT, new NotNullImplementor() { final NotNullImplementor[] implementors = { - new ReflectiveCallNotNullImplementor(BuiltInMethod.RAND.method), - new ReflectiveCallNotNullImplementor(BuiltInMethod.RAND_SEED.method) + new ReflectiveCallNotNullImplementor(BuiltInMethod.RAND.method), + new ReflectiveCallNotNullImplementor(BuiltInMethod.RAND_SEED.method) }; public Expression implement(RexToLixTranslator translator, RexCall call, List<Expression> translatedOperands) { @@ -280,10 +280,10 @@ public class RexImpTable { defineImplementor(RAND_INTEGER, NullPolicy.STRICT, new NotNullImplementor() { final NotNullImplementor[] implementors = { - null, - new ReflectiveCallNotNullImplementor( + null, + new ReflectiveCallNotNullImplementor( BuiltInMethod.RAND_INTEGER.method), - new ReflectiveCallNotNullImplementor( + new ReflectiveCallNotNullImplementor( BuiltInMethod.RAND_INTEGER_SEED.method) }; public Expression implement(RexToLixTranslator translator, @@ -669,7 +669,7 @@ public class RexImpTable { public CallImplementor get(final SqlOperator operator) { if (operator instanceof SqlUserDefinedFunction) { org.apache.calcite.schema.Function udf = - ((SqlUserDefinedFunction) operator).getFunction(); + ((SqlUserDefinedFunction) operator).getFunction(); if (!(udf instanceof ImplementableFunction)) { throw new IllegalStateException("User defined function " + operator + " must implement ImplementableFunction"); @@ -1293,8 +1293,8 @@ public class RexImpTable { Comparable[] rows; // accessed via WinAggAddContext.compareRows { if (curentPosition > startIndex) { - if (rows[curentPosition - 1].compareTo(rows[curentPosition]) > 0) - { + if (rows[curentPosition - 1].compareTo(rows[curentPosition]) + > 0) { // update rank } } @@ -2030,7 +2030,7 @@ public class RexImpTable { private final Boolean seek; private final boolean negate; - public IsXxxImplementor(Boolean seek, boolean negate) { + IsXxxImplementor(Boolean seek, boolean negate) { this.seek = seek; this.negate = negate; } @@ -2054,7 +2054,7 @@ public class RexImpTable { private static class NotImplementor implements NotNullImplementor { private final NotNullImplementor implementor; - public NotImplementor(NotNullImplementor implementor) { + NotImplementor(NotNullImplementor implementor) { this.implementor = implementor; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java index 7d2489f..2ad4932 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java @@ -35,7 +35,7 @@ public interface WinAggImplementor extends AggImplementor { * Allows to access rows in window partition relative to first/last and * current row. */ - public enum SeekType { + enum SeekType { /** * Start of window. * @see WinAggFrameContext#startIndex() http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java b/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java index 12e4a00..89cb2ff 100644 --- a/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java +++ b/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java @@ -358,7 +358,9 @@ public class ReflectiveSchema } } - /** Table based on a Java field. */ + /** Table based on a Java field. + * + * @param <T> element type */ private static class FieldTable<T> extends ReflectiveTable { private final Field field; private Statistic statistic; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java index 885ff0c..736c78d 100644 --- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java @@ -128,7 +128,7 @@ public class JdbcRules { abstract static class JdbcConverterRule extends ConverterRule { protected final JdbcConvention out; - public JdbcConverterRule(Class<? extends RelNode> clazz, RelTrait in, + JdbcConverterRule(Class<? extends RelNode> clazz, RelTrait in, JdbcConvention out, String description) { super(clazz, in, out, description); this.out = out; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java index d432e4a..b093eb2 100644 --- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java @@ -83,7 +83,7 @@ class JdbcTable extends AbstractQueryableTable private final String jdbcTableName; private final Schema.TableType jdbcTableType; - public JdbcTable(JdbcSchema jdbcSchema, String jdbcCatalogName, + JdbcTable(JdbcSchema jdbcSchema, String jdbcCatalogName, String jdbcSchemaName, String tableName, Schema.TableType jdbcTableType) { super(Object[].class); this.jdbcSchema = jdbcSchema; @@ -123,9 +123,8 @@ class JdbcTable extends AbstractQueryableTable final RelDataType rowType = protoRowType.apply(typeFactory); return Lists.transform(rowType.getFieldList(), new Function<RelDataTypeField, Pair<ColumnMetaData.Rep, Integer>>() { - public Pair<ColumnMetaData.Rep, Integer> - apply(RelDataTypeField field) { - final RelDataType type = field.getType(); + public Pair<ColumnMetaData.Rep, Integer> apply(RelDataTypeField f) { + final RelDataType type = f.getType(); final Class clazz = (Class) typeFactory.getJavaClass(type); final ColumnMetaData.Rep rep = Util.first(ColumnMetaData.Rep.of(clazz), @@ -194,9 +193,11 @@ class JdbcTable extends AbstractQueryableTable } /** Enumerable that returns the contents of a {@link JdbcTable} by connecting - * to the JDBC data source. */ + * to the JDBC data source. + * + * @param <T> element type */ private class JdbcTableQueryable<T> extends AbstractTableQueryable<T> { - public JdbcTableQueryable(QueryProvider queryProvider, SchemaPlus schema, + JdbcTableQueryable(QueryProvider queryProvider, SchemaPlus schema, String tableName) { super(queryProvider, schema, JdbcTable.this, tableName); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java b/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java index ffbc46b..d6174ba 100644 --- a/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java +++ b/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java @@ -28,7 +28,7 @@ abstract class AbstractSingleNode<T extends SingleRel> implements Node { protected final Sink sink; protected final T rel; - public AbstractSingleNode(Interpreter interpreter, T rel) { + AbstractSingleNode(Interpreter interpreter, T rel) { this.rel = rel; this.source = interpreter.source(rel, 0); this.sink = interpreter.sink(rel); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java b/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java index 59c5dca..2d754fa 100644 --- a/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java +++ b/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java @@ -322,7 +322,7 @@ public class Interpreter extends AbstractEnumerable<Object[]> final Enumerable<Row> rowEnumerable; Node node; - public NodeInfo(RelNode rel, Sink sink, Enumerable<Row> rowEnumerable) { + NodeInfo(RelNode rel, Sink sink, Enumerable<Row> rowEnumerable) { this.rel = rel; this.sink = sink; this.rowEnumerable = rowEnumerable; @@ -337,7 +337,7 @@ public class Interpreter extends AbstractEnumerable<Object[]> private static class EnumeratorSource implements Source { private final Enumerator<Row> enumerator; - public EnumeratorSource(final Enumerator<Row> enumerator) { + EnumeratorSource(final Enumerator<Row> enumerator) { this.enumerator = Preconditions.checkNotNull(enumerator); } @@ -386,7 +386,7 @@ public class Interpreter extends AbstractEnumerable<Object[]> private static class ListSource implements Source { private final ArrayDeque<Row> list; - public ListSource(ListSink sink) { + ListSource(ListSink sink) { this.list = sink.list; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java b/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java index 3ac1429..3e64838 100644 --- a/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java +++ b/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java @@ -242,7 +242,9 @@ class CachingCalciteSchema extends CalciteSchema { } /** Implementation of {@link CachingCalciteSchema.Cached} - * that drives from {@link CachingCalciteSchema#cache}. */ + * that drives from {@link CachingCalciteSchema#cache}. + * + * @param <T> element type */ private abstract class AbstractCached<T> implements Cached<T> { T t; long checked = Long.MIN_VALUE; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java index a937cf2..94c0d19 100644 --- a/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java +++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java @@ -205,8 +205,8 @@ abstract class CalciteConnectionImpl } } - <T> CalcitePrepare.CalciteSignature<T> - parseQuery(CalcitePrepare.Query<T> query, + <T> CalcitePrepare.CalciteSignature<T> parseQuery( + CalcitePrepare.Query<T> query, CalcitePrepare.Context prepareContext, long maxRowCount) { CalcitePrepare.Dummy.push(prepareContext); try { @@ -312,7 +312,9 @@ abstract class CalciteConnectionImpl return factory; } - /** Implementation of Queryable. */ + /** Implementation of Queryable. + * + * @param <T> element type */ static class CalciteQueryable<T> extends BaseQueryable<T> { CalciteQueryable(CalciteConnection connection, Type elementType, Expression expression) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java index 04258b7..034563a 100644 --- a/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java +++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java @@ -117,7 +117,7 @@ public class CalciteJdbc41Factory extends CalciteFactory { /** Implementation of statement for JDBC 4.1. */ private static class CalciteJdbc41Statement extends CalciteStatement { - public CalciteJdbc41Statement(CalciteConnectionImpl connection, + CalciteJdbc41Statement(CalciteConnectionImpl connection, Meta.StatementHandle h, int resultSetType, int resultSetConcurrency, int resultSetHoldability) { super(connection, h, resultSetType, resultSetConcurrency, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java index efd9764..96950a0 100644 --- a/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java +++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java @@ -774,7 +774,7 @@ public class CalciteMetaImpl extends MetaImpl { private static class CalciteMetaTable extends MetaTable { private final Table calciteTable; - public CalciteMetaTable(Table calciteTable, String tableCat, + CalciteMetaTable(Table calciteTable, String tableCat, String tableSchem, String tableName) { super(tableCat, tableSchem, tableName, calciteTable.getJdbcTableType().name()); @@ -786,16 +786,18 @@ public class CalciteMetaImpl extends MetaImpl { private static class CalciteMetaSchema extends MetaSchema { private final CalciteSchema calciteSchema; - public CalciteMetaSchema(CalciteSchema calciteSchema, + CalciteMetaSchema(CalciteSchema calciteSchema, String tableCatalog, String tableSchem) { super(tableCatalog, tableSchem); this.calciteSchema = calciteSchema; } } - /** Table whose contents are metadata. */ + /** Table whose contents are metadata. + * + * @param <E> element type */ abstract static class MetadataTable<E> extends AbstractQueryableTable { - public MetadataTable(Class<E> clazz) { + MetadataTable(Class<E> clazz) { super(clazz); } @@ -828,7 +830,9 @@ public class CalciteMetaImpl extends MetaImpl { } /** Iterator that returns at most {@code limit} rows from an underlying - * {@link Iterator}. */ + * {@link Iterator}. + * + * @param <E> element type */ private static class LimitIterator<E> implements Iterator<E> { private final Iterator<E> iterator; private final long limit; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java b/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java index dee608d..790e5da 100644 --- a/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java +++ b/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java @@ -309,7 +309,9 @@ public interface CalcitePrepare { /** The result of preparing a query. It gives the Avatica driver framework * the information it needs to create a prepared statement, or to execute a - * statement directly, without an explicit prepare step. */ + * statement directly, without an explicit prepare step. + * + * @param <T> element type */ class CalciteSignature<T> extends Meta.Signature { @JsonIgnore public final RelDataType rowType; @JsonIgnore public final CalciteSchema rootSchema; @@ -367,7 +369,9 @@ public interface CalcitePrepare { /** A union type of the three possible ways of expressing a query: as a SQL * string, a {@link Queryable} or a {@link RelNode}. Exactly one must be - * provided. */ + * provided. + * + * @param <T> element type */ class Query<T> { public final String sql; public final Queryable<T> queryable; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java b/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java index 180d445..083d362 100644 --- a/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java +++ b/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java @@ -60,7 +60,7 @@ public class JavaTypeFactoryImpl extends SqlTypeFactoryImpl implements JavaTypeFactory { private final Map<List<Pair<Type, Boolean>>, SyntheticRecordType> - syntheticTypes = new HashMap<>(); + syntheticTypes = new HashMap<>(); public JavaTypeFactoryImpl() { this(RelDataTypeSystem.DEFAULT); @@ -356,7 +356,7 @@ public class JavaTypeFactoryImpl private final boolean nullable; private final int modifiers; - public RecordFieldImpl( + RecordFieldImpl( SyntheticRecordType syntheticType, String name, Type type, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java b/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java index 5ab6cf6..e408335 100644 --- a/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java +++ b/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java @@ -34,7 +34,7 @@ class CachingLatticeStatisticProvider implements LatticeStatisticProvider { private final LoadingCache<Pair<Lattice, Lattice.Column>, Integer> cache; /** Creates a CachingStatisticProvider. */ - public CachingLatticeStatisticProvider( + CachingLatticeStatisticProvider( final LatticeStatisticProvider provider) { cache = CacheBuilder.<Pair<Lattice, Lattice.Column>>newBuilder() .build( http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/materialize/Lattice.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/materialize/Lattice.java b/core/src/main/java/org/apache/calcite/materialize/Lattice.java index 8ebfce9..20a28a7 100644 --- a/core/src/main/java/org/apache/calcite/materialize/Lattice.java +++ b/core/src/main/java/org/apache/calcite/materialize/Lattice.java @@ -445,7 +445,7 @@ public class Lattice { final List<IntPair> pairs = Lists.newArrayList(); - public Edge(RelNode source, RelNode target) { + Edge(RelNode source, RelNode target) { super(source, target); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java b/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java index e94781d..bc98d94 100644 --- a/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java +++ b/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java @@ -99,7 +99,7 @@ public class TileSuggester { private final TableImpl table; private final ImmutableList<AttributeImpl> attributes; - public SchemaImpl(Lattice lattice, StatisticsProvider statisticsProvider) { + SchemaImpl(Lattice lattice, StatisticsProvider statisticsProvider) { this.statisticsProvider = statisticsProvider; this.table = new TableImpl(); final ImmutableList.Builder<AttributeImpl> attributeBuilder = @@ -197,7 +197,7 @@ public class TileSuggester { private static class StatisticsProviderImpl implements StatisticsProvider { private final Lattice lattice; - public StatisticsProviderImpl(Lattice lattice) { + StatisticsProviderImpl(Lattice lattice) { this.lattice = lattice; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java b/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java index 2cb0d58..a0b7e37 100644 --- a/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java +++ b/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java @@ -221,8 +221,7 @@ public class ConventionTraitDef extends RelTraitDef<Convention> { * conversion rules. Maps {@link DefaultEdge} to a * collection of {@link ConverterRule} objects. */ - final Multimap<Pair<Convention, Convention>, ConverterRule> - mapArcToConverterRule = + final Multimap<Pair<Convention, Convention>, ConverterRule> mapArcToConverterRule = HashMultimap.create(); private Graphs.FrozenGraph<Convention, DefaultEdge> pathMap; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java b/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java index e2bf62f..a7d1b00 100644 --- a/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java +++ b/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java @@ -131,7 +131,9 @@ class RelCompositeTrait<T extends RelMultipleTrait> implements RelTrait { return traits.length; } - /** Composite trait with 0 elements. */ + /** Composite trait with 0 elements. + * + * @param <T> trait type */ private static class EmptyCompositeTrait<T extends RelMultipleTrait> extends RelCompositeTrait<T> { private EmptyCompositeTrait(RelTraitDef traitDef) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/RelOptListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptListener.java b/core/src/main/java/org/apache/calcite/plan/RelOptListener.java index 42109ae..fdc8173 100644 --- a/core/src/main/java/org/apache/calcite/plan/RelOptListener.java +++ b/core/src/main/java/org/apache/calcite/plan/RelOptListener.java @@ -85,7 +85,7 @@ public interface RelOptListener extends EventListener { * Event class for abstract event dealing with a relational expression. The * source of an event is typically the RelOptPlanner which initiated it. */ - public abstract static class RelEvent extends EventObject { + abstract class RelEvent extends EventObject { private final RelNode rel; protected RelEvent(Object eventSource, RelNode rel) { @@ -99,7 +99,7 @@ public interface RelOptListener extends EventListener { } /** Event indicating that a relational expression has been chosen. */ - public static class RelChosenEvent extends RelEvent { + class RelChosenEvent extends RelEvent { public RelChosenEvent(Object eventSource, RelNode rel) { super(eventSource, rel); } @@ -107,7 +107,7 @@ public interface RelOptListener extends EventListener { /** Event indicating that a relational expression has been found to * be equivalent to an equivalence class. */ - public static class RelEquivalenceEvent extends RelEvent { + class RelEquivalenceEvent extends RelEvent { private final Object equivalenceClass; private final boolean isPhysical; @@ -131,14 +131,14 @@ public interface RelOptListener extends EventListener { } /** Event indicating that a relational expression has been discarded. */ - public static class RelDiscardedEvent extends RelEvent { + class RelDiscardedEvent extends RelEvent { public RelDiscardedEvent(Object eventSource, RelNode rel) { super(eventSource, rel); } } /** Event indicating that a planner rule has fired. */ - public abstract static class RuleEvent extends RelEvent { + abstract class RuleEvent extends RelEvent { private final RelOptRuleCall ruleCall; protected RuleEvent( @@ -155,7 +155,7 @@ public interface RelOptListener extends EventListener { } /** Event indicating that a planner rule has been attemptedd. */ - public static class RuleAttemptedEvent extends RuleEvent { + class RuleAttemptedEvent extends RuleEvent { private final boolean before; public RuleAttemptedEvent( @@ -173,7 +173,7 @@ public interface RelOptListener extends EventListener { } /** Event indicating that a planner rule has produced a result. */ - public static class RuleProductionEvent extends RuleAttemptedEvent { + class RuleProductionEvent extends RuleAttemptedEvent { public RuleProductionEvent( Object eventSource, RelNode rel, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/RelOptRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptRule.java b/core/src/main/java/org/apache/calcite/plan/RelOptRule.java index 4c3765d..c5af926 100644 --- a/core/src/main/java/org/apache/calcite/plan/RelOptRule.java +++ b/core/src/main/java/org/apache/calcite/plan/RelOptRule.java @@ -225,7 +225,7 @@ public abstract class RelOptRule { * @param predicate Predicate to apply to relational expression */ protected static <R extends RelNode> ConverterRelOptRuleOperand - convertOperand(Class<R> clazz, Predicate<? super R> predicate, + convertOperand(Class<R> clazz, Predicate<? super R> predicate, RelTrait trait) { return new ConverterRelOptRuleOperand(clazz, trait, predicate); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java index e5419e5..5c4aa0b 100644 --- a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java +++ b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java @@ -373,7 +373,7 @@ public abstract class RelOptUtil { final RelDataType type2 = pair.right.getType(); // If one of the types is ANY comparison should succeed if (type1.getSqlTypeName() == SqlTypeName.ANY - || type2.getSqlTypeName() == SqlTypeName.ANY) { + || type2.getSqlTypeName() == SqlTypeName.ANY) { continue; } if (!type1.equals(type2)) { @@ -433,9 +433,7 @@ public abstract class RelOptUtil { } else if (node.e.isA(SqlKind.CAST)) { final RexNode operand = ((RexCall) node.e).getOperands().get(0); if (operand instanceof RexInputRef) { - mapping.set( - node.i, - ((RexInputRef) operand).getIndex()); + mapping.set(node.i, ((RexInputRef) operand).getIndex()); } } } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java b/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java index 466c38d..f7cd9e1 100644 --- a/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java +++ b/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java @@ -523,7 +523,9 @@ public class RexImplicationChecker { /** * Usage of a {@link RexInputRef} in an expression. - */ + * + * @param <T1> left type + * @param <T2> right type */ private static class InputRefUsage<T1, T2> { private final List<Pair<T1, T2>> usageList = new ArrayList<>(); private int usageCount = 0; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java b/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java index d6ef1fd..3e2843d 100644 --- a/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java +++ b/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java @@ -38,7 +38,7 @@ public class TableAccessMap { //~ Enums ------------------------------------------------------------------ /** Access mode. */ - public static enum Mode { + public enum Mode { /** * Table is not accessed at all. */ http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java b/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java index 86272e8..2529372 100644 --- a/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java +++ b/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java @@ -38,7 +38,9 @@ abstract class HepInstruction { //~ Inner Classes ---------------------------------------------------------- - /** Instruction that executes all rules of a given class. */ + /** Instruction that executes all rules of a given class. + * + * @param <R> rule type */ static class RuleClass<R extends RelOptRule> extends HepInstruction { Class<R> ruleClass; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java index 3ed2b96..48681eb 100644 --- a/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java +++ b/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java @@ -44,8 +44,8 @@ class HepRelMetadataProvider implements RelMetadataProvider { return 107; } - public <M extends Metadata> UnboundMetadata<M> - apply(Class<? extends RelNode> relClass, + public <M extends Metadata> UnboundMetadata<M> apply( + Class<? extends RelNode> relClass, final Class<? extends M> metadataClass) { return new UnboundMetadata<M>() { public M bind(RelNode rel, RelMetadataQuery mq) { @@ -62,8 +62,8 @@ class HepRelMetadataProvider implements RelMetadataProvider { }; } - public <M extends Metadata> Multimap<Method, MetadataHandler<M>> - handlers(MetadataDef<M> def) { + public <M extends Metadata> Multimap<Method, MetadataHandler<M>> handlers( + MetadataDef<M> def) { return ImmutableMultimap.of(); } } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java b/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java index 2d93c87..1205448 100644 --- a/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java +++ b/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java @@ -158,12 +158,12 @@ class RelSet { assert other.getTraitSet().size() == subset.getTraitSet().size(); if ((other == subset) - || (subsetToOthers - && !subset.getConvention().useAbstractConvertersForConversion( - subset.getTraitSet(), other.getTraitSet())) - || (!subsetToOthers - && !other.getConvention().useAbstractConvertersForConversion( - other.getTraitSet(), subset.getTraitSet()))) { + || (subsetToOthers + && !subset.getConvention().useAbstractConvertersForConversion( + subset.getTraitSet(), other.getTraitSet())) + || (!subsetToOthers + && !other.getConvention().useAbstractConvertersForConversion( + other.getTraitSet(), subset.getTraitSet()))) { continue; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java index f364704..281e472 100644 --- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java +++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java @@ -139,7 +139,7 @@ public class VolcanoPlanner extends AbstractRelOptPlanner { * operands based on the class of the RelNode.</p> */ private final Multimap<Class<? extends RelNode>, RelOptRuleOperand> - classOperands = LinkedListMultimap.create(); + classOperands = LinkedListMultimap.create(); /** * List of all sets. Used only for debugging. @@ -282,7 +282,7 @@ public class VolcanoPlanner extends AbstractRelOptPlanner { //~ Methods ---------------------------------------------------------------- protected VolcanoPlannerPhaseRuleMappingInitializer - getPhaseRuleMappingInitializer() { + getPhaseRuleMappingInitializer() { return new VolcanoPlannerPhaseRuleMappingInitializer() { public void initialize( Map<VolcanoPlannerPhase, Set<String>> phaseRuleMap) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java index f996707..17f28f7 100644 --- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java +++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java @@ -44,8 +44,8 @@ public class VolcanoRelMetadataProvider implements RelMetadataProvider { return 103; } - public <M extends Metadata> UnboundMetadata<M> - apply(Class<? extends RelNode> relClass, + public <M extends Metadata> UnboundMetadata<M> apply( + Class<? extends RelNode> relClass, final Class<? extends M> metadataClass) { if (relClass != RelSubset.class) { // let someone else further down the chain sort it out @@ -115,8 +115,8 @@ public class VolcanoRelMetadataProvider implements RelMetadataProvider { }; } - public <M extends Metadata> Multimap<Method, MetadataHandler<M>> - handlers(MetadataDef<M> def) { + public <M extends Metadata> Multimap<Method, MetadataHandler<M>> handlers( + MetadataDef<M> def) { return ImmutableMultimap.of(); } } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java b/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java index 3360627..92cb104 100644 --- a/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java +++ b/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java @@ -58,7 +58,7 @@ import java.util.List; * Context for populating a {@link Prepare.Materialization}. */ class CalciteMaterializer extends CalcitePrepareImpl.CalcitePreparingStmt { - public CalciteMaterializer(CalcitePrepareImpl prepare, + CalciteMaterializer(CalcitePrepareImpl prepare, CalcitePrepare.Context context, CatalogReader catalogReader, CalciteSchema schema, RelOptPlanner planner, SqlRexConvertletTable convertletTable) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java b/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java index 392bcae..72fa04b 100644 --- a/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java +++ b/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java @@ -1068,7 +1068,7 @@ public class CalcitePrepareImpl implements CalcitePrepare { private int expansionDepth; private SqlValidator sqlValidator; - public CalcitePreparingStmt(CalcitePrepareImpl prepare, + CalcitePreparingStmt(CalcitePrepareImpl prepare, Context context, CatalogReader catalogReader, RelDataTypeFactory typeFactory, @@ -1311,7 +1311,7 @@ public class CalcitePrepareImpl implements CalcitePrepare { /** An {@code EXPLAIN} statement, prepared and ready to execute. */ private static class CalcitePreparedExplain extends Prepare.PreparedExplain { - public CalcitePreparedExplain( + CalcitePreparedExplain( RelDataType resultType, RelDataType parameterRowType, RelRoot root, @@ -1349,7 +1349,7 @@ public class CalcitePrepareImpl implements CalcitePrepare { static class EmptyScalarTranslator implements ScalarTranslator { private final RexBuilder rexBuilder; - public EmptyScalarTranslator(RexBuilder rexBuilder) { + EmptyScalarTranslator(RexBuilder rexBuilder) { this.rexBuilder = rexBuilder; } @@ -1472,7 +1472,7 @@ public class CalcitePrepareImpl implements CalcitePrepare { private final List<ParameterExpression> parameterList; private final List<RexNode> values; - public LambdaScalarTranslator( + LambdaScalarTranslator( RexBuilder rexBuilder, List<ParameterExpression> parameterList, List<RexNode> values) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java b/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java index 68e9d0f..4445f43 100644 --- a/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java +++ b/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java @@ -25,7 +25,7 @@ import org.apache.calcite.sql.validate.SqlValidatorImpl; /** Validator. */ class CalciteSqlValidator extends SqlValidatorImpl { - public CalciteSqlValidator(SqlOperatorTable opTab, + CalciteSqlValidator(SqlOperatorTable opTab, CalciteCatalogReader catalogReader, JavaTypeFactory typeFactory, SqlConformance conformance) { super(opTab, catalogReader, typeFactory, conformance); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java b/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java index 387d958..3a52ba5 100644 --- a/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java +++ b/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java @@ -54,7 +54,7 @@ class LixToRelTranslator implements RelOptTable.ToRelContext { private final Prepare preparingStmt; final JavaTypeFactory typeFactory; - public LixToRelTranslator(RelOptCluster cluster, Prepare preparingStmt) { + LixToRelTranslator(RelOptCluster cluster, Prepare preparingStmt) { this.cluster = cluster; this.preparingStmt = preparingStmt; this.typeFactory = (JavaTypeFactory) cluster.getTypeFactory(); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java b/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java index 10772b4..5edf4cc 100644 --- a/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java +++ b/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java @@ -78,7 +78,7 @@ class QueryableRelBuilder<T> implements QueryableFactory<T> { private final LixToRelTranslator translator; private RelNode rel; - public QueryableRelBuilder(LixToRelTranslator translator) { + QueryableRelBuilder(LixToRelTranslator translator) { this.translator = translator; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java b/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java index ee82512..27a4faa 100644 --- a/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java +++ b/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java @@ -337,7 +337,7 @@ public class RelOptTableImpl extends Prepare.AbstractPreparingTable { private final String name; private final Schema schema; - public MySchemaPlus(SchemaPlus parent, String name, Schema schema) { + MySchemaPlus(SchemaPlus parent, String name, Schema schema) { this.parent = parent; this.name = name; this.schema = schema; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/core/Match.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/core/Match.java b/core/src/main/java/org/apache/calcite/rel/core/Match.java index 13c34bf..2278954 100644 --- a/core/src/main/java/org/apache/calcite/rel/core/Match.java +++ b/core/src/main/java/org/apache/calcite/rel/core/Match.java @@ -132,8 +132,8 @@ public abstract class Match extends SingleRel { /** Creates an immutable map of a map of sorted sets. */ private static <K extends Comparable<K>, V> - ImmutableSortedMap<K, SortedSet<V>> copyMap( - Map<K, ? extends SortedSet<V>> map) { + ImmutableSortedMap<K, SortedSet<V>> + copyMap(Map<K, ? extends SortedSet<V>> map) { final ImmutableSortedMap.Builder<K, SortedSet<V>> b = ImmutableSortedMap.naturalOrder(); for (Map.Entry<K, ? extends SortedSet<V>> e : map.entrySet()) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java b/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java index e7e5f72..c98a109 100644 --- a/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java +++ b/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java @@ -71,10 +71,10 @@ public class RelFactories { new SemiJoinFactoryImpl(); public static final SortFactory DEFAULT_SORT_FACTORY = - new SortFactoryImpl(); + new SortFactoryImpl(); public static final AggregateFactory DEFAULT_AGGREGATE_FACTORY = - new AggregateFactoryImpl(); + new AggregateFactoryImpl(); public static final MatchFactory DEFAULT_MATCH_FACTORY = new MatchFactoryImpl(); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java index 1b6445e..987bf5f 100644 --- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java +++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java @@ -312,7 +312,7 @@ public final class LogicalWindow extends Window { private final RexWindowBound lowerBound; private final RexWindowBound upperBound; - public WindowKey( + WindowKey( ImmutableBitSet groupSet, RelCollation orderKeys, boolean isRows, @@ -347,15 +347,15 @@ public final class LogicalWindow extends Window { // Look up or create a window. RelCollation orderKeys = getCollation( - Lists.newArrayList( - Iterables.filter(aggWindow.orderKeys, - new PredicateImpl<RexFieldCollation>() { - public boolean test(RexFieldCollation rexFieldCollation) { - // If ORDER BY references constant (i.e. RexInputRef), - // then we can ignore such ORDER BY key. - return rexFieldCollation.left instanceof RexLocalRef; - } - }))); + Lists.newArrayList( + Iterables.filter(aggWindow.orderKeys, + new PredicateImpl<RexFieldCollation>() { + public boolean test(RexFieldCollation rexFieldCollation) { + // If ORDER BY references constant (i.e. RexInputRef), + // then we can ignore such ORDER BY key. + return rexFieldCollation.left instanceof RexLocalRef; + } + }))); ImmutableBitSet groupSet = ImmutableBitSet.of(getProjectOrdinals(aggWindow.partitionKeys)); final int groupLength = groupSet.length();
