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 74a2a18bcb87987e8cfc4e07df135ebae6f19b4c Author: Julian Hyde <[email protected]> AuthorDate: Sat May 6 12:41:28 2023 -0700 Code style: disallow '))' and ').' at the start of a line Disallow '))' and ').' at the start of a line (or preceded only by whitespace); we already disallow '),' and ');'. Autostyle now corrects foo(1 ).bar() to foo(1) .bar() Re-enable autostyle in test Java files. --- build.gradle.kts | 3 ++- .../calcite/adapter/cassandra/CassandraEnumerator.java | 4 ++-- .../apache/calcite/adapter/cassandra/CassandraSchema.java | 14 +++++++------- .../org/apache/calcite/sql/validate/DelegatingScope.java | 6 ++---- .../org/apache/calcite/sql/validate/SqlValidatorUtil.java | 4 ++-- .../apache/calcite/rel/rel2sql/RelToSqlConverterTest.java | 8 ++++---- .../org/apache/calcite/sql2rel/RelFieldTrimmerTest.java | 14 ++++++-------- .../apache/calcite/test/enumerable/EnumerableJoinTest.java | 12 ++++++------ .../java/org/apache/calcite/adapter/spark/SparkRules.java | 9 ++++++--- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7f3499e43b..38fa25f546 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -590,7 +590,8 @@ allprojects { replaceRegex("Remove '// End file.java' trailer", "(?-m)\n// End [^\n]+\\.\\w+\\s*$", "") replaceRegex("<p> should not be placed at 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+(\\)+[;,])", "$1") + replaceRegex("Method argument list should not end in whitespace or newline", "(?<!;)\\s+(\\)[);,])", "$1") + replaceRegex("Method argument list should not end in whitespace or newline", "(?<!;)(\\s+)(\\)+)[.]", "$2$1.") replaceRegex("Long assignment should be broken after '='", "^([^/*\"\\n]*) = ([^@\\n]*)\\(\n( *)", "$1 =\n$3$2(") replaceRegex("Long assignment should be broken after '='", "^([^/*\"\\n]*) = ([^@\\n]*)\\((.*,)\n( *)", "$1 =\n$4$2($3 ") // Assume developer copy-pasted the link, and updated text only, so the url is old, and we replace it with the proper one 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 98d30664a7..817c7c7126 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 @@ -127,8 +127,8 @@ class CassandraEnumerator implements Enumerator<Object> { .mapToObj(i -> tupleValue.get(i, CodecRegistry.DEFAULT.codecFor( - tupleValue.getType().getComponentTypes().get(i))) - ).map(this::convertToEnumeratorObject) + tupleValue.getType().getComponentTypes().get(i)))) + .map(this::convertToEnumeratorObject) .map(Objects::requireNonNull) // "null" cannot appear inside collections .toArray(); } 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 e5b4d8aa3a..31e22b0e3e 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 @@ -171,19 +171,19 @@ public class CassandraSchema extends AbstractSchema { CQL_TO_SQL_TYPE.lookup(((SetType) dataType).getElementType()); fieldInfo.add(columnName, - typeFactory.createMultisetType( - typeFactory.createSqlType(multiSetInnerType), -1) - ).nullable(true); + typeFactory.createMultisetType( + typeFactory.createSqlType(multiSetInnerType), -1)) + .nullable(true); } else if (dataType instanceof MapType) { MapType columnType = (MapType) dataType; SqlTypeName keyType = CQL_TO_SQL_TYPE.lookup(columnType.getKeyType()); SqlTypeName valueType = CQL_TO_SQL_TYPE.lookup(columnType.getValueType()); fieldInfo.add(columnName, - typeFactory.createMapType( - typeFactory.createSqlType(keyType), - typeFactory.createSqlType(valueType)) - ).nullable(true); + typeFactory.createMapType( + typeFactory.createSqlType(keyType), + typeFactory.createSqlType(valueType))) + .nullable(true); } else if (dataType instanceof TupleType) { List<DataType> typeArgs = ((TupleType) dataType).getComponentTypes(); List<Map.Entry<String, RelDataType>> typesList = diff --git a/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java b/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java index aa079cb71a..13ebd978c7 100644 --- a/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java +++ b/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java @@ -510,10 +510,8 @@ public abstract class DelegatingScope implements SqlValidatorScope { identifier, RESOURCE.columnNotFound(name)); } final RelDataTypeField field0 = - requireNonNull( - step.rowType, - () -> "rowType of step " + step.name - ).getFieldList().get(step.i); + requireNonNull(step.rowType, () -> "rowType of step " + step.name) + .getFieldList().get(step.i); final String fieldName = field0.getName(); switch (step.kind) { case PEEK_FIELDS: diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java index 53d2111ba3..ef52904d0d 100644 --- a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java +++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java @@ -829,9 +829,9 @@ public class SqlValidatorUtil { return; case ROLLUP: case CUBE: { - // GROUPING SETS ( (a), ROLLUP(c,b), CUBE(d,e) ) + // GROUPING SETS ((a), ROLLUP(c,b), CUBE(d,e)) // is EQUIVALENT to - // GROUPING SETS ( (a), (c,b), (b) ,(), (d,e), (d), (e) ). + // GROUPING SETS ((a), (c,b), (b) ,(), (d,e), (d), (e)). // Expand all ROLLUP/CUBE nodes List<ImmutableBitSet> operandBitSet = analyzeGroupTuple(scope, groupAnalyzer, diff --git a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java index cbc52712fc..f57c251a72 100644 --- a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java +++ b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java @@ -675,9 +675,8 @@ class RelToSqlConverterTest { .join(JoinRelType.INNER, b.call(SqlStdOperatorTable.EQUALS, b.field(2, 0, "K"), - b.field(2, 1, "K") - ) - ).project(b.alias(b.field(1), "l_v")) + b.field(2, 1, "K"))) + .project(b.alias(b.field(1), "l_v")) .build(); // RelFieldTrimmer maybe build the RelNode. relFn(fn).ok("SELECT \"t\".\"V\" AS \"l_v\"\n" @@ -4218,7 +4217,8 @@ class RelToSqlConverterTest { final String expectedClickHouse = "SELECT toMonday(`hire_date`)\n" + "FROM `foodmart`.`employee`"; final String expectedMssql = "SELECT CONVERT(DATETIME, CONVERT(VARCHAR(10), " - + "DATEADD(day, - (6 + DATEPART(weekday, [hire_date] )) % 7, [hire_date] " + + "DATEADD(day, - (6 + DATEPART(weekday, [hire_date] " + + ")) % 7, [hire_date] " + "), 126))\n" + "FROM [foodmart].[employee]"; final String expectedMysql = "SELECT STR_TO_DATE(DATE_FORMAT(`hire_date` , '%x%v-1'), " diff --git a/core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java b/core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java index 8f10a2cef7..618e2d93b9 100644 --- a/core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java +++ b/core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java @@ -285,11 +285,10 @@ class RelFieldTrimmerTest { HintStrategyTable.builder().hintStrategy("resource", HintPredicates.PROJECT).build()); final RelNode original = builder.scan("EMP") - .project( - builder.field("EMPNO"), + .project(builder.field("EMPNO"), builder.field("ENAME"), - builder.field("DEPTNO") - ).hints(projectHint) + builder.field("DEPTNO")) + .hints(projectHint) .sort(builder.field("EMPNO")) .project(builder.field("EMPNO")) .build(); @@ -412,11 +411,10 @@ class RelFieldTrimmerTest { HintStrategyTable.builder().hintStrategy("resource", HintPredicates.CALC).build()); final RelNode original = builder.scan("EMP") - .project( - builder.field("EMPNO"), + .project(builder.field("EMPNO"), builder.field("ENAME"), - builder.field("DEPTNO") - ).hints(calcHint) + builder.field("DEPTNO")) + .hints(calcHint) .sort(builder.field("EMPNO")) .project(builder.field("EMPNO")) .build(); diff --git a/core/src/test/java/org/apache/calcite/test/enumerable/EnumerableJoinTest.java b/core/src/test/java/org/apache/calcite/test/enumerable/EnumerableJoinTest.java index ccd311c831..81aef12448 100644 --- a/core/src/test/java/org/apache/calcite/test/enumerable/EnumerableJoinTest.java +++ b/core/src/test/java/org/apache/calcite/test/enumerable/EnumerableJoinTest.java @@ -156,12 +156,12 @@ class EnumerableJoinTest { builder.equals(builder.field(2, 0, "name"), builder.literal("ddd"))) .project(builder.field(0)) - .build() - ).returnsUnordered( - "empid=100", - "empid=110", - "empid=150", - "empid=200"); + .build()) + .returnsUnordered( + "empid=100", + "empid=110", + "empid=150", + "empid=200"); } /** diff --git a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java index 1d8e0404cc..2ebda2879c 100644 --- a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java +++ b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java @@ -430,10 +430,13 @@ public abstract class SparkRules { .distinct().count()); file.cache(); String s = - file.groupBy((Function<String, String>) s1 -> s1.substring(0, Math.min(s1.length(), 1)) + file.groupBy((Function<String, String>) s1 -> + s1.substring(0, Math.min(s1.length(), 1))) //CHECKSTYLE: IGNORE 1 - ).map((Function<Tuple2<String, Iterable<String>>, Object>) pair -> - pair._1() + ":" + Iterables.size(pair._2())).collect().toString(); + .map((Function<Tuple2<String, Iterable<String>>, Object>) pair -> + pair._1() + ":" + Iterables.size(pair._2())) + .collect() + .toString(); System.out.print(s); final JavaRDD<Integer> rdd =
