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 fdb5840481baa0cb92ad8c9eb4a28f02b4215093 Author: Julian Hyde <[email protected]> AuthorDate: Mon Feb 13 19:19:04 2023 -0800 Autostyle: Disallow space or newline before ')' in method declaration --- build.gradle.kts | 1 + .../java/org/apache/calcite/adapter/cassandra/CassandraSchema.java | 3 +-- .../java/org/apache/calcite/adapter/cassandra/CassandraTable.java | 3 +-- core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java | 3 +-- core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java | 3 +-- core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java | 3 +-- core/src/main/java/org/apache/calcite/rex/RexLiteral.java | 3 +-- core/src/main/java/org/apache/calcite/util/ImmutableBitSet.java | 5 ++--- core/src/main/java/org/apache/calcite/util/mapping/Mappings.java | 3 +-- .../org/apache/calcite/plan/volcano/MultipleTraitConversionTest.java | 3 +-- .../src/main/java/org/apache/calcite/linq4j/tree/BlockStatement.java | 3 +-- 11 files changed, 12 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bbde9d140f..17b0fbd3ab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -583,6 +583,7 @@ 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+\\) \\{", ") {") // 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..5d23987a07 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 @@ -112,8 +112,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..9f53b35ca5 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; 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/type/RelDataTypeImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java index 0b0bbac6a8..5a0e971b8e 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 @@ -308,8 +308,7 @@ public abstract class RelDataTypeImpl */ @SuppressWarnings("method.invocation.invalid") protected void computeDigest( - @UnknownInitialization RelDataTypeImpl this - ) { + @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/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/test/java/org/apache/calcite/plan/volcano/MultipleTraitConversionTest.java b/core/src/test/java/org/apache/calcite/plan/volcano/MultipleTraitConversionTest.java index a39e97fb4b..b820a5dc06 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,8 +168,7 @@ public class MultipleTraitConversionTest { RelOptPlanner planner, RelNode rel, CustomTrait toTrait, - boolean allowInfiniteCostConverters - ) { + boolean allowInfiniteCostConverters) { return new CustomTraitEnforcer( rel.getCluster(), rel.getTraitSet().replace(toTrait), 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) {
