This is an automated email from the ASF dual-hosted git repository. jhyde pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/calcite.git
commit baab45c99769cfd1d98f1afd115c301834f1961e Author: Julian Hyde <[email protected]> AuthorDate: Mon Feb 13 19:19:04 2023 -0800 Autostyle: Disallow space or newline before ')' in method declaration or call --- build.gradle.kts | 2 ++ .../apache/calcite/adapter/cassandra/CassandraSchema.java | 6 ++---- .../apache/calcite/adapter/cassandra/CassandraTable.java | 6 ++---- .../adapter/enumerable/EnumerableLimitSortRule.java | 3 +-- .../adapter/enumerable/EnumerableNestedLoopJoin.java | 3 +-- .../adapter/enumerable/EnumerableTableFunctionScan.java | 3 +-- .../org/apache/calcite/adapter/enumerable/RexImpTable.java | 7 +++---- .../main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java | 3 +-- .../calcite/plan/visualizer/RuleMatchVisualizer.java | 3 +-- .../java/org/apache/calcite/plan/volcano/RelSubset.java | 3 +-- .../main/java/org/apache/calcite/rel/AbstractRelNode.java | 3 +-- .../rel/rules/AggregateProjectConstantToDummyJoinRule.java | 5 ++--- .../apache/calcite/rel/type/RelDataTypeFactoryImpl.java | 3 +-- .../java/org/apache/calcite/rel/type/RelDataTypeImpl.java | 4 +--- core/src/main/java/org/apache/calcite/rex/RexLiteral.java | 3 +-- .../org/apache/calcite/sql/fun/SqlStdOperatorTable.java | 3 +-- .../org/apache/calcite/sql/pretty/SqlPrettyWriter.java | 6 ++---- .../org/apache/calcite/sql2rel/InitializerContext.java | 14 ++++++++------ .../main/java/org/apache/calcite/util/ImmutableBitSet.java | 5 ++--- .../java/org/apache/calcite/util/mapping/Mappings.java | 3 +-- .../java/org/apache/calcite/util/trace/CalciteTrace.java | 3 +-- .../test/java/org/apache/calcite/plan/RelOptUtilTest.java | 3 +-- .../calcite/plan/volcano/MultipleTraitConversionTest.java | 6 ++---- .../org/apache/calcite/rel/metadata/MetadataDefTest.java | 13 ++++++------- .../org/apache/calcite/rel/metadata/RelMdUtilTest.java | 5 ++--- .../org/apache/calcite/test/SqlHintsConverterTest.java | 6 ++---- core/src/test/java/org/apache/calcite/util/SourceTest.java | 7 ++----- core/src/test/java/org/apache/calcite/util/UtilTest.java | 3 +-- .../adapter/elasticsearch/ElasticsearchSchemaFactory.java | 3 +-- .../apache/calcite/adapter/innodb/InnodbAdapterTest.java | 3 +-- .../org/apache/calcite/linq4j/tree/BlockStatement.java | 3 +-- .../java/org/apache/calcite/linq4j/test/LimitSortTest.java | 3 +-- .../calcite/benchmarks/RelNodeConversionBenchmark.java | 3 +-- 33 files changed, 57 insertions(+), 92 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bbde9d140f..3f9afa6201 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -583,6 +583,8 @@ allprojects { // (?-m) disables multiline, so $ matches the very end of the file rather than end of line replaceRegex("Remove '// End file.java' trailer", "(?-m)\n// End [^\n]+\\.\\w+\\s*$", "") replaceRegex("<p> should not be placed a the end of the line", "(?-m)\\s*+<p> *+\n \\* ", "\n *\n * <p>") + replaceRegex("Method parameter list should not end in whitespace or newline", "(?<!;)\\s+\\) \\{", ") {") + replaceRegex("Method argument list should not end in whitespace or newline", "(?<!;)\\s+\\);", ");") // Assume developer copy-pasted the link, and updated text only, so the url is old, and we replace it with the proper one replaceRegex(">[CALCITE-...] link styles: 1", "<a(?:(?!CALCITE-)[^>])++CALCITE-\\d+[^>]++>\\s*+\\[?(CALCITE-\\d+)\\]?", "<a href=\"https://issues.apache.org/jira/browse/\$1\";>[\$1]") // If the link was crafted manually, ensure it has [CALCITE-...] in the link text diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java index f0291397be..cef74d7360 100644 --- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java +++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java @@ -96,8 +96,7 @@ public class CassandraSchema extends AbstractSchema { session.getKeyspace() .orElseThrow(() -> new RuntimeException("No keyspace for session " + session.getName())) .asInternal(), - name - ); + name); } /** @@ -112,8 +111,7 @@ public class CassandraSchema extends AbstractSchema { CqlSession session, SchemaPlus parentSchema, String keyspace, - String name - ) { + String name) { super(); this.session = session; 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 31550c13e7..0a374b6829 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 @@ -77,8 +77,7 @@ public class CassandraTable extends AbstractQueryableTable CassandraSchema schema, String keyspace, String columnFamily, - boolean isView - ) { + boolean isView) { super(Object[].class); this.keyspace = Optional.of(keyspace); this.columnFamily = columnFamily; @@ -197,8 +196,7 @@ public class CassandraTable extends AbstractQueryableTable .append(" FROM \""); keyspace.ifPresent(s -> - queryBuilder.append(s).append("\".\"") - ); + queryBuilder.append(s).append("\".\"")); queryBuilder .append(columnFamily) diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimitSortRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimitSortRule.java index 14e6e65361..4aa2ae540a 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimitSortRule.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimitSortRule.java @@ -44,8 +44,7 @@ public class EnumerableLimitSortRule extends RelRule<EnumerableLimitSortRule.Con final Sort o = EnumerableLimitSort.create( convert(input, input.getTraitSet().replace(EnumerableConvention.INSTANCE)), sort.getCollation(), - sort.offset, sort.fetch - ); + sort.offset, sort.fetch); call.transformTo(o); } diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java index bd0d28827c..6b1bf40cf7 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java @@ -138,8 +138,7 @@ public class EnumerableNestedLoopJoin extends Join implements EnumerableRel { @Override public @Nullable Pair<RelTraitSet, List<RelTraitSet>> deriveTraits( final RelTraitSet childTraits, final int childId) { return EnumerableTraitsUtils.deriveTraitsForJoin( - childTraits, childId, joinType, traitSet, right.getTraitSet() - ); + childTraits, childId, joinType, traitSet, right.getTraitSet()); } @Override public DeriveMode getDeriveMode() { diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java index 872856fa30..c2f8a066d9 100644 --- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java +++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java @@ -155,8 +155,7 @@ public class EnumerableTableFunctionScan extends TableFunctionScan inputEnumerable, result.physType, physType - ) - ); + )); return implementor.result(physType, builder.toBlock()); } 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 66c4460e80..3e3eeb621f 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 @@ -1393,8 +1393,7 @@ public class RexImpTable { Expressions.call(add.accumulator().get(0), BuiltInMethod.COLLECTION_RETAIN_ALL.method, add.arguments().get(0)) - ) - ); + )); add.currentBlock().add( Expressions.ifThenElse( @@ -2951,8 +2950,8 @@ public class RexImpTable { Expressions.equal(nullValue, expression)), Expressions.assign(list, nullValue), Expressions.statement( - Expressions.call(list, BuiltInMethod.COLLECTION_ADDALL.method, expression))) - ); + Expressions.call(list, + BuiltInMethod.COLLECTION_ADDALL.method, expression)))); } return list; } 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 32289b795c..b465b68056 100644 --- a/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java +++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java @@ -536,8 +536,7 @@ public class CalciteMetaImpl extends MetaImpl { op.getName(), (short) DatabaseMetaData.functionResultUnknown, op.getName() - ) - ); + )); } return Linq4j.asEnumerable(schema.calciteSchema.getFunctionNames()) .selectMany(name -> diff --git a/core/src/main/java/org/apache/calcite/plan/visualizer/RuleMatchVisualizer.java b/core/src/main/java/org/apache/calcite/plan/visualizer/RuleMatchVisualizer.java index 6df52ad295..7851ec1564 100644 --- a/core/src/main/java/org/apache/calcite/plan/visualizer/RuleMatchVisualizer.java +++ b/core/src/main/java/org/apache/calcite/plan/visualizer/RuleMatchVisualizer.java @@ -474,8 +474,7 @@ public class RuleMatchVisualizer implements RelOptListener { formatCostScientific(cost.getRows()), formatCostScientific(cost.getCpu()), formatCostScientific(cost.getIo()) - } - ); + }); } private static String formatCostScientific(double costNumber) { diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java b/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java index 3271f97c6c..06b5fc4e94 100644 --- a/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java +++ b/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java @@ -171,8 +171,7 @@ public class RelSubset extends AbstractRelNode { private void computeBestCost( @UnderInitialization RelSubset this, RelOptCluster cluster, - RelOptPlanner planner - ) { + RelOptPlanner planner) { bestCost = planner.getCostFactory().makeInfiniteCost(); final RelMetadataQuery mq = cluster.getMetadataQuery(); @SuppressWarnings("method.invocation.invalid") diff --git a/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java b/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java index f7902cffd9..53e6d95911 100644 --- a/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java +++ b/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java @@ -126,8 +126,7 @@ public abstract class AbstractRelNode implements RelNode { @Pure @Override public final @Nullable Convention getConvention( - @UnknownInitialization AbstractRelNode this - ) { + @UnknownInitialization AbstractRelNode this) { return traitSet == null ? null : traitSet.getTrait(ConventionTraitDef.INSTANCE); } diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectConstantToDummyJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectConstantToDummyJoinRule.java index abfb7f8a84..7261851332 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectConstantToDummyJoinRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectConstantToDummyJoinRule.java @@ -114,9 +114,8 @@ public final class AggregateProjectConstantToDummyJoinRule builder.project(newProjects); builder.aggregate( - builder.groupKey( - aggregate.getGroupSet(), aggregate.getGroupSets()), aggregate.getAggCallList() - ); + builder.groupKey(aggregate.getGroupSet(), aggregate.getGroupSets()), + aggregate.getAggCallList()); call.transformTo(builder.build()); } diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java index 3f3b090455..13cbe516c8 100644 --- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java +++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java @@ -252,8 +252,7 @@ public abstract class RelDataTypeFactoryImpl implements RelDataTypeFactory { final int k = j; RelDataType type = leastRestrictive( - Util.transform(types, t -> t.getFieldList().get(k).getType()) - ); + Util.transform(types, t -> t.getFieldList().get(k).getType())); if (type == null) { return null; } diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java index 0b0bbac6a8..274a6b72c8 100644 --- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java +++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java @@ -307,9 +307,7 @@ public abstract class RelDataTypeImpl * subclass constructor once the type is fully defined. */ @SuppressWarnings("method.invocation.invalid") - protected void computeDigest( - @UnknownInitialization RelDataTypeImpl this - ) { + protected void computeDigest(@UnknownInitialization RelDataTypeImpl this) { StringBuilder sb = new StringBuilder(); generateTypeString(sb, true); if (!isNullable()) { diff --git a/core/src/main/java/org/apache/calcite/rex/RexLiteral.java b/core/src/main/java/org/apache/calcite/rex/RexLiteral.java index 783f7558dc..3a66b7765e 100644 --- a/core/src/main/java/org/apache/calcite/rex/RexLiteral.java +++ b/core/src/main/java/org/apache/calcite/rex/RexLiteral.java @@ -298,8 +298,7 @@ public class RexLiteral extends RexNode { */ @RequiresNonNull("type") RexDigestIncludeType digestIncludesType( - @UnknownInitialization RexLiteral this - ) { + @UnknownInitialization RexLiteral this) { return shouldIncludeType(value, type); } diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java index 92e38fd03a..6c7f1cfc46 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java @@ -272,8 +272,7 @@ public class SqlStdOperatorTable extends ReflectiveSqlOperatorTable { "inferred CONCAT element type"); }), null, - OperandTypes.STRING_SAME_SAME_OR_ARRAY_SAME_SAME - ); + OperandTypes.STRING_SAME_SAME_OR_ARRAY_SAME_SAME); /** diff --git a/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java b/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java index 1471565a8f..8c4d63d050 100644 --- a/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java +++ b/core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java @@ -1424,8 +1424,7 @@ public class SqlPrettyWriter implements SqlWriter { public void set(String name, String value) { final Method method = requireNonNull( setterMethods.get(name), - () -> "setter method " + name + " not found" - ); + () -> "setter method " + name + " not found"); try { method.invoke(o, value); } catch (IllegalAccessException | InvocationTargetException e) { @@ -1436,8 +1435,7 @@ public class SqlPrettyWriter implements SqlWriter { public @Nullable Object get(String name) { final Method method = requireNonNull( getterMethods.get(name), - () -> "getter method " + name + " not found" - ); + () -> "getter method " + name + " not found"); try { return method.invoke(o); } catch (IllegalAccessException | InvocationTargetException e) { diff --git a/core/src/main/java/org/apache/calcite/sql2rel/InitializerContext.java b/core/src/main/java/org/apache/calcite/sql2rel/InitializerContext.java index 8006622a4d..95314fab83 100644 --- a/core/src/main/java/org/apache/calcite/sql2rel/InitializerContext.java +++ b/core/src/main/java/org/apache/calcite/sql2rel/InitializerContext.java @@ -30,15 +30,17 @@ public interface InitializerContext { RexBuilder getRexBuilder(); /** - * Parse a column computation expression for a table. Usually this expression is declared - * in the create table statement, i.e. - * <pre> + * Parses a column computation expression for a table. + * + * <p>Usually this expression is declared in the {@code CREATE TABLE} + * statement, e.g. + * + * <blockquote><pre>{@code * create table t( * a int not null, * b varchar(5) as (my_udf(a)) virtual, - * c int not null as (a + 1) - * ); - * </pre> + * c int not null as (a + 1)); + * }</pre></blockquote> * * <p>You can use the string format expression "my_udf(a)" and "a + 1" * as the initializer expression of column b and c. diff --git a/core/src/main/java/org/apache/calcite/util/ImmutableBitSet.java b/core/src/main/java/org/apache/calcite/util/ImmutableBitSet.java index 256ac756a8..c3ae4ca42e 100644 --- a/core/src/main/java/org/apache/calcite/util/ImmutableBitSet.java +++ b/core/src/main/java/org/apache/calcite/util/ImmutableBitSet.java @@ -498,7 +498,7 @@ public class ImmutableBitSet * that occurs on or after the specified starting index. If no such * bit exists then {@code -1} is returned. * - * <p>Based upon {@link BitSet#nextSetBit}. + * <p>Based upon {@link BitSet#nextSetBit(int)}. * * @param fromIndex the index to start checking from (inclusive) * @return the index of the next set bit, or {@code -1} if there @@ -972,8 +972,7 @@ public class ImmutableBitSet @RequiresNonNull("equivalence") private ImmutableBitSet computeClosure( @UnderInitialization Closure this, - int pos - ) { + int pos) { ImmutableBitSet o = closure.get(pos); if (o != null) { return o; diff --git a/core/src/main/java/org/apache/calcite/util/mapping/Mappings.java b/core/src/main/java/org/apache/calcite/util/mapping/Mappings.java index ebad6bbed4..a9bf7d9b1a 100644 --- a/core/src/main/java/org/apache/calcite/util/mapping/Mappings.java +++ b/core/src/main/java/org/apache/calcite/util/mapping/Mappings.java @@ -1348,8 +1348,7 @@ public abstract class Mappings { } private void advance( - @UnknownInitialization MappingItr this - ) { + @UnknownInitialization MappingItr this) { do { ++i; } while (i < targets.length && targets[i] == -1); diff --git a/core/src/main/java/org/apache/calcite/util/trace/CalciteTrace.java b/core/src/main/java/org/apache/calcite/util/trace/CalciteTrace.java index e2b0fcfbbd..6a50dac5a6 100644 --- a/core/src/main/java/org/apache/calcite/util/trace/CalciteTrace.java +++ b/core/src/main/java/org/apache/calcite/util/trace/CalciteTrace.java @@ -129,8 +129,7 @@ public abstract class CalciteTrace { public static Logger getRuleAttemptsTracer() { return LoggerFactory.getLogger( - AbstractRelOptPlanner.class.getName() + ".rule_execution_summary" - ); + AbstractRelOptPlanner.class.getName() + ".rule_execution_summary"); } /** diff --git a/core/src/test/java/org/apache/calcite/plan/RelOptUtilTest.java b/core/src/test/java/org/apache/calcite/plan/RelOptUtilTest.java index 54e9c88d16..ea16ef9d48 100644 --- a/core/src/test/java/org/apache/calcite/plan/RelOptUtilTest.java +++ b/core/src/test/java/org/apache/calcite/plan/RelOptUtilTest.java @@ -299,8 +299,7 @@ class RelOptUtilTest { joinCondition, joinKeys, null, - null - ); + null); final List<List<RexNode>> expectedJoinKeys = Arrays.asList( Collections.emptyList(), Collections.emptyList()); diff --git a/core/src/test/java/org/apache/calcite/plan/volcano/MultipleTraitConversionTest.java b/core/src/test/java/org/apache/calcite/plan/volcano/MultipleTraitConversionTest.java index a39e97fb4b..7d5853014d 100644 --- a/core/src/test/java/org/apache/calcite/plan/volcano/MultipleTraitConversionTest.java +++ b/core/src/test/java/org/apache/calcite/plan/volcano/MultipleTraitConversionTest.java @@ -168,13 +168,11 @@ public class MultipleTraitConversionTest { RelOptPlanner planner, RelNode rel, CustomTrait toTrait, - boolean allowInfiniteCostConverters - ) { + boolean allowInfiniteCostConverters) { return new CustomTraitEnforcer( rel.getCluster(), rel.getTraitSet().replace(toTrait), - rel - ); + rel); } @Override public boolean canConvert(RelOptPlanner planner, CustomTrait fromTrait, diff --git a/core/src/test/java/org/apache/calcite/rel/metadata/MetadataDefTest.java b/core/src/test/java/org/apache/calcite/rel/metadata/MetadataDefTest.java index b1658ed3df..5a19a17ad5 100644 --- a/core/src/test/java/org/apache/calcite/rel/metadata/MetadataDefTest.java +++ b/core/src/test/java/org/apache/calcite/rel/metadata/MetadataDefTest.java @@ -25,15 +25,14 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; */ class MetadataDefTest { @Test void staticMethodInHandlerIsIgnored() { - assertDoesNotThrow( - () -> MetadataDef.of(TestMetadata.class, MetadataHandlerWithStaticMethod.class) - ); + assertDoesNotThrow(() -> + MetadataDef.of(TestMetadata.class, + MetadataHandlerWithStaticMethod.class)); } @Test void synthenticMethodInHandlerIsIgnored() { - assertDoesNotThrow( - () -> MetadataDef.of(TestMetadata.class, - TestMetadataHandlers.handlerClassWithSyntheticMethod()) - ); + assertDoesNotThrow(() -> + MetadataDef.of(TestMetadata.class, + TestMetadataHandlers.handlerClassWithSyntheticMethod())); } } diff --git a/core/src/test/java/org/apache/calcite/rel/metadata/RelMdUtilTest.java b/core/src/test/java/org/apache/calcite/rel/metadata/RelMdUtilTest.java index 8d1a8016d4..b719108931 100644 --- a/core/src/test/java/org/apache/calcite/rel/metadata/RelMdUtilTest.java +++ b/core/src/test/java/org/apache/calcite/rel/metadata/RelMdUtilTest.java @@ -103,9 +103,8 @@ public class RelMdUtilTest { RelNode rel = sql("select * from emp limit ? offset ?").toRel(); Sort sort = (Sort) rel; assertFalse( - RelMdUtil.checkInputForCollationAndLimit(mq, sort.getInput(), RelCollations.EMPTY, - sort.offset, sort.fetch) - ); + RelMdUtil.checkInputForCollationAndLimit(mq, sort.getInput(), + RelCollations.EMPTY, sort.offset, sort.fetch)); return null; }); } diff --git a/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java b/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java index c715929868..7b6d0be82a 100644 --- a/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java +++ b/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java @@ -524,8 +524,7 @@ class SqlHintsConverterTest { .build(); // Validate Volcano planner. RuleSet ruleSet = RuleSets.ofList( - MockEnumerableJoinRule.create(hint) // Rule to validate the hint. - ); + MockEnumerableJoinRule.create(hint)); // Rule to validate the hint. ruleFixture() .sql(sql) .withTrim(true) @@ -545,8 +544,7 @@ class SqlHintsConverterTest { .build(); // Validate Volcano planner. RuleSet ruleSet = RuleSets.ofList( - MockEnumerableJoinRule.create(hint) // Rule to validate the hint. - ); + MockEnumerableJoinRule.create(hint)); // Rule to validate the hint. ruleFixture() .sql(sql) .withTrim(true) diff --git a/core/src/test/java/org/apache/calcite/util/SourceTest.java b/core/src/test/java/org/apache/calcite/util/SourceTest.java index 6546dcbbb3..683c561a5a 100644 --- a/core/src/test/java/org/apache/calcite/util/SourceTest.java +++ b/core/src/test/java/org/apache/calcite/util/SourceTest.java @@ -82,11 +82,8 @@ class SourceTest { arguments("abc def.txt", "file:abc%20def.txt"), arguments("abc+def.txt", "file:abc+def.txt"), arguments("path 1/ subfolder 2/abc.t x t", "file:path%201/%20subfolder%202/abc.t%20x%20t"), - arguments( - "маленькой ёлочке холодно зимой.txt", - "file:маленькой%20ёлочке%20холодно%20зимой.txt" - ) - ); + arguments("маленькой ёлочке холодно зимой.txt", + "file:маленькой%20ёлочке%20холодно%20зимой.txt")); } private static String slashify(String path) { diff --git a/core/src/test/java/org/apache/calcite/util/UtilTest.java b/core/src/test/java/org/apache/calcite/util/UtilTest.java index 399bf70399..fd706ba685 100644 --- a/core/src/test/java/org/apache/calcite/util/UtilTest.java +++ b/core/src/test/java/org/apache/calcite/util/UtilTest.java @@ -1206,8 +1206,7 @@ class UtilTest { assertThat(list2.appendAll(list2), is(Arrays.asList(1, 3, 5, 1, 3, 5))); assertThat( Arrays.toString(ImmutableIntList.of(1).toArray(new Integer[]{5, 6, 7})), - is("[1, null, 7]") - ); + is("[1, null, 7]")); } /** Unit test for {@link IdPair}. */ diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchemaFactory.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchemaFactory.java index afb49fa5d5..26a26630ae 100644 --- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchemaFactory.java +++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchemaFactory.java @@ -78,8 +78,7 @@ public class ElasticsearchSchemaFactory implements SchemaFactory { + "broken! Do not try to access more than {} distinct ES REST APIs through this " + "adapter.", REST_CLIENT_CACHE_SIZE, - REST_CLIENT_CACHE_SIZE - ); + REST_CLIENT_CACHE_SIZE); try { // Free resources allocated by this RestClient diff --git a/innodb/src/test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java b/innodb/src/test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java index f6da8dc69a..15c14dfc6f 100644 --- a/innodb/src/test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java +++ b/innodb/src/test/java/org/apache/calcite/adapter/innodb/InnodbAdapterTest.java @@ -1135,8 +1135,7 @@ public class InnodbAdapterTest { Pair.of(7934, "EMPNO=7934; ENAME=MILLER; JOB=CLERK; AGE=32; MGR=7782; " + "HIREDATE=1982-01-23; SAL=1300.00; COMM=null; DEPTNO=10; EMAIL=null; " + "CREATE_DATETIME=2016-09-02 23:15:01; CREATE_TIME=23:15:01; UPSERT_TIME=" - + expectedLocalTime("2016-09-02 23:15:01")) - ); + + expectedLocalTime("2016-09-02 23:15:01"))); static List<Pair<Integer, String>> reversedRows = rows.stream() .sorted(Comparator.reverseOrder()).collect(toList()); diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockStatement.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockStatement.java index 1bec4f4e25..ca99e7d32d 100644 --- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockStatement.java +++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockStatement.java @@ -43,8 +43,7 @@ public class BlockStatement extends Statement { private boolean distinctVariables( @UnderInitialization(BlockStatement.class) BlockStatement this, - boolean fail - ) { + boolean fail) { Set<String> names = new HashSet<>(); for (Statement statement : statements) { if (statement instanceof DeclarationStatement) { diff --git a/linq4j/src/test/java/org/apache/calcite/linq4j/test/LimitSortTest.java b/linq4j/src/test/java/org/apache/calcite/linq4j/test/LimitSortTest.java index 6b04c612b0..2146c04792 100644 --- a/linq4j/src/test/java/org/apache/calcite/linq4j/test/LimitSortTest.java +++ b/linq4j/src/test/java/org/apache/calcite/linq4j/test/LimitSortTest.java @@ -87,8 +87,7 @@ class LimitSortTest { this.enumerable(seed), s -> s.key, cmp, - offset, fetch - ); + offset, fetch); List<Row> result = ordered.toList(); assertTrue( diff --git a/ubenchmark/src/jmh/java/org/apache/calcite/benchmarks/RelNodeConversionBenchmark.java b/ubenchmark/src/jmh/java/org/apache/calcite/benchmarks/RelNodeConversionBenchmark.java index a6efb55ff7..52613a3fb0 100644 --- a/ubenchmark/src/jmh/java/org/apache/calcite/benchmarks/RelNodeConversionBenchmark.java +++ b/ubenchmark/src/jmh/java/org/apache/calcite/benchmarks/RelNodeConversionBenchmark.java @@ -92,8 +92,7 @@ public class RelNodeConversionBenchmark { String.format(Locale.ROOT, "c%s / CASE WHEN c%s > %d THEN c%s ELSE c%s END ", String.valueOf(rnd.nextInt(columnLength)), String.valueOf(i % columnLength), rnd.nextInt(columnLength), String.valueOf(rnd.nextInt(columnLength)), - String.valueOf(rnd.nextInt(columnLength))) - ); + String.valueOf(rnd.nextInt(columnLength)))); } sb.append(" FROM test1"); sql = sb.toString();
