Cosmetic changes
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/e30600d6 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/e30600d6 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/e30600d6 Branch: refs/heads/master Commit: e30600d63b5468cc8566977bcc1695ce17db91df Parents: 787a9a1 Author: Julian Hyde <[email protected]> Authored: Tue Jul 5 17:46:21 2016 -0700 Committer: Julian Hyde <[email protected]> Committed: Tue Jul 5 17:46:21 2016 -0700 ---------------------------------------------------------------------- .../standalone-server/src/main/shaded-resources/LICENSE | 10 +++++----- avatica/tck/src/main/resources/META-INF/LICENSE | 10 +++++----- core/src/main/codegen/templates/Parser.jj | 5 ++--- .../apache/calcite/rel/rules/LoptOptimizeJoinRule.java | 3 +-- .../src/main/java/org/apache/calcite/sql/SqlFunction.java | 3 +-- .../apache/calcite/rel/rel2sql/RelToSqlConverterTest.java | 6 ++---- .../test/java/org/apache/calcite/sql/test/SqlTests.java | 7 ++----- .../java/org/apache/calcite/test/MockCatalogReader.java | 3 +-- .../test/java/org/apache/calcite/tools/PlannerTest.java | 6 ++---- 9 files changed, 21 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/avatica/standalone-server/src/main/shaded-resources/LICENSE ---------------------------------------------------------------------- diff --git a/avatica/standalone-server/src/main/shaded-resources/LICENSE b/avatica/standalone-server/src/main/shaded-resources/LICENSE index 0720b21..877a48a 100644 --- a/avatica/standalone-server/src/main/shaded-resources/LICENSE +++ b/avatica/standalone-server/src/main/shaded-resources/LICENSE @@ -223,21 +223,21 @@ under the following "3-clause BSD" license: Copyright (c) 2001-2016, The HSQL Development Group All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + Neither the name of the HSQL Development Group nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/avatica/tck/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/avatica/tck/src/main/resources/META-INF/LICENSE b/avatica/tck/src/main/resources/META-INF/LICENSE index 0720b21..877a48a 100644 --- a/avatica/tck/src/main/resources/META-INF/LICENSE +++ b/avatica/tck/src/main/resources/META-INF/LICENSE @@ -223,21 +223,21 @@ under the following "3-clause BSD" license: Copyright (c) 2001-2016, The HSQL Development Group All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + Neither the name of the HSQL Development Group nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/core/src/main/codegen/templates/Parser.jj ---------------------------------------------------------------------- diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj index d7415cc..9a8ab59 100644 --- a/core/src/main/codegen/templates/Parser.jj +++ b/core/src/main/codegen/templates/Parser.jj @@ -229,9 +229,8 @@ PARSER_END(${parser.class}) /* For Debug */ JAVACODE -void debug_message1() -{ - LOGGER.info("{} , {}", getToken( 0 ).image, getToken( 1 ).image ); +void debug_message1() { + LOGGER.info("{} , {}", getToken(0).image, getToken(1).image); } JAVACODE String unquotedIdentifier() { http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java index baa4139..2d17096 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java @@ -1627,8 +1627,7 @@ public class LoptOptimizeJoinRule extends RelOptRule { projects.add( Pair.of( (RexNode) rexBuilder.makeInputRef(currFields.get(i).getType(), i), - currFields.get(i).getName()) - ); + currFields.get(i).getName())); } for (int i = 0; i < nNewFields; i++) { RexNode projExpr; http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/core/src/main/java/org/apache/calcite/sql/SqlFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlFunction.java b/core/src/main/java/org/apache/calcite/sql/SqlFunction.java index 7f9b0f3..e485422 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlFunction.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlFunction.java @@ -243,8 +243,7 @@ public class SqlFunction extends SqlOperator { final SqlFunction function = (SqlFunction) SqlUtil.lookupRoutine(validator.getOperatorTable(), - getNameAsId(), argTypes, argNames, getFunctionType(), SqlSyntax.FUNCTION, getKind() - ); + getNameAsId(), argTypes, argNames, getFunctionType(), SqlSyntax.FUNCTION, getKind()); try { // if we have a match on function name and parameter count, but // couldn't find a function with a COLUMN_LIST type, retry, but http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java index 8b19898..1d70131 100644 --- a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java +++ b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java @@ -187,8 +187,7 @@ public class RelToSqlConverterTest { query, "SELECT \"product_class_id\", SUM(\"net_weight\"), MIN(\"low_fat\"), COUNT(*)\n" + "FROM \"foodmart\".\"product\"\n" - + "GROUP BY \"product_class_id\"" - ); + + "GROUP BY \"product_class_id\""); } @Test @@ -368,8 +367,7 @@ public class RelToSqlConverterTest { + "INNER JOIN \"foodmart\".\"product_class\" " + "ON \"product\".\"product_class_id\" = \"product_class\".\"product_class_id\"\n" + "WHERE \"customer\".\"city\" = 'San Francisco' AND " - + "\"product_class\".\"product_department\" = 'Snacks'" - ); + + "\"product_class\".\"product_department\" = 'Snacks'"); } @Test public void testSimpleIn() { http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/core/src/test/java/org/apache/calcite/sql/test/SqlTests.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/calcite/sql/test/SqlTests.java b/core/src/test/java/org/apache/calcite/sql/test/SqlTests.java index ea4091b..0349c35 100644 --- a/core/src/test/java/org/apache/calcite/sql/test/SqlTests.java +++ b/core/src/test/java/org/apache/calcite/sql/test/SqlTests.java @@ -262,11 +262,8 @@ public abstract class SqlTests { fail("Query returned 2 or more rows, expected 1"); } if ((actual < (expected - delta)) || (actual > (expected + delta))) { - fail( - "Query returned " + actual + ", expected " + expected + ((delta == 0) - ? "" - : ("+/-" + delta)) - ); + fail("Query returned " + actual + ", expected " + expected + + ((delta == 0) ? "" : ("+/-" + delta))); } } http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/core/src/test/java/org/apache/calcite/test/MockCatalogReader.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/calcite/test/MockCatalogReader.java b/core/src/test/java/org/apache/calcite/test/MockCatalogReader.java index 0ccedc2..e56dd96 100644 --- a/core/src/test/java/org/apache/calcite/test/MockCatalogReader.java +++ b/core/src/test/java/org/apache/calcite/test/MockCatalogReader.java @@ -385,8 +385,7 @@ public class MockCatalogReader implements Prepare.CatalogReader { @Override public int size() { return mapping.size(); } - } - ); + }); } }); } http://git-wip-us.apache.org/repos/asf/calcite/blob/e30600d6/core/src/test/java/org/apache/calcite/tools/PlannerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/calcite/tools/PlannerTest.java b/core/src/test/java/org/apache/calcite/tools/PlannerTest.java index 265a504..4aa2795 100644 --- a/core/src/test/java/org/apache/calcite/tools/PlannerTest.java +++ b/core/src/test/java/org/apache/calcite/tools/PlannerTest.java @@ -125,8 +125,7 @@ public class PlannerTest { public void testParseIdentiferMaxLengthWithDefault() throws Exception { Planner planner = getPlanner(null, SqlParser.configBuilder().build()); planner.parse("select name as " - + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa from \"emps\"" - ); + + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa from \"emps\""); } @Test @@ -134,8 +133,7 @@ public class PlannerTest { Planner planner = getPlanner(null, SqlParser.configBuilder().setIdentifierMaxLength(512).build()); planner.parse("select name as " - + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa from \"emps\"" - ); + + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa from \"emps\""); } /** Unit test that parses, validates and converts the query using
