calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject calcite git commit: [CALCITE-2139] Upgrade maven checkstyle plugin, and fix formatting (Vijay Kumar) [Forced Update!]
Date Thu, 18 Jan 2018 23:38:12 GMT
Repository: calcite
Updated Branches:
  refs/heads/master 961b8bd2d -> 5b3d3d329 (forced update)


[CALCITE-2139] Upgrade maven checkstyle plugin, and fix formatting (Vijay Kumar)

Upgrade maven-checkstyle-plugin from 2.17 (checkstyle 6.11.2) to
3.0.0 (checkstyle 6.18).

Close apache/calcite#609


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

Branch: refs/heads/master
Commit: 5b3d3d329524dca9993643257030c75ebbbf4bd4
Parents: adc1bb2
Author: vijayk <vkumar@hortonworks.com>
Authored: Thu Jan 18 14:37:57 2018 +0530
Committer: Julian Hyde <jhyde@apache.org>
Committed: Thu Jan 18 15:37:43 2018 -0800

----------------------------------------------------------------------
 .../apache/calcite/rel/rules/ProjectToWindowRule.java    |  2 +-
 .../org/apache/calcite/sql/parser/SqlParserTest.java     | 11 ++++++++++-
 pom.xml                                                  |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/5b3d3d32/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java
index 2a37522..4b7a4dc 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java
@@ -196,7 +196,7 @@ public abstract class ProjectToWindowRule extends RelOptRule {
                         return program.expandLocalRef(a0);
                       }
                     }),
-              calc.getRowType().getFieldNames());
+                calc.getRowType().getFieldNames());
           }
           return relBuilder.build();
         }

http://git-wip-us.apache.org/repos/asf/calcite/blob/5b3d3d32/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
index de9ca4d..690c628 100644
--- a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
+++ b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
@@ -4210,8 +4210,17 @@ public class SqlParserTest {
         "(SUM(`SAL`) OVER (RANGE BETWEEN INTERVAL '1' SECOND FOLLOWING AND INTERVAL '5' DAY
FOLLOWING))");
   }
 
+  public static void main(String[] args) throws SqlParseException {
+    try {
+      SqlParser parser = SqlParser.create("SUM(t1.amount)/COUNT(t1)");
+      SqlNode sqlNode = parser.parseExpression();
+    } catch (Throwable e) {
+      e.printStackTrace();
+    }
+  }
   @Test public void testElementFunc() {
-    checkExp("element(a)", "ELEMENT(`A`)");
+
+    checkExp("SUM(t1.amount)/COUNT(t1)", "ELEMENT(`A`)");
   }
 
   @Test public void testCardinalityFunc() {

http://git-wip-us.apache.org/repos/asf/calcite/blob/5b3d3d32/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9655174..dcd367d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@ limitations under the License.
     <jmh.version>1.12</jmh.version>
     <jsoup.version>1.10.2</jsoup.version>
     <junit.version>4.12</junit.version>
-    <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
+    <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
     <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
     <!-- Apache 18 has 3.0.1, but need 3.0.2 for [MSOURCES-94]. -->
     <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>


Mime
View raw message