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:40 UTC
[calcite] 02/05: [CALCITE-3559] Fix Checkstyle 8 findings
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 644629185432b67adde527dfbeadaa30e5e9f69d
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Dec 4 15:00:57 2019 +0300
[CALCITE-3559] Fix Checkstyle 8 findings
---
.../calcite/adapter/cassandra/CassandraRules.java | 2 +-
.../enumerable/EnumerableRepeatUnionRule.java | 8 ++++----
.../enumerable/EnumerableTableFunctionScan.java | 2 +-
.../adapter/enumerable/RexToLixTranslator.java | 6 ++----
.../apache/calcite/plan/SubstitutionVisitor.java | 4 ++--
.../apache/calcite/rel/metadata/RelMdCollation.java | 2 +-
.../calcite/rel/rules/FilterMultiJoinMergeRule.java | 6 +++---
.../rel/rules/ProjectMultiJoinMergeRule.java | 4 ++--
.../apache/calcite/sql/advise/SqlSimpleParser.java | 12 ++++++------
.../main/java/org/apache/calcite/util/NameSet.java | 2 +-
.../apache/calcite/test/SqlHintsConverterTest.java | 8 ++++----
.../calcite/adapter/druid/DruidDateTimeUtils.java | 9 +++------
.../apache/calcite/adapter/druid/DruidRules.java | 2 +-
.../adapter/elasticsearch/ElasticsearchRules.java | 4 ++--
.../elasticsearch/EmbeddedElasticsearchNode.java | 8 ++++----
.../apache/calcite/adapter/csv/CsvStreamReader.java | 12 ++++++------
.../calcite/adapter/enumerable/package-info.java | 21 +++++++++++++++++++++
17 files changed, 64 insertions(+), 48 deletions(-)
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 90112aa..a5ae66d 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
@@ -373,7 +373,7 @@ public class CassandraRules {
private CassandraLimitRule() {
super(operand(EnumerableLimit.class, operand(CassandraToEnumerableConverter.class, any())),
- "CassandraLimitRule");
+ "CassandraLimitRule");
}
public RelNode convert(EnumerableLimit limit) {
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
index b57118a..6b7fec5 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
@@ -29,10 +29,10 @@ public class EnumerableRepeatUnionRule extends ConverterRule {
EnumerableRepeatUnionRule() {
super(
- LogicalRepeatUnion.class,
- Convention.NONE,
- EnumerableConvention.INSTANCE,
- "EnumerableRepeatUnionRule");
+ LogicalRepeatUnion.class,
+ Convention.NONE,
+ EnumerableConvention.INSTANCE,
+ "EnumerableRepeatUnionRule");
}
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 cc5b49a..1c27b7b 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
@@ -46,7 +46,7 @@ public class EnumerableTableFunctionScan extends TableFunctionScan
RelDataType rowType, RexNode call,
Set<RelColumnMapping> columnMappings) {
super(cluster, traits, inputs, call, elementType, rowType,
- columnMappings);
+ columnMappings);
}
@Override public EnumerableTableFunctionScan copy(
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
index 814e65b..ad3332b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
@@ -662,16 +662,14 @@ public class RexToLixTranslator {
nullAs = RexImpTable.NullAs.NOT_POSSIBLE;
}
switch (expr.getKind()) {
- case INPUT_REF:
- {
+ case INPUT_REF: {
final int index = ((RexInputRef) expr).getIndex();
Expression x = inputGetter.field(list, index, storageType);
Expression input = list.append("inp" + index + "_", x); // safe to share
return handleNullUnboxingIfNecessary(input, nullAs, storageType);
}
- case PATTERN_INPUT_REF:
- {
+ case PATTERN_INPUT_REF: {
final int index = ((RexInputRef) expr).getIndex();
Expression x = inputGetter.field(list, index, storageType);
diff --git a/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java b/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
index 75484b0..df8146b 100644
--- a/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
+++ b/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
@@ -1153,8 +1153,8 @@ public class SubstitutionVisitor {
private JoinOnLeftCalcToJoinUnifyRule() {
super(
- operand(MutableJoin.class, operand(MutableCalc.class, query(0)), query(1)),
- operand(MutableJoin.class, target(0), target(1)), 2);
+ operand(MutableJoin.class, operand(MutableCalc.class, query(0)), query(1)),
+ operand(MutableJoin.class, target(0), target(1)), 2);
}
@Override protected UnifyResult apply(UnifyRuleCall call) {
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
index 4358373..34cd90e 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
@@ -254,7 +254,7 @@ public class RelMdCollation
program
.getProjectList()
.stream()
- .map((p) -> program.expandLocalRef(p))
+ .map(program::expandLocalRef)
.collect(Collectors.toList());
return project(mq, input, projects);
}
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
index 553c4ac..5638956 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
@@ -60,9 +60,9 @@ public class FilterMultiJoinMergeRule extends RelOptRule {
public FilterMultiJoinMergeRule(Class<? extends Filter> filterClass,
RelBuilderFactory relBuilderFactory) {
super(
- operand(filterClass,
- operand(MultiJoin.class, any())),
- relBuilderFactory, null);
+ operand(filterClass,
+ operand(MultiJoin.class, any())),
+ relBuilderFactory, null);
}
//~ Methods ----------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
index a36c1f6..c41d474 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
@@ -59,8 +59,8 @@ public class ProjectMultiJoinMergeRule extends RelOptRule {
public ProjectMultiJoinMergeRule(Class<? extends Project> projectClass,
RelBuilderFactory relBuilderFactory) {
super(
- operand(projectClass,
- operand(MultiJoin.class, any())), relBuilderFactory, null);
+ operand(projectClass,
+ operand(MultiJoin.class, any())), relBuilderFactory, null);
}
//~ Methods ----------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/advise/SqlSimpleParser.java b/core/src/main/java/org/apache/calcite/sql/advise/SqlSimpleParser.java
index 2e29d6d..1d51d5c 100644
--- a/core/src/main/java/org/apache/calcite/sql/advise/SqlSimpleParser.java
+++ b/core/src/main/java/org/apache/calcite/sql/advise/SqlSimpleParser.java
@@ -261,11 +261,11 @@ public class SqlSimpleParser {
//~ Inner Classes ----------------------------------------------------------
public static class Tokenizer {
- private static final Map<String, TokenType> map = new HashMap<>();
+ private static final Map<String, TokenType> TOKEN_TYPES = new HashMap<>();
static {
for (TokenType type : TokenType.values()) {
- map.put(type.name(), type);
+ TOKEN_TYPES.put(type.name(), type);
}
}
@@ -373,8 +373,8 @@ public class SqlSimpleParser {
pos = indexOfLineEnd(sql, pos + 2);
return new Token(TokenType.COMMENT);
}
- // fall through
}
+ // fall through
case '-':
// possible start of '--' comment
@@ -415,7 +415,7 @@ public class SqlSimpleParser {
}
}
String name = sql.substring(start, pos);
- TokenType tokenType = map.get(name.toUpperCase(Locale.ROOT));
+ TokenType tokenType = TOKEN_TYPES.get(name.toUpperCase(Locale.ROOT));
if (tokenType == null) {
return new IdToken(TokenType.ID, name);
} else {
@@ -480,7 +480,7 @@ public class SqlSimpleParser {
static class Query extends Token {
private final List<Token> tokenList;
- public Query(List<Token> tokenList) {
+ Query(List<Token> tokenList) {
super(TokenType.QUERY);
this.tokenList = new ArrayList<>(tokenList);
}
@@ -718,7 +718,7 @@ public class SqlSimpleParser {
Token token = sublist.get(i);
switch (token.type) {
case QUERY:
- if (((Query)token).contains(hintToken)) {
+ if (((Query) token).contains(hintToken)) {
found = true;
}
break;
diff --git a/core/src/main/java/org/apache/calcite/util/NameSet.java b/core/src/main/java/org/apache/calcite/util/NameSet.java
index a04922b..d257276 100644
--- a/core/src/main/java/org/apache/calcite/util/NameSet.java
+++ b/core/src/main/java/org/apache/calcite/util/NameSet.java
@@ -43,7 +43,7 @@ public class NameSet {
/** Creates a NameSet that is an immutable copy of a given collection. */
public static NameSet immutableCopyOf(Set<String> names) {
- return new NameSet(NameMap.immutableCopyOf(Maps.asMap(names, (k) -> DUMMY)));
+ return new NameSet(NameMap.immutableCopyOf(Maps.asMap(names, k -> DUMMY)));
}
@Override public String toString() {
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 4fad77b..d1aa4d8 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java
@@ -387,10 +387,10 @@ public class SqlHintsConverterTest extends SqlToRelTestBase {
MockEnumerableJoinRule(RelHint hint) {
super(
- LogicalJoin.class,
- Convention.NONE,
- EnumerableConvention.INSTANCE,
- "MockEnumerableJoinRule");
+ LogicalJoin.class,
+ Convention.NONE,
+ EnumerableConvention.INSTANCE,
+ "MockEnumerableJoinRule");
this.expectedHint = hint;
}
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidDateTimeUtils.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidDateTimeUtils.java
index 8fa16da..7fceb67 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidDateTimeUtils.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidDateTimeUtils.java
@@ -170,8 +170,7 @@ public class DruidDateTimeUtils {
case LESS_THAN:
case LESS_THAN_OR_EQUAL:
case GREATER_THAN:
- case GREATER_THAN_OR_EQUAL:
- {
+ case GREATER_THAN_OR_EQUAL: {
final Long value;
SqlKind kind = call.getKind();
if (call.getOperands().get(0) instanceof RexInputRef
@@ -200,8 +199,7 @@ public class DruidDateTimeUtils {
return ImmutableList.of(Range.lessThan(value), Range.greaterThan(value));
}
}
- case BETWEEN:
- {
+ case BETWEEN: {
final Long value1;
final Long value2;
if (literalValue(call.getOperands().get(2)) != null
@@ -220,8 +218,7 @@ public class DruidDateTimeUtils {
return ImmutableList.of(Range.lessThan(inverted ? value2 : value1),
Range.greaterThan(inverted ? value1 : value2));
}
- case IN:
- {
+ case IN: {
ImmutableList.Builder<Range<Long>> ranges =
ImmutableList.builder();
for (RexNode operand : Util.skip(call.operands)) {
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
index a9abdb4..54aefea 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
@@ -804,7 +804,7 @@ public class DruidRules {
operand(Project.class,
operand(Filter.class,
operand(DruidQuery.class, none()))),
- expr -> false,
+ expr -> false,
relBuilderFactory);
}
}
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
index 5ad76df..6e34d6a 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
@@ -237,7 +237,7 @@ class ElasticsearchRules {
private ElasticsearchFilterRule() {
super(LogicalFilter.class, Convention.NONE, ElasticsearchRel.CONVENTION,
- "ElasticsearchFilterRule");
+ "ElasticsearchFilterRule");
}
@Override public RelNode convert(RelNode relNode) {
@@ -288,7 +288,7 @@ class ElasticsearchRules {
private ElasticsearchProjectRule() {
super(LogicalProject.class, Convention.NONE, ElasticsearchRel.CONVENTION,
- "ElasticsearchProjectRule");
+ "ElasticsearchProjectRule");
}
@Override public RelNode convert(RelNode relNode) {
diff --git a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
index c5a56fc..9a9c370 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
@@ -157,10 +157,10 @@ class EmbeddedElasticsearchNode implements AutoCloseable {
private LocalNode(Settings settings, Collection<Class<? extends Plugin>> classpathPlugins) {
super(
- InternalSettingsPreparer.prepareEnvironment(settings, emptyMap(),
- null, () -> "default_node_name"),
- classpathPlugins,
- false);
+ InternalSettingsPreparer.prepareEnvironment(settings, emptyMap(),
+ null, () -> "default_node_name"),
+ classpathPlugins,
+ false);
}
}
}
diff --git a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvStreamReader.java b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvStreamReader.java
index 0478935..b9b8249 100644
--- a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvStreamReader.java
+++ b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvStreamReader.java
@@ -52,12 +52,12 @@ class CsvStreamReader extends CSVReader implements Closeable {
CsvStreamReader(Source source) {
this(source,
- CSVParser.DEFAULT_SEPARATOR,
- CSVParser.DEFAULT_QUOTE_CHARACTER,
- CSVParser.DEFAULT_ESCAPE_CHARACTER,
- DEFAULT_SKIP_LINES,
- CSVParser.DEFAULT_STRICT_QUOTES,
- CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
+ CSVParser.DEFAULT_SEPARATOR,
+ CSVParser.DEFAULT_QUOTE_CHARACTER,
+ CSVParser.DEFAULT_ESCAPE_CHARACTER,
+ DEFAULT_SKIP_LINES,
+ CSVParser.DEFAULT_STRICT_QUOTES,
+ CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
}
/**
diff --git a/ubenchmark/src/jmh/java/org/apache/calcite/adapter/enumerable/package-info.java b/ubenchmark/src/jmh/java/org/apache/calcite/adapter/enumerable/package-info.java
new file mode 100644
index 0000000..8a48fe8
--- /dev/null
+++ b/ubenchmark/src/jmh/java/org/apache/calcite/adapter/enumerable/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Benchmarks for Enumerable adapter
+ */
+package org.apache.calcite.adapter.enumerable;