You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2014/12/27 04:55:12 UTC

[2/3] incubator-calcite git commit: Fix code style

Fix code style


Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/03c25836
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/03c25836
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/03c25836

Branch: refs/heads/master
Commit: 03c258365f395a6e878d8019bc53aa70e0e0b265
Parents: 33080b7
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Dec 23 15:20:42 2014 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Dec 26 17:54:00 2014 -0800

----------------------------------------------------------------------
 core/src/main/java/org/apache/calcite/rel/BiRel.java |  3 +--
 .../org/apache/calcite/rel/core/CorrelationId.java   |  2 +-
 .../calcite/rel/rules/JoinToCorrelateRule.java       |  3 +--
 .../sql2rel/DeduplicateCorrelateVariables.java       |  3 +--
 .../org/apache/calcite/linq4j/CorrelateJoinType.java | 15 +++++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/03c25836/core/src/main/java/org/apache/calcite/rel/BiRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/BiRel.java b/core/src/main/java/org/apache/calcite/rel/BiRel.java
index 494d473..c72f5ea 100644
--- a/core/src/main/java/org/apache/calcite/rel/BiRel.java
+++ b/core/src/main/java/org/apache/calcite/rel/BiRel.java
@@ -75,8 +75,7 @@ public abstract class BiRel extends AbstractRelNode {
     recomputeDigest();
   }
 
-  @Override
-  public RelWriter explainTerms(RelWriter pw) {
+  @Override public RelWriter explainTerms(RelWriter pw) {
     return super.explainTerms(pw)
         .input("left", left)
         .input("right", right);

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/03c25836/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java b/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java
index a47bf52..2b2558c 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java
@@ -88,4 +88,4 @@ public class CorrelationId implements Cloneable, Comparable<CorrelationId> {
   }
 }
 
-// End Correlation.java
+// End CorrelationId.java

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/03c25836/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java
index bcdd0aa..e520f9d 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java
@@ -108,8 +108,7 @@ public class JoinToCorrelateRule extends RelOptRule {
 
     // Replace all references of left input with FieldAccess(corrVar, field)
     joinCondition = joinCondition.accept(new RexShuttle() {
-      @Override
-      public RexNode visitInputRef(RexInputRef input) {
+      @Override public RexNode visitInputRef(RexInputRef input) {
         int field = input.getIndex();
         if (field >= leftFieldCount) {
           return rexBuilder.makeInputRef(input.getType(),

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/03c25836/core/src/main/java/org/apache/calcite/sql2rel/DeduplicateCorrelateVariables.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql2rel/DeduplicateCorrelateVariables.java b/core/src/main/java/org/apache/calcite/sql2rel/DeduplicateCorrelateVariables.java
index 2ce1048..a24924c 100644
--- a/core/src/main/java/org/apache/calcite/sql2rel/DeduplicateCorrelateVariables.java
+++ b/core/src/main/java/org/apache/calcite/sql2rel/DeduplicateCorrelateVariables.java
@@ -47,8 +47,7 @@ public class DeduplicateCorrelateVariables extends RelHomogeneousShuttle {
       this.altNames = altNames;
     }
 
-    @Override
-    public RexNode visitCorrelVariable(RexCorrelVariable variable) {
+    @Override public RexNode visitCorrelVariable(RexCorrelVariable variable) {
       if (!altNames.contains(variable.getName())) {
         return variable;
       }

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/03c25836/linq4j/src/main/java/org/apache/calcite/linq4j/CorrelateJoinType.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/CorrelateJoinType.java b/linq4j/src/main/java/org/apache/calcite/linq4j/CorrelateJoinType.java
index 322567e..b238faf 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/CorrelateJoinType.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/CorrelateJoinType.java
@@ -31,17 +31,20 @@ public enum CorrelateJoinType {
   LEFT,
 
   /**
-   * Semi-join
-   * <p>Similar to from A ... where a in (select b from B ...)</p>
+   * Semi-join.
+   *
+   * <p>Similar to {@code from A ... where a in (select b from B ...)}</p>
    */
   SEMI,
 
   /**
-   * Anti-join
-   * <p>Similar to from A ... where a NOT in (select b from B ...)</p>
-   * <p>Note: if B.b is nullable and B has nulls, no rows must be returned</p>
+   * Anti-join.
+   *
+   * <p>Similar to {@code from A ... where a NOT in (select b from B ...)}
+   *
+   * <p>Note: if B.b is nullable and B has nulls, no rows must be returned.
    */
   ANTI;
 }
 
-// End SemiJoinType.java
+// End CorrelateJoinType.java