This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 190717dbcc [enhancement](chore)add single space separator rule to fe
check style (#12354)
190717dbcc is described below
commit 190717dbcca78b7869352191d3d0a4e7d03562bb
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Mon Sep 5 21:59:58 2022 +0800
[enhancement](chore)add single space separator rule to fe check style
(#12354)
Some times, our code use more than one space as separator by mistake. This
PR add a CheckStyle rule SingleSpaceSeparator to check that for Nereids.
---
fe/check/checkstyle/checkstyle.xml | 1 +
fe/check/checkstyle/suppressions.xml | 1 +
.../apache/doris/nereids/analyzer/UnboundFunction.java | 4 ++--
.../nereids/glue/translator/ExpressionTranslator.java | 2 +-
.../nereids/glue/translator/PhysicalPlanTranslator.java | 2 +-
.../pattern/generator/LogicalLeafPatternGenerator.java | 2 +-
.../nereids/pattern/generator/PatternGenerator.java | 2 +-
.../expression/rewrite/rules/SimplifyNotExprRule.java | 6 +++---
.../rules/rewrite/logical/MergeConsecutiveFilters.java | 2 +-
.../nereids/trees/expressions/functions/WeekOfYear.java | 2 +-
.../java/org/apache/doris/nereids/util/JoinUtils.java | 2 +-
.../rules/expression/rewrite/ExpressionRewriteTest.java | 16 ++++++++--------
.../doris/nereids/util/AnalyzeWhereSubqueryTest.java | 4 ++--
13 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/fe/check/checkstyle/checkstyle.xml
b/fe/check/checkstyle/checkstyle.xml
index 77a56d1d5f..e10b841615 100644
--- a/fe/check/checkstyle/checkstyle.xml
+++ b/fe/check/checkstyle/checkstyle.xml
@@ -391,6 +391,7 @@ under the License.
<property name="tokens" value="METHOD_REF"/>
<property name="option" value="nl"/>
</module>
+ <module name="SingleSpaceSeparator"/>
<module name="WhitespaceAfter">
<property name="tokens"
value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE,
diff --git a/fe/check/checkstyle/suppressions.xml
b/fe/check/checkstyle/suppressions.xml
index 8524bed6fd..7757f0c6ee 100644
--- a/fe/check/checkstyle/suppressions.xml
+++ b/fe/check/checkstyle/suppressions.xml
@@ -47,6 +47,7 @@ under the License.
<!-- other -->
<suppress
files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java"
checks="DeclarationOrder" />
<suppress
files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java"
checks="OverloadMethodsDeclarationOrder" />
+ <suppress
files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java"
checks="SingleSpaceSeparator" />
<suppress
files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java"
checks="VariableDeclarationUsageDistance" />
<!-- exclude rules for special files -->
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java
index 66f07e5928..8ea8436c33 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java
@@ -64,13 +64,13 @@ public class UnboundFunction extends Expression implements
Unbound {
String params = children.stream()
.map(Expression::toSql)
.collect(Collectors.joining(", "));
- return name + "(" + (isDistinct ? "DISTINCT " : "") + params + ")";
+ return name + "(" + (isDistinct ? "DISTINCT " : "") + params + ")";
}
@Override
public String toString() {
String params = Joiner.on(", ").join(children);
- return "'" + name + "(" + (isDistinct ? "DISTINCT " : "") + params +
")";
+ return "'" + name + "(" + (isDistinct ? "DISTINCT " : "") + params +
")";
}
@Override
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/ExpressionTranslator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/ExpressionTranslator.java
index ebfb969758..c18611aea5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/ExpressionTranslator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/ExpressionTranslator.java
@@ -265,7 +265,7 @@ public class ExpressionTranslator extends
DefaultExpressionVisitor<Expr, PlanTra
@Override
public Expr visitBinaryArithmetic(BinaryArithmetic binaryArithmetic,
PlanTranslatorContext context) {
- ArithmeticExpr arithmeticExpr = new
ArithmeticExpr(binaryArithmetic.getLegacyOperator(),
+ ArithmeticExpr arithmeticExpr = new
ArithmeticExpr(binaryArithmetic.getLegacyOperator(),
binaryArithmetic.child(0).accept(this, context),
binaryArithmetic.child(1).accept(this, context));
return arithmeticExpr;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
index 26da00175f..1ccdee99d0 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
@@ -356,7 +356,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
TupleDescriptor leftChildOutputTupleDesc =
leftPlanRoot.getOutputTupleDesc();
TupleDescriptor leftTuple =
- leftChildOutputTupleDesc != null ? leftChildOutputTupleDesc :
context.getTupleDesc(leftPlanRoot);
+ leftChildOutputTupleDesc != null ? leftChildOutputTupleDesc :
context.getTupleDesc(leftPlanRoot);
TupleDescriptor rightChildOutputTupleDesc =
rightPlanRoot.getOutputTupleDesc();
TupleDescriptor rightTuple =
rightChildOutputTupleDesc != null ? rightChildOutputTupleDesc
: context.getTupleDesc(rightPlanRoot);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/LogicalLeafPatternGenerator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/LogicalLeafPatternGenerator.java
index e6cc863c9d..19580c6e37 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/LogicalLeafPatternGenerator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/LogicalLeafPatternGenerator.java
@@ -32,7 +32,7 @@ public class LogicalLeafPatternGenerator extends
PatternGenerator {
@Override
public String genericType() {
- return "<" + opType.name + ">";
+ return "<" + opType.name + ">";
}
@Override
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/PatternGenerator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/PatternGenerator.java
index 8976f9b388..69d34b967d 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/PatternGenerator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/PatternGenerator.java
@@ -275,7 +275,7 @@ public abstract class PatternGenerator {
childrenPattern = ", " + childrenPattern;
}
- String pattern = "default " + methodGeneric + "\n"
+ String pattern = "default " + methodGeneric + "\n"
+ "PatternDescriptor" + genericParam + "\n"
+ " " + patterName + "(" + methodParam + ") {\n"
+ " return new PatternDescriptor" + genericParam + "(\n"
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rewrite/rules/SimplifyNotExprRule.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rewrite/rules/SimplifyNotExprRule.java
index 6f797e09b7..c47ae7c17b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rewrite/rules/SimplifyNotExprRule.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rewrite/rules/SimplifyNotExprRule.java
@@ -51,7 +51,7 @@ public class SimplifyNotExprRule extends
AbstractExpressionRewriteRule {
Expression child = not.child();
if (child instanceof ComparisonPredicate) {
ComparisonPredicate cp = (ComparisonPredicate) not.child();
- Expression left = rewrite(cp.left(), context);
+ Expression left = rewrite(cp.left(), context);
Expression right = rewrite(cp.right(), context);
// TODO: visit concrete class instead of `instanceof`.
@@ -59,7 +59,7 @@ public class SimplifyNotExprRule extends
AbstractExpressionRewriteRule {
return new LessThanEqual(left, right);
} else if (child instanceof GreaterThanEqual) {
return new LessThan(left, right);
- } else if (child instanceof LessThan) {
+ } else if (child instanceof LessThan) {
return new GreaterThanEqual(left, right);
} else if (child instanceof LessThanEqual) {
return new GreaterThan(left, right);
@@ -68,7 +68,7 @@ public class SimplifyNotExprRule extends
AbstractExpressionRewriteRule {
}
} else if (child instanceof CompoundPredicate) {
CompoundPredicate cp = (CompoundPredicate) not.child();
- Expression left = rewrite(new Not(cp.left()), context);
+ Expression left = rewrite(new Not(cp.left()), context);
Expression right = rewrite(new Not(cp.right()), context);
return cp.flip(left, right);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/MergeConsecutiveFilters.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/MergeConsecutiveFilters.java
index 4398f149cc..6ed9c3fd1d 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/MergeConsecutiveFilters.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/MergeConsecutiveFilters.java
@@ -42,7 +42,7 @@ import org.apache.doris.nereids.util.ExpressionUtils;
* |
* scan
*/
-public class MergeConsecutiveFilters extends OneRewriteRuleFactory {
+public class MergeConsecutiveFilters extends OneRewriteRuleFactory {
@Override
public Rule build() {
return logicalFilter(logicalFilter()).then(filter -> {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/WeekOfYear.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/WeekOfYear.java
index 6f4dc44548..acdd92e6f4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/WeekOfYear.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/WeekOfYear.java
@@ -34,7 +34,7 @@ import java.util.List;
/**
* weekOfYear function
*/
-public class WeekOfYear extends BoundFunction implements UnaryExpression,
ImplicitCastInputTypes {
+public class WeekOfYear extends BoundFunction implements UnaryExpression,
ImplicitCastInputTypes {
private static final List<AbstractDataType> EXPECTED_INPUT_TYPES =
ImmutableList.of(
new TypeCollection(DateTimeType.INSTANCE)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/JoinUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/JoinUtils.java
index 2c1ded556a..75d04a6db7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/JoinUtils.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/JoinUtils.java
@@ -102,7 +102,7 @@ public class JoinUtils {
* @return true if the equal can be used as hash join condition
*/
boolean isHashJoinCondition(EqualTo equalTo) {
- List<SlotReference> equalLeft =
equalTo.left().collect(SlotReference.class::isInstance);
+ List<SlotReference> equalLeft =
equalTo.left().collect(SlotReference.class::isInstance);
if (equalLeft.isEmpty()) {
return false;
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rewrite/ExpressionRewriteTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rewrite/ExpressionRewriteTest.java
index 79e8903e3c..48f197df86 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rewrite/ExpressionRewriteTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rewrite/ExpressionRewriteTest.java
@@ -121,17 +121,17 @@ public class ExpressionRewriteTest {
assertRewrite("(a and b) or ((d and c) and (d and e))", "(a and b) or
(d and c and e)");
assertRewrite("(a or b) and ((d or c) or (d or e))", "(a or b) and (d
or c or e)");
- assertRewrite("(a and b) or (a and b and c)", "a and b");
- assertRewrite("(a or b) and (a or b or c)", "a or b");
+ assertRewrite("(a and b) or (a and b and c)", "a and b");
+ assertRewrite("(a or b) and (a or b or c)", "a or b");
- assertRewrite("a and true", "a");
- assertRewrite("a or false", "a");
+ assertRewrite("a and true", "a");
+ assertRewrite("a or false", "a");
- assertRewrite("a and false", "false");
- assertRewrite("a or true", "true");
+ assertRewrite("a and false", "false");
+ assertRewrite("a or true", "true");
- assertRewrite("a or false or false or false", "a");
- assertRewrite("a and true and true and true", "a");
+ assertRewrite("a or false or false or false", "a");
+ assertRewrite("a and true and true and true", "a");
assertRewrite("(a and b) or a ", "a");
assertRewrite("(a or b) and a ", "a");
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/util/AnalyzeWhereSubqueryTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/util/AnalyzeWhereSubqueryTest.java
index ba90de7c94..9d8a8bbc81 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/util/AnalyzeWhereSubqueryTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/util/AnalyzeWhereSubqueryTest.java
@@ -362,7 +362,7 @@ public class AnalyzeWhereSubqueryTest extends
TestWithFeService implements Patte
ImmutableList.of("default_cluster:test", "t7")), "aa")
)))
).when(FieldChecker.check("outputExpressions",
ImmutableList.of(
- new Alias(new ExprId(8), new Max(new
SlotReference(new ExprId(0), "aa", BigIntType.INSTANCE, true,
+ new Alias(new ExprId(8), new Max(new
SlotReference(new ExprId(0), "aa", BigIntType.INSTANCE, true,
ImmutableList.of("t2"))),
"max(aa)")
)))
.when(FieldChecker.check("groupByExpressions", ImmutableList.of()))
@@ -414,7 +414,7 @@ public class AnalyzeWhereSubqueryTest extends
TestWithFeService implements Patte
logicalAggregate(
logicalProject()
).when(FieldChecker.check("outputExpressions",
ImmutableList.of(
- new Alias(new ExprId(8), new Max(new
SlotReference(new ExprId(0), "aa", BigIntType.INSTANCE, true,
+ new Alias(new ExprId(8), new Max(new
SlotReference(new ExprId(0), "aa", BigIntType.INSTANCE, true,
ImmutableList.of("t2"))),
"max(aa)"),
new SlotReference(new ExprId(7), "v2",
BigIntType.INSTANCE, true,
ImmutableList.of("default_cluster:test", "t7")))))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
