fix checkstyle

apache · May 12, 2022 · 6feafc7 · 6feafc7
1 parent 3535538
commit 6feafc7
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 43 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundAlias.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundAlias.java
@@ -29,9 +29,8 @@
 /**
  * Expression for unbound alias.
  */
-public class UnboundAlias<CHILD_TYPE extends Expression>
-    extends NamedExpression<UnboundAlias<CHILD_TYPE>>
-    implements UnaryExpression<UnboundAlias<CHILD_TYPE>, CHILD_TYPE> {
+public class UnboundAlias<CHILD_TYPE extends Expression> extends NamedExpression<UnboundAlias<CHILD_TYPE>>
+        implements UnaryExpression<UnboundAlias<CHILD_TYPE>, CHILD_TYPE> {
 
     public UnboundAlias(CHILD_TYPE child) {
         super(NodeType.UNBOUND_ALIAS, child);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/Patterns.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/Patterns.java
@@ -339,25 +339,17 @@ default PatternDescriptor<SlotReference, Expression> slotReference() {
      * create a equal to predicate pattern.
      */
     default PatternDescriptor<EqualTo<Expression, Expression>, Expression> equalTo() {
-        return new PatternDescriptor<>(
-                new Pattern<>(NodeType.EQUAL_TO),
-                defaultPromise()
-        );
+        return new PatternDescriptor<>(new Pattern<>(NodeType.EQUAL_TO), defaultPromise());
     }
 
     /**
      * create a equal to predicate pattern with children patterns.
      */
-    default <C1 extends Expression, C2 extends Expression> PatternDescriptor<EqualTo<C1, C2>, Expression>
-    equalTo(PatternDescriptor<C1, Expression> leftChildPattern,
-                PatternDescriptor<C2, Expression> rightChildPattern) {
+    default <C1 extends Expression, C2 extends Expression> PatternDescriptor<EqualTo<C1, C2>, Expression> equalTo(
+            PatternDescriptor<C1, Expression> leftChildPattern, PatternDescriptor<C2, Expression> rightChildPattern) {
         return new PatternDescriptor<>(
-                new Pattern<>(NodeType.EQUAL_TO,
-                        leftChildPattern.pattern,
-                        rightChildPattern.pattern
-                ),
-                defaultPromise()
-        );
+                new Pattern<>(NodeType.EQUAL_TO, leftChildPattern.pattern, rightChildPattern.pattern),
+                defaultPromise());
     }
 
     /**

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Alias.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Alias.java
@@ -27,9 +27,8 @@
 /**
  * Expression for alias, such as col1 as c1.
  */
-public class Alias<CHILD_TYPE extends Expression>
-    extends NamedExpression<Alias<CHILD_TYPE>>
-    implements UnaryExpression<Alias<CHILD_TYPE>, CHILD_TYPE> {
+public class Alias<CHILD_TYPE extends Expression> extends NamedExpression<Alias<CHILD_TYPE>>
+        implements UnaryExpression<Alias<CHILD_TYPE>, CHILD_TYPE> {
 
     private final ExprId exprId;
     private final String name;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/ComparisonPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/ComparisonPredicate.java
@@ -26,12 +26,9 @@
  * Comparison predicate expression.
  * Such as: "=", "<", "<=", ">", ">=", "<=>"
  */
-public class ComparisonPredicate<
-    LEFT_CHILD_TYPE extends Expression,
-    RIGHT_CHILD_TYPE extends Expression>
-    extends Expression<ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE>>
-    implements BinaryExpression<ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE>,
-    LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+public class ComparisonPredicate<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
+        extends Expression<ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE>> implements
+        BinaryExpression<ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE>, LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
 
     /**
      * Constructor of ComparisonPredicate.

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/EqualTo.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/EqualTo.java
@@ -20,8 +20,11 @@
 import org.apache.doris.nereids.exceptions.UnboundException;
 import org.apache.doris.nereids.trees.NodeType;
 
+/**
+ * Equal to expression: a = b
+ */
 public class EqualTo<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
-    extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+        extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
 
     public EqualTo(LEFT_CHILD_TYPE left, RIGHT_CHILD_TYPE right) {
         super(NodeType.EQUAL_TO, left, right);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/GreaterThan.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/GreaterThan.java
@@ -20,8 +20,11 @@
 import org.apache.doris.nereids.exceptions.UnboundException;
 import org.apache.doris.nereids.trees.NodeType;
 
+/**
+ * Greater than expression: a > b
+ */
 public class GreaterThan<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
-    extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+        extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
     /**
      * Constructor of Greater Than ComparisonPredicate.
      *

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/GreaterThanEqual.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/GreaterThanEqual.java
@@ -20,8 +20,11 @@
 import org.apache.doris.nereids.exceptions.UnboundException;
 import org.apache.doris.nereids.trees.NodeType;
 
+/**
+ * Greater than and equal expression: a >= b
+ */
 public class GreaterThanEqual<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
-    extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+        extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
     /**
      * Constructor of Greater Than And Equal.
      *

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/LeafExpression.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/LeafExpression.java
@@ -22,6 +22,5 @@
 /**
  * Interface for all expression that have no child.
  */
-public interface LeafExpression<EXPR_TYPE extends LeafExpression<EXPR_TYPE>>
-    extends LeafNode<EXPR_TYPE> {
+public interface LeafExpression<EXPR_TYPE extends LeafExpression<EXPR_TYPE>> extends LeafNode<EXPR_TYPE> {
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/LessThan.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/LessThan.java
@@ -20,8 +20,11 @@
 import org.apache.doris.nereids.exceptions.UnboundException;
 import org.apache.doris.nereids.trees.NodeType;
 
+/**
+ * Less than expression: a < b
+ */
 public class LessThan<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
-    extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+        extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
     /**
      * Constructor of Less Than Comparison Predicate.
      *

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/LessThanEqual.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/LessThanEqual.java
@@ -20,8 +20,11 @@
 import org.apache.doris.nereids.exceptions.UnboundException;
 import org.apache.doris.nereids.trees.NodeType;
 
+/**
+ * Less than and equal expression: a <= b
+ */
 public class LessThanEqual<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
-    extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+        extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
     /**
      * Constructor of Less Than And Equal.
      *

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/NamedExpression.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/NamedExpression.java
@@ -23,14 +23,11 @@
 import org.apache.commons.collections.CollectionUtils;
 
 import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Expression in Nereids that having name.
  */
-public abstract class NamedExpression<EXPR_TYPE extends NamedExpression<EXPR_TYPE>>
-    extends Expression<EXPR_TYPE> {
+public abstract class NamedExpression<EXPR_TYPE extends NamedExpression<EXPR_TYPE>> extends Expression<EXPR_TYPE> {
 
     public NamedExpression(NodeType type, Expression... children) {
         super(type, children);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/NamedExpressionUtil.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/NamedExpressionUtil.java
@@ -20,6 +20,9 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
+/**
+ * The util of named expression
+ */
 public class NamedExpressionUtil {
     /**
      * Tool class for generate next ExprId.

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Not.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Not.java
@@ -20,8 +20,11 @@
 import org.apache.doris.nereids.exceptions.UnboundException;
 import org.apache.doris.nereids.trees.NodeType;
 
+/**
+ * Not expression: not a
+ */
 public class Not<CHILD_TYPE extends Expression> extends Expression<Not<CHILD_TYPE>>
-    implements UnaryExpression<Not<CHILD_TYPE>, CHILD_TYPE> {
+        implements UnaryExpression<Not<CHILD_TYPE>, CHILD_TYPE> {
     public Not(CHILD_TYPE child) {
         super(NodeType.NOT, child);
     }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/NullSafeEqual.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/NullSafeEqual.java
@@ -20,8 +20,12 @@
 import org.apache.doris.nereids.exceptions.UnboundException;
 import org.apache.doris.nereids.trees.NodeType;
 
+/**
+ * Null safe equal expression: a <=> b
+ * Unlike normal equal to expression, null <=> null is true
+ */
 public class NullSafeEqual<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
-    extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+        extends ComparisonPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
     /**
      * Constructor of Null Safe Equal ComparisonPredicate.
      *

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Slot.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Slot.java
@@ -22,8 +22,8 @@
 /**
  * Abstract class for all slot in expression.
  */
-public abstract class Slot<EXPR_TYPE extends Slot<EXPR_TYPE>>
-    extends NamedExpression<EXPR_TYPE> implements LeafExpression<EXPR_TYPE> {
+public abstract class Slot<EXPR_TYPE extends Slot<EXPR_TYPE>> extends NamedExpression<EXPR_TYPE>
+        implements LeafExpression<EXPR_TYPE> {
 
     public Slot(NodeType type) {
         super(type);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/UnaryExpression.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/UnaryExpression.java
@@ -22,8 +22,7 @@
 /**
  * Abstract class for all expression that have one child.
  */
-public interface UnaryExpression<
-    EXPR_TYPE extends UnaryExpression<EXPR_TYPE, CHILD_TYPE>, CHILD_TYPE extends Expression>
-    extends UnaryNode<EXPR_TYPE, CHILD_TYPE> {
+public interface UnaryExpression<EXPR_TYPE extends UnaryExpression<EXPR_TYPE, CHILD_TYPE>, CHILD_TYPE extends Expression>
+        extends UnaryNode<EXPR_TYPE, CHILD_TYPE> {
 
 }
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ComparisonPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ComparisonPredicateTest.java
@@ -31,6 +31,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+
+/**
+ * Comparison Predicate unit test
+ */
 public class ComparisonPredicateTest {
 
     @Mocked