You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vl...@apache.org on 2019/12/05 09:43:42 UTC
[calcite] 04/05: [CALCITE-3559] Improve the layout of parenthesis
in code
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch drop_HydromaticFileSetCheck
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit fcfeed53b8981b9b1bf5ccd07d924d56ca36b842
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Dec 4 14:17:07 2019 +0300
[CALCITE-3559] Improve the layout of parenthesis in code
---
.../org/apache/calcite/adapter/enumerable/EnumerableWindow.java | 4 ++--
.../apache/calcite/rel/metadata/JaninoRelMetadataProvider.java | 4 ++--
.../java/org/apache/calcite/rel/rules/AggregateValuesRule.java | 5 +++--
.../java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java | 6 ++----
core/src/main/java/org/apache/calcite/rex/RexLiteral.java | 4 ++--
core/src/main/java/org/apache/calcite/tools/Programs.java | 7 ++++---
.../java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java | 4 ++--
.../java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java | 8 +++++---
.../src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java | 6 ++++--
9 files changed, 26 insertions(+), 22 deletions(-)
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 8fd80c2..0e8cc21 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
@@ -741,8 +741,8 @@ public class EnumerableWindow extends Window implements EnumerableRel {
private Pair<Expression, Expression> getRowCollationKey(
BlockBuilder builder, PhysType inputPhysType,
Group group, int windowIdx) {
- if (!(group.isRows || (group.upperBound.isUnbounded()
- && group.lowerBound.isUnbounded()))) {
+ if (!(group.isRows
+ || (group.upperBound.isUnbounded() && group.lowerBound.isUnbounded()))) {
Pair<Expression, Expression> pair =
inputPhysType.generateCollationKey(
group.collation().getFieldCollations());
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
index e5e6392..5e087fc 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
@@ -204,8 +204,8 @@ public class JaninoRelMetadataProvider implements RelMetadataProvider {
new ReflectiveRelMetadataProvider.Space((Multimap) map);
for (MetadataHandler provider : space.providerMap.values()) {
if (providerSet.add(provider)) {
- providerList.add(Pair.of("provider" + (providerSet.size() - 1),
- provider));
+ providerList.add(
+ Pair.of("provider" + (providerSet.size() - 1), provider));
}
}
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
index cf5115c..ee6e141 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
@@ -82,8 +82,9 @@ public class AggregateValuesRule extends RelOptRule {
switch (aggregateCall.getAggregation().getKind()) {
case COUNT:
case SUM0:
- literals.add((RexLiteral) rexBuilder.makeLiteral(
- BigDecimal.ZERO, aggregateCall.getType(), false));
+ literals.add(
+ (RexLiteral) rexBuilder.makeLiteral(
+ BigDecimal.ZERO, aggregateCall.getType(), false));
break;
case MIN:
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
index 7fcaa4c..9d333ca 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
@@ -1883,10 +1883,8 @@ public class LoptOptimizeJoinRule extends RelOptRule {
if ((leftRowCount != null)
&& (rightRowCount != null)
&& ((leftRowCount < rightRowCount)
- || ((Math.abs(leftRowCount - rightRowCount)
- < RelOptUtil.EPSILON)
- && (rowWidthCost(left.getJoinTree())
- < rowWidthCost(right.getJoinTree()))))) {
+ || ((Math.abs(leftRowCount - rightRowCount) < RelOptUtil.EPSILON)
+ && (rowWidthCost(left.getJoinTree()) < rowWidthCost(right.getJoinTree()))))) {
swap = true;
}
return swap;
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 0911a1e..5617d86 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexLiteral.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexLiteral.java
@@ -429,8 +429,8 @@ public class RexLiteral extends RexNode {
NlsString nlsString = (NlsString) value;
// Ignore type information for 'Bar':CHAR(3)
- if (((nlsString.getCharset() != null
- && type.getCharset().equals(nlsString.getCharset()))
+ if ((
+ (nlsString.getCharset() != null && type.getCharset().equals(nlsString.getCharset()))
|| (nlsString.getCharset() == null
&& SqlCollation.IMPLICIT.getCharset().equals(type.getCharset())))
&& nlsString.getCollation().equals(type.getCollation())
diff --git a/core/src/main/java/org/apache/calcite/tools/Programs.java b/core/src/main/java/org/apache/calcite/tools/Programs.java
index 7bdfe1f..2268a31 100644
--- a/core/src/main/java/org/apache/calcite/tools/Programs.java
+++ b/core/src/main/java/org/apache/calcite/tools/Programs.java
@@ -246,9 +246,10 @@ public class Programs {
public static Program subQuery(RelMetadataProvider metadataProvider) {
final HepProgramBuilder builder = HepProgram.builder();
- builder.addRuleCollection(ImmutableList.of((RelOptRule) SubQueryRemoveRule.FILTER,
- SubQueryRemoveRule.PROJECT,
- SubQueryRemoveRule.JOIN));
+ builder.addRuleCollection(
+ ImmutableList.of(SubQueryRemoveRule.FILTER,
+ SubQueryRemoveRule.PROJECT,
+ SubQueryRemoveRule.JOIN));
return of(builder.build(), true, metadataProvider);
}
diff --git a/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java b/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
index 7515900..78f51eb 100644
--- a/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
+++ b/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
@@ -68,8 +68,8 @@ public class KafkaTableFactory implements TableFactory<KafkaStreamTable> {
tableOptionBuilder.setRowConverter(rowConverter);
if (operand.containsKey(KafkaTableConstants.SCHEMA_CONSUMER_PARAMS)) {
- tableOptionBuilder.setConsumerParams((Map<String, String>) operand.get(
- KafkaTableConstants.SCHEMA_CONSUMER_PARAMS));
+ tableOptionBuilder.setConsumerParams(
+ (Map<String, String>) operand.get(KafkaTableConstants.SCHEMA_CONSUMER_PARAMS));
}
if (operand.containsKey(KafkaTableConstants.SCHEMA_CUST_CONSUMER)) {
String custConsumerClass = (String) operand.get(KafkaTableConstants.SCHEMA_CUST_CONSUMER);
diff --git a/kafka/src/test/java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java b/kafka/src/test/java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java
index 86f98bf..e52b35a 100644
--- a/kafka/src/test/java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java
+++ b/kafka/src/test/java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java
@@ -39,9 +39,11 @@ public class KafkaMockConsumer extends MockConsumer {
updateBeginningOffsets(beginningOffsets);
for (int idx = 0; idx < 10; ++idx) {
- addRecord(new ConsumerRecord<byte[], byte[]>("testtopic",
- 0, idx, ("mykey" + idx).getBytes(StandardCharsets.UTF_8),
- ("myvalue" + idx).getBytes(StandardCharsets.UTF_8)));
+ addRecord(
+ new ConsumerRecord<>("testtopic",
+ 0, idx,
+ ("mykey" + idx).getBytes(StandardCharsets.UTF_8),
+ ("myvalue" + idx).getBytes(StandardCharsets.UTF_8)));
}
}
}
diff --git a/linq4j/src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java b/linq4j/src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java
index d3b96eb..bc79dae 100644
--- a/linq4j/src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java
+++ b/linq4j/src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java
@@ -1956,8 +1956,10 @@ public class Linq4jTest {
@Test public void testGroupByWithKeySelectorAndResultSelector() {
String s =
Linq4j.asEnumerable(emps)
- .groupBy(EMP_DEPTNO_SELECTOR, (key, group) -> String.format(Locale.ROOT, "%s: %s", key,
- stringJoin("+", group.select(element -> element.name))))
+ .groupBy(
+ EMP_DEPTNO_SELECTOR,
+ (key, group) -> String.format(Locale.ROOT, "%s: %s", key,
+ stringJoin("+", group.select(element -> element.name))))
.toList()
.toString();
assertEquals(