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 2020/01/30 01:11:29 UTC
[calcite] 02/04: Trim trailing spaces in test SQL
This is an automated email from the ASF dual-hosted git repository.
jhyde pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 3892bcd215724a697814426f26d7b8dcd77a4568
Author: Julian Hyde <jh...@apache.org>
AuthorDate: Wed Jan 22 12:53:15 2020 -0800
Trim trailing spaces in test SQL
---
.../rel/logical/ToLogicalConverterTest.java | 309 ++++++++++-----------
.../calcite/rel/rel2sql/RelToSqlConverterTest.java | 22 +-
.../apache/calcite/sql/parser/SqlParserTest.java | 34 +--
.../apache/calcite/sql/test/SqlAdvisorTest.java | 2 +-
.../org/apache/calcite/test/CalciteAssert.java | 2 +-
.../org/apache/calcite/test/InterpreterTest.java | 2 +-
.../org/apache/calcite/test/JdbcAdapterTest.java | 40 +--
.../java/org/apache/calcite/test/JdbcTest.java | 24 +-
.../apache/calcite/test/MaterializationTest.java | 6 +-
.../java/org/apache/calcite/test/ModelTest.java | 2 +-
.../org/apache/calcite/test/RelMetadataTest.java | 16 +-
.../apache/calcite/test/RexTransformerTest.java | 6 +-
.../java/org/apache/calcite/test/StreamTest.java | 2 +-
.../java/org/apache/calcite/tools/PlannerTest.java | 6 +-
.../java/org/apache/calcite/util/UtilTest.java | 2 +-
.../org/apache/calcite/test/DruidAdapter2IT.java | 2 +-
.../org/apache/calcite/test/DruidAdapterIT.java | 2 +-
.../adapter/geode/rel/RelationalJdbcExample.java | 8 +-
.../calcite/adapter/kafka/KafkaTableFactory.java | 2 +-
.../java/org/apache/calcite/test/PigRelOpTest.java | 6 +-
.../org/apache/calcite/adapter/tpch/TpchTest.java | 6 +-
.../java/org/apache/calcite/test/ServerTest.java | 2 +-
22 files changed, 238 insertions(+), 265 deletions(-)
diff --git a/core/src/test/java/org/apache/calcite/rel/logical/ToLogicalConverterTest.java b/core/src/test/java/org/apache/calcite/rel/logical/ToLogicalConverterTest.java
index b75c9cc..42a647c 100644
--- a/core/src/test/java/org/apache/calcite/rel/logical/ToLogicalConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/rel/logical/ToLogicalConverterTest.java
@@ -86,10 +86,10 @@ public class ToLogicalConverterTest {
final SchemaPlus schema = CalciteAssert.addSchema(rootSchema,
CalciteAssert.SchemaSpec.JDBC_FOODMART);
return Frameworks.newConfigBuilder()
- .parserConfig(SqlParser.Config.DEFAULT)
- .defaultSchema(schema)
- .sqlToRelConverterConfig(DEFAULT_REL_CONFIG)
- .build();
+ .parserConfig(SqlParser.Config.DEFAULT)
+ .defaultSchema(schema)
+ .sqlToRelConverterConfig(DEFAULT_REL_CONFIG)
+ .build();
}
private static RelBuilder builder() {
@@ -165,15 +165,13 @@ public class ToLogicalConverterTest {
builder.scan("EMP")
.project(builder.field("DEPTNO"))
.build();
- String expectedPhysial =
- ""
- + "EnumerableProject(DEPTNO=[$7])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalProject(DEPTNO=[$7])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableProject(DEPTNO=[$7])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalProject(DEPTNO=[$7])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testFilter() {
@@ -189,15 +187,13 @@ public class ToLogicalConverterTest {
builder.field("DEPTNO"),
builder.literal(10)))
.build();
- String expectedPhysial =
- ""
- + "EnumerableFilter(condition=[=($7, 10)])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalFilter(condition=[=($7, 10)])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableFilter(condition=[=($7, 10)])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalFilter(condition=[=($7, 10)])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testSort() {
@@ -210,15 +206,13 @@ public class ToLogicalConverterTest {
builder.scan("EMP")
.sort(builder.field(2))
.build();
- String expectedPhysial =
- ""
- + "EnumerableSort(sort0=[$2], dir0=[ASC])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalSort(sort0=[$2], dir0=[ASC])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableSort(sort0=[$2], dir0=[ASC])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalSort(sort0=[$2], dir0=[ASC])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testLimit() {
@@ -231,15 +225,13 @@ public class ToLogicalConverterTest {
builder.scan("EMP")
.limit(0, 10)
.build();
- String expectedPhysial =
- ""
- + "EnumerableLimit(fetch=[10])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalSort(fetch=[10])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableLimit(fetch=[10])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalSort(fetch=[10])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testSortLimit() {
@@ -252,16 +244,14 @@ public class ToLogicalConverterTest {
builder.scan("EMP")
.sortLimit(-1, 10, builder.desc(builder.field("DEPTNO")))
.build();
- String expectedPhysial =
- ""
- + "EnumerableLimit(fetch=[10])\n"
- + " EnumerableSort(sort0=[$7], dir0=[DESC])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalSort(sort0=[$7], dir0=[DESC], fetch=[10])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableLimit(fetch=[10])\n"
+ + " EnumerableSort(sort0=[$7], dir0=[DESC])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalSort(sort0=[$7], dir0=[DESC], fetch=[10])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testAggregate() {
@@ -275,15 +265,13 @@ public class ToLogicalConverterTest {
.aggregate(builder.groupKey(builder.field("DEPTNO")),
builder.count(false, "C", builder.field("EMPNO")))
.build();
- String expectedPhysial =
- ""
- + "EnumerableAggregate(group=[{7}], C=[COUNT($0)])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalAggregate(group=[{7}], C=[COUNT($0)])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableAggregate(group=[{7}], C=[COUNT($0)])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalAggregate(group=[{7}], C=[COUNT($0)])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testJoin() {
@@ -300,43 +288,39 @@ public class ToLogicalConverterTest {
builder.field(2, 0, "DEPTNO"),
builder.field(2, 1, "DEPTNO")))
.build();
- String expectedPhysial =
- ""
- + "EnumerableHashJoin(condition=[=($7, $8)], joinType=[inner])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n"
- + " EnumerableTableScan(table=[[scott, DEPT]])\n";
- String expectedLogical =
- ""
- + "LogicalJoin(condition=[=($7, $8)], joinType=[inner])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n"
- + " LogicalTableScan(table=[[scott, DEPT]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableHashJoin(condition=[=($7, $8)], joinType=[inner])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n"
+ + " EnumerableTableScan(table=[[scott, DEPT]])\n";
+ String expectedLogical = ""
+ + "LogicalJoin(condition=[=($7, $8)], joinType=[inner])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n"
+ + " LogicalTableScan(table=[[scott, DEPT]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testCorrelation() {
final RelBuilder builder = builder();
final Holder<RexCorrelVariable> v = Holder.of(null);
final RelNode rel = builder.scan("EMP")
- .variable(v)
- .scan("DEPT")
- .join(JoinRelType.LEFT,
- builder.equals(builder.field(2, 0, "SAL"),
- builder.literal(1000)),
- ImmutableSet.of(v.get().id))
- .build();
- String expectedPhysial =
- ""
- + "EnumerableCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{}])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n"
- + " EnumerableFilter(condition=[=($cor0.SAL, 1000)])\n"
- + " EnumerableTableScan(table=[[scott, DEPT]])\n";
- String expectedLogical =
- ""
- + "LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{5}])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n"
- + " LogicalFilter(condition=[=($cor0.SAL, 1000)])\n"
- + " LogicalTableScan(table=[[scott, DEPT]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ .variable(v)
+ .scan("DEPT")
+ .join(JoinRelType.LEFT,
+ builder.equals(builder.field(2, 0, "SAL"),
+ builder.literal(1000)),
+ ImmutableSet.of(v.get().id))
+ .build();
+ String expectedPhysical = ""
+ + "EnumerableCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{}])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n"
+ + " EnumerableFilter(condition=[=($cor0.SAL, 1000)])\n"
+ + " EnumerableTableScan(table=[[scott, DEPT]])\n";
+ String expectedLogical = ""
+ + "LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{5}])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n"
+ + " LogicalFilter(condition=[=($cor0.SAL, 1000)])\n"
+ + " LogicalTableScan(table=[[scott, DEPT]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testUnion() {
@@ -352,21 +336,19 @@ public class ToLogicalConverterTest {
.project(builder.field("DEPTNO"))
.union(true)
.build();
- String expectedPhysial =
- ""
- + "EnumerableUnion(all=[true])\n"
- + " EnumerableProject(DEPTNO=[$0])\n"
- + " EnumerableTableScan(table=[[scott, DEPT]])\n"
- + " EnumerableProject(DEPTNO=[$7])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalUnion(all=[true])\n"
- + " LogicalProject(DEPTNO=[$0])\n"
- + " LogicalTableScan(table=[[scott, DEPT]])\n"
- + " LogicalProject(DEPTNO=[$7])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableUnion(all=[true])\n"
+ + " EnumerableProject(DEPTNO=[$0])\n"
+ + " EnumerableTableScan(table=[[scott, DEPT]])\n"
+ + " EnumerableProject(DEPTNO=[$7])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalUnion(all=[true])\n"
+ + " LogicalProject(DEPTNO=[$0])\n"
+ + " LogicalTableScan(table=[[scott, DEPT]])\n"
+ + " LogicalProject(DEPTNO=[$7])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testIntersect() {
@@ -382,21 +364,19 @@ public class ToLogicalConverterTest {
.project(builder.field("DEPTNO"))
.intersect(true)
.build();
- String expectedPhysial =
- ""
- + "EnumerableIntersect(all=[true])\n"
- + " EnumerableProject(DEPTNO=[$0])\n"
- + " EnumerableTableScan(table=[[scott, DEPT]])\n"
- + " EnumerableProject(DEPTNO=[$7])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalIntersect(all=[true])\n"
- + " LogicalProject(DEPTNO=[$0])\n"
- + " LogicalTableScan(table=[[scott, DEPT]])\n"
- + " LogicalProject(DEPTNO=[$7])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableIntersect(all=[true])\n"
+ + " EnumerableProject(DEPTNO=[$0])\n"
+ + " EnumerableTableScan(table=[[scott, DEPT]])\n"
+ + " EnumerableProject(DEPTNO=[$7])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalIntersect(all=[true])\n"
+ + " LogicalProject(DEPTNO=[$0])\n"
+ + " LogicalTableScan(table=[[scott, DEPT]])\n"
+ + " LogicalProject(DEPTNO=[$7])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testMinus() {
@@ -412,61 +392,54 @@ public class ToLogicalConverterTest {
.project(builder.field("DEPTNO"))
.minus(true)
.build();
- String expectedPhysial =
- ""
- + "EnumerableMinus(all=[true])\n"
- + " EnumerableProject(DEPTNO=[$0])\n"
- + " EnumerableTableScan(table=[[scott, DEPT]])\n"
- + " EnumerableProject(DEPTNO=[$7])\n"
- + " EnumerableTableScan(table=[[scott, EMP]])\n";
- String expectedLogical =
- ""
- + "LogicalMinus(all=[true])\n"
- + " LogicalProject(DEPTNO=[$0])\n"
- + " LogicalTableScan(table=[[scott, DEPT]])\n"
- + " LogicalProject(DEPTNO=[$7])\n"
- + " LogicalTableScan(table=[[scott, EMP]])\n";
- verify(rel, expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableMinus(all=[true])\n"
+ + " EnumerableProject(DEPTNO=[$0])\n"
+ + " EnumerableTableScan(table=[[scott, DEPT]])\n"
+ + " EnumerableProject(DEPTNO=[$7])\n"
+ + " EnumerableTableScan(table=[[scott, EMP]])\n";
+ String expectedLogical = ""
+ + "LogicalMinus(all=[true])\n"
+ + " LogicalProject(DEPTNO=[$0])\n"
+ + " LogicalTableScan(table=[[scott, DEPT]])\n"
+ + " LogicalProject(DEPTNO=[$7])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ verify(rel, expectedPhysical, expectedLogical);
}
@Test public void testUncollect() {
- final String sql =
- ""
- + "select did \n"
- + "from unnest(select collect(\"department_id\") as deptid"
- + " from \"department\") as t(did)";
- String expectedPhysial =
- ""
- + "EnumerableUncollect\n"
- + " EnumerableAggregate(group=[{}], DEPTID=[COLLECT($0)])\n"
- + " JdbcToEnumerableConverter\n"
- + " JdbcProject(department_id=[$0])\n"
- + " JdbcTableScan(table=[[foodmart, department]])\n";
- String expectedLogical =
- ""
- + "Uncollect\n"
- + " LogicalAggregate(group=[{}], DEPTID=[COLLECT($0)])\n"
- + " LogicalProject(department_id=[$0])\n"
- + " LogicalTableScan(table=[[foodmart, department]])\n";
- verify(rel(sql), expectedPhysial, expectedLogical);
+ final String sql = ""
+ + "select did\n"
+ + "from unnest(select collect(\"department_id\") as deptid"
+ + " from \"department\") as t(did)";
+ String expectedPhysical = ""
+ + "EnumerableUncollect\n"
+ + " EnumerableAggregate(group=[{}], DEPTID=[COLLECT($0)])\n"
+ + " JdbcToEnumerableConverter\n"
+ + " JdbcProject(department_id=[$0])\n"
+ + " JdbcTableScan(table=[[foodmart, department]])\n";
+ String expectedLogical = ""
+ + "Uncollect\n"
+ + " LogicalAggregate(group=[{}], DEPTID=[COLLECT($0)])\n"
+ + " LogicalProject(department_id=[$0])\n"
+ + " LogicalTableScan(table=[[foodmart, department]])\n";
+ verify(rel(sql), expectedPhysical, expectedLogical);
}
@Test public void testWindow() {
String sql = "SELECT rank() over (order by \"hire_date\") FROM \"employee\"";
- String expectedPhysial =
- ""
- + "EnumerableProject($0=[$17])\n"
- + " EnumerableWindow(window#0=[window(partition {} order by [9] range between "
- + "UNBOUNDED PRECEDING and CURRENT ROW aggs [RANK()])])\n"
- + " JdbcToEnumerableConverter\n"
- + " JdbcTableScan(table=[[foodmart, employee]])\n";
- String expectedLogical =
- ""
- + "LogicalProject($0=[$17])\n"
- + " LogicalWindow(window#0=[window(partition {} order by [9] range between UNBOUNDED"
- + " PRECEDING and CURRENT ROW aggs [RANK()])])\n"
- + " LogicalTableScan(table=[[foodmart, employee]])\n";
- verify(rel(sql), expectedPhysial, expectedLogical);
+ String expectedPhysical = ""
+ + "EnumerableProject($0=[$17])\n"
+ + " EnumerableWindow(window#0=[window(partition {} order by [9] range between "
+ + "UNBOUNDED PRECEDING and CURRENT ROW aggs [RANK()])])\n"
+ + " JdbcToEnumerableConverter\n"
+ + " JdbcTableScan(table=[[foodmart, employee]])\n";
+ String expectedLogical = ""
+ + "LogicalProject($0=[$17])\n"
+ + " LogicalWindow(window#0=[window(partition {} order by [9] range between UNBOUNDED"
+ + " PRECEDING and CURRENT ROW aggs [RANK()])])\n"
+ + " LogicalTableScan(table=[[foodmart, employee]])\n";
+ verify(rel(sql), expectedPhysical, expectedLogical);
}
@Test public void testTableModify() {
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 d76aaf9..0cdfccb 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
@@ -2012,9 +2012,9 @@ public class RelToSqlConverterTest {
* <a href="https://issues.apache.org/jira/browse/CALCITE-1636">[CALCITE-1636]
* JDBC adapter generates wrong SQL for self join with sub-query</a>. */
@Test public void testSubQueryAlias() {
- String query = "select t1.\"customer_id\", t2.\"customer_id\" \n"
- + "from (select \"customer_id\" from \"sales_fact_1997\") as t1 \n"
- + "inner join (select \"customer_id\" from \"sales_fact_1997\") t2 \n"
+ String query = "select t1.\"customer_id\", t2.\"customer_id\"\n"
+ + "from (select \"customer_id\" from \"sales_fact_1997\") as t1\n"
+ + "inner join (select \"customer_id\" from \"sales_fact_1997\") t2\n"
+ "on t1.\"customer_id\" = t2.\"customer_id\"";
final String expected = "SELECT *\n"
+ "FROM (SELECT sales_fact_1997.customer_id\n"
@@ -2881,8 +2881,8 @@ public class RelToSqlConverterTest {
String sql = "select *\n"
+ " from \"product\" match_recognize\n"
+ " (\n"
- + " partition by \"product_class_id\", \"brand_name\" \n"
- + " order by \"product_class_id\" asc, \"brand_name\" desc \n"
+ + " partition by \"product_class_id\", \"brand_name\"\n"
+ + " order by \"product_class_id\" asc, \"brand_name\" desc\n"
+ " pattern (strt down+ up+)\n"
+ " define\n"
+ " down as down.\"net_weight\" < PREV(down.\"net_weight\"),\n"
@@ -3882,8 +3882,8 @@ public class RelToSqlConverterTest {
final String sql = "select *\n"
+ " from \"product\" match_recognize\n"
+ " (\n"
- + " partition by \"product_class_id\", \"brand_name\" \n"
- + " order by \"product_class_id\" asc, \"brand_name\" desc \n"
+ + " partition by \"product_class_id\", \"brand_name\"\n"
+ + " order by \"product_class_id\" asc, \"brand_name\" desc\n"
+ " pattern (strt down+ up+)\n"
+ " define\n"
+ " down as down.\"net_weight\" in (0, 1),\n"
@@ -4065,7 +4065,7 @@ public class RelToSqlConverterTest {
}
@Test public void testUncollectExplicitAlias() {
- final String sql = "select did + 1 \n"
+ final String sql = "select did + 1\n"
+ "from unnest(select collect(\"department_id\") as deptid"
+ " from \"department\") as t(did)";
@@ -4076,7 +4076,7 @@ public class RelToSqlConverterTest {
}
@Test public void testUncollectImplicitAlias() {
- final String sql = "select did + 1 \n"
+ final String sql = "select did + 1\n"
+ "from unnest(select collect(\"department_id\") "
+ " from \"department\") as t(did)";
@@ -4513,10 +4513,10 @@ public class RelToSqlConverterTest {
}
@Test public void testSelectNullWithInsertFromJoin() {
- String query = "insert into \n"
+ String query = "insert into\n"
+ "\"account\"(\"account_id\",\"account_parent\",\n"
+ "\"account_type\",\"account_rollup\")\n"
- + "select \"product\".\"product_id\", \n"
+ + "select \"product\".\"product_id\",\n"
+ "cast(NULL AS INT),\n"
+ "cast(\"product\".\"product_id\" as varchar),\n"
+ "cast(\"sales_fact_1997\".\"store_id\" as varchar)\n"
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 fa95c24..69601c3 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
@@ -1734,7 +1734,7 @@ public class SqlParserTest {
}
@Test public void testSubstring() {
- expr("substring('a' \n FROM \t 1)")
+ expr("substring('a'\nFROM \t 1)")
.ok("SUBSTRING('a' FROM 1)");
expr("substring('a' FROM 1 FOR 3)")
.ok("SUBSTRING('a' FROM 1 FOR 3)");
@@ -2982,7 +2982,7 @@ public class SqlParserTest {
// on several lines
sql("select /* 1,\n"
- + " 2, \n"
+ + " 2,\n"
+ " */ 3 from t")
.ok("SELECT 3\n"
+ "FROM `T`");
@@ -3033,7 +3033,7 @@ public class SqlParserTest {
// a preceding "/*" in the same <simple comment>, it will prematurely
// terminate the containing <bracketed comment>.
if (Bug.FRG73_FIXED) {
- final String sql = "values /* multiline contains -- singline */ \n"
+ final String sql = "values /* multiline contains -- singline */\n"
+ " (1)";
sql(sql).fails("xxx");
}
@@ -3042,7 +3042,7 @@ public class SqlParserTest {
if (Bug.FRG73_FIXED) {
// Test should fail, and it does, but it should give "*/" as the
// erroneous token.
- final String sql = "values ( -- rest of line /* a comment \n"
+ final String sql = "values ( -- rest of line /* a comment\n"
+ " 1, ^*/^ 2)";
sql(sql).fails("Encountered \"/\\*\" at");
}
@@ -3052,12 +3052,12 @@ public class SqlParserTest {
.ok("VALUES (ROW((1 + 2)))");
// multiline comment inside single-line comment
- sql("values -- rest of line /* a comment */ \n"
+ sql("values -- rest of line /* a comment */\n"
+ "(1)")
.ok("VALUES (ROW(1))");
// non-terminated multiline comment inside single-line comment
- sql("values -- rest of line /* a comment \n"
+ sql("values -- rest of line /* a comment\n"
+ "(1)")
.ok("VALUES (ROW(1))");
@@ -3988,11 +3988,11 @@ public class SqlParserTest {
.ok("(X'' = X'2')");
expr("x'fffff'=X''")
.ok("(X'FFFFF' = X'')");
- expr("x'1' \t\t\f\r \n"
- + "'2'--hi this is a comment'FF'\r\r\t\f \n"
+ expr("x'1' \t\t\f\r\n"
+ + "'2'--hi this is a comment'FF'\r\r\t\f\n"
+ "'34'")
.ok("X'1'\n'2'\n'34'");
- expr("x'1' \t\t\f\r \n"
+ expr("x'1' \t\t\f\r\n"
+ "'000'--\n"
+ "'01'")
.ok("X'1'\n'000'\n'01'");
@@ -4030,13 +4030,13 @@ public class SqlParserTest {
.ok("'boring string'");
expr("_iSo-8859-1'bye'")
.ok("_ISO-8859-1'bye'");
- expr("'three' \n ' blind'\n' mice'")
+ expr("'three'\n' blind'\n' mice'")
.ok("'three'\n' blind'\n' mice'");
- expr("'three' -- comment \n ' blind'\n' mice'")
+ expr("'three' -- comment\n' blind'\n' mice'")
.ok("'three'\n' blind'\n' mice'");
expr("N'bye' \t\r\f\f\n' bye'")
.ok("_ISO-8859-1'bye'\n' bye'");
- expr("_iso-8859-1'bye' \n\n--\n-- this is a comment\n' bye'")
+ expr("_iso-8859-1'bye'\n\n--\n-- this is a comment\n' bye'")
.ok("_ISO-8859-1'bye'\n' bye'");
expr("_utf8'hi'")
.ok("_UTF8'hi'");
@@ -4047,7 +4047,7 @@ public class SqlParserTest {
expr("'foo\nbar'")
.ok("'foo\nbar'");
- // prevent test infrastructure from converting \r\n to \n
+ // prevent test infrastructure from converting '\r\n' to '\n'
boolean[] linuxify = LINUXIFY.get();
try {
linuxify[0] = false;
@@ -4061,7 +4061,7 @@ public class SqlParserTest {
@Test public void testStringLiteralFails() {
sql("select N ^'space'^")
.fails("(?s).*Encountered .*space.* at line 1, column ...*");
- sql("select _latin1 \n^'newline'^")
+ sql("select _latin1\n^'newline'^")
.fails("(?s).*Encountered.*newline.* at line 2, column ...*");
sql("select ^_unknown-charset''^ from (values(true))")
.fails("Unknown character set 'unknown-charset'");
@@ -4084,7 +4084,7 @@ public class SqlParserTest {
.ok(fooBar);
expr(" 'foo'\r\n'bar'")
.ok(fooBar);
- expr(" 'foo'\r\n\r\n'bar' \n 'baz'")
+ expr(" 'foo'\r\n\r\n'bar'\n'baz'")
.ok(fooBarBaz);
expr(" 'foo' /* a comment */ 'bar'")
.ok(fooBar);
@@ -4107,7 +4107,7 @@ public class SqlParserTest {
.ok("(CASE WHEN (`NBR` IS FALSE) THEN 'one' ELSE NULL END)");
// multiple WHENs
- expr("case col1 when \n1.2 then 'one' when 2 then 'two' else 'three' end")
+ expr("case col1 when\n1.2 then 'one' when 2 then 'two' else 'three' end")
.ok("(CASE WHEN (`COL1` = 1.2) THEN 'one' WHEN (`COL1` = 2) THEN 'two' ELSE 'three' END)");
// sub-queries as case expression operands
@@ -8733,7 +8733,7 @@ public class SqlParserTest {
@Test public void testTableHintsInUpdate() {
final String sql = "update emps\n"
+ "/*+ properties(k1='v1', k2='v2'), index(idx1, idx2), no_hash_join */\n"
- + "set empno = empno + 1, sal = sal - 1 \n"
+ + "set empno = empno + 1, sal = sal - 1\n"
+ "where empno=12";
final String expected = "UPDATE `EMPS`\n"
+ "/*+ `PROPERTIES`(`K1` ='v1', `K2` ='v2'), "
diff --git a/core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java b/core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java
index edc3a22..09fc285 100644
--- a/core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java
+++ b/core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java
@@ -1236,7 +1236,7 @@ public class SqlAdvisorTest extends SqlValidatorTestCase {
// skip comments
sql =
- "-- test test \nselect -- here is from \n 'cat' as foobar, 1 as x from t group by t.^ order by 123";
+ "-- test test\nselect -- here is from\n'cat' as foobar, 1 as x from t group by t.^ order by 123";
expected = "SELECT * FROM t GROUP BY t. _suggest_";
assertSimplify(sql, expected);
}
diff --git a/core/src/test/java/org/apache/calcite/test/CalciteAssert.java b/core/src/test/java/org/apache/calcite/test/CalciteAssert.java
index 3ed8841..8684ed0 100644
--- a/core/src/test/java/org/apache/calcite/test/CalciteAssert.java
+++ b/core/src/test/java/org/apache/calcite/test/CalciteAssert.java
@@ -1148,7 +1148,7 @@ public class CalciteAssert {
if (model.contains("defaultSchema: 'foodmart'")) {
int endIndex = model.lastIndexOf(']');
model2 = model.substring(0, endIndex)
- + ", \n{ name: 'mat', "
+ + ",\n{ name: 'mat', "
+ buf
+ "}\n"
+ "]"
diff --git a/core/src/test/java/org/apache/calcite/test/InterpreterTest.java b/core/src/test/java/org/apache/calcite/test/InterpreterTest.java
index c99cc33..afa3a24 100644
--- a/core/src/test/java/org/apache/calcite/test/InterpreterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/InterpreterTest.java
@@ -420,7 +420,7 @@ public class InterpreterTest {
@Test public void testInterpretAntiJoin() throws Exception {
final String sql = "select x, y from (values (1, 'a'), (2, 'b'), (3, 'c')) as t(x, y)\n"
- + "where x not in \n"
+ + "where x not in\n"
+ "(select x from (values (1, 'd')) as t2(x, y))";
sql(sql).returnsRows("[2, b]", "[3, c]");
}
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java b/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
index d15b2ae..86a3b3c 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
@@ -156,8 +156,8 @@ public class JdbcAdapterTest {
@Test public void testEquiJoinPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select empno, ename, e.deptno, dname \n"
- + "from scott.emp e inner join scott.dept d \n"
+ .query("select empno, ename, e.deptno, dname\n"
+ + "from scott.emp e inner join scott.dept d\n"
+ "on e.deptno = d.deptno")
.explainContains("PLAN=JdbcToEnumerableConverter\n"
+ " JdbcProject(EMPNO=[$2], ENAME=[$3], DEPTNO=[$4], DNAME=[$1])\n"
@@ -198,8 +198,8 @@ public class JdbcAdapterTest {
* Push theta joins down to JDBC adapter</a>. */
@Test public void testNonEquiJoinPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select empno, ename, grade \n"
- + "from scott.emp e inner join scott.salgrade s \n"
+ .query("select empno, ename, grade\n"
+ + "from scott.emp e inner join scott.salgrade s\n"
+ "on e.sal > s.losal and e.sal < s.hisal")
.explainContains("PLAN=JdbcToEnumerableConverter\n"
+ " JdbcProject(EMPNO=[$3], ENAME=[$4], GRADE=[$0])\n"
@@ -219,8 +219,8 @@ public class JdbcAdapterTest {
@Test public void testNonEquiJoinReverseConditionPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select empno, ename, grade \n"
- + "from scott.emp e inner join scott.salgrade s \n"
+ .query("select empno, ename, grade\n"
+ + "from scott.emp e inner join scott.salgrade s\n"
+ "on s.losal <= e.sal and s.hisal >= e.sal")
.explainContains("PLAN=JdbcToEnumerableConverter\n"
+ " JdbcProject(EMPNO=[$3], ENAME=[$4], GRADE=[$0])\n"
@@ -239,8 +239,8 @@ public class JdbcAdapterTest {
@Test public void testMixedJoinPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select e.empno, e.ename, e.empno, e.ename \n"
- + "from scott.emp e inner join scott.emp m on \n"
+ .query("select e.empno, e.ename, e.empno, e.ename\n"
+ + "from scott.emp e inner join scott.emp m on\n"
+ "e.mgr = m.empno and e.sal > m.sal")
.explainContains("PLAN=JdbcToEnumerableConverter\n"
+ " JdbcProject(EMPNO=[$2], ENAME=[$3], EMPNO0=[$2], ENAME0=[$3])\n"
@@ -262,8 +262,8 @@ public class JdbcAdapterTest {
@Test public void testMixedJoinWithOrPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select e.empno, e.ename, e.empno, e.ename \n"
- + "from scott.emp e inner join scott.emp m on \n"
+ .query("select e.empno, e.ename, e.empno, e.ename\n"
+ + "from scott.emp e inner join scott.emp m on\n"
+ "e.mgr = m.empno and (e.sal > m.sal or m.hiredate > e.hiredate)")
.explainContains("PLAN=JdbcToEnumerableConverter\n"
+ " JdbcProject(EMPNO=[$3], ENAME=[$4], EMPNO0=[$3], ENAME0=[$4])\n"
@@ -286,10 +286,10 @@ public class JdbcAdapterTest {
@Test public void testJoin3TablesPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select empno, ename, dname, grade \n"
- + "from scott.emp e inner join scott.dept d \n"
- + "on e.deptno = d.deptno \n"
- + "inner join scott.salgrade s \n"
+ .query("select empno, ename, dname, grade\n"
+ + "from scott.emp e inner join scott.dept d\n"
+ + "on e.deptno = d.deptno\n"
+ + "inner join scott.salgrade s\n"
+ "on e.sal > s.losal and e.sal < s.hisal")
.explainContains("PLAN=JdbcToEnumerableConverter\n"
+ " JdbcProject(EMPNO=[$3], ENAME=[$4], DNAME=[$8], GRADE=[$0])\n"
@@ -314,8 +314,8 @@ public class JdbcAdapterTest {
@Test public void testCrossJoinWithJoinKeyPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select empno, ename, d.deptno, dname \n"
- + "from scott.emp e,scott.dept d \n"
+ .query("select empno, ename, d.deptno, dname\n"
+ + "from scott.emp e,scott.dept d\n"
+ "where e.deptno = d.deptno")
.explainContains("PLAN=JdbcToEnumerableConverter\n"
+ " JdbcProject(EMPNO=[$0], ENAME=[$1], DEPTNO=[$3], DNAME=[$4])\n"
@@ -336,7 +336,7 @@ public class JdbcAdapterTest {
// JdbcJoin not used for this
@Test public void testCartesianJoinWithoutKeyPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select empno, ename, d.deptno, dname \n"
+ .query("select empno, ename, d.deptno, dname\n"
+ "from scott.emp e,scott.dept d")
.explainContains("PLAN=EnumerableNestedLoopJoin(condition=[true], "
+ "joinType=[inner])\n"
@@ -352,9 +352,9 @@ public class JdbcAdapterTest {
@Test public void testCrossJoinWithJoinKeyAndFilterPlan() {
CalciteAssert.model(JdbcTest.SCOTT_MODEL)
- .query("select empno, ename, d.deptno, dname \n"
- + "from scott.emp e,scott.dept d \n"
- + "where e.deptno = d.deptno \n"
+ .query("select empno, ename, d.deptno, dname\n"
+ + "from scott.emp e,scott.dept d\n"
+ + "where e.deptno = d.deptno\n"
+ "and e.deptno=20")
.explainContains("PLAN=JdbcToEnumerableConverter\n"
+ " JdbcProject(EMPNO=[$0], ENAME=[$1], DEPTNO=[$3], DNAME=[$4])\n"
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcTest.java b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
index f462162..0b812f2 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -1529,7 +1529,7 @@ public class JdbcTest {
@Test public void testExtractMonthFromTimestamp() {
CalciteAssert.that()
.with(CalciteAssert.Config.JDBC_FOODMART)
- .query("select extract(month from \"birth_date\") as c \n"
+ .query("select extract(month from \"birth_date\") as c\n"
+ "from \"foodmart\".\"employee\" where \"employee_id\"=1")
.returns("C=8\n");
}
@@ -1537,7 +1537,7 @@ public class JdbcTest {
@Test public void testExtractYearFromTimestamp() {
CalciteAssert.that()
.with(CalciteAssert.Config.JDBC_FOODMART)
- .query("select extract(year from \"birth_date\") as c \n"
+ .query("select extract(year from \"birth_date\") as c\n"
+ "from \"foodmart\".\"employee\" where \"employee_id\"=1")
.returns("C=1961\n");
}
@@ -1545,7 +1545,7 @@ public class JdbcTest {
@Test public void testExtractFromInterval() {
CalciteAssert.that()
.with(CalciteAssert.Config.JDBC_FOODMART)
- .query("select extract(month from interval '2-3' year to month) as c \n"
+ .query("select extract(month from interval '2-3' year to month) as c\n"
+ "from \"foodmart\".\"employee\" where \"employee_id\"=1")
// disable for MySQL, H2; cannot handle EXTRACT yet
.enable(CalciteAssert.DB != CalciteAssert.DatabaseInstance.MYSQL
@@ -1580,7 +1580,7 @@ public class JdbcTest {
@Test public void testFloorDate() {
CalciteAssert.that()
.with(CalciteAssert.Config.JDBC_FOODMART)
- .query("select floor(timestamp '2011-9-14 19:27:23' to month) as c \n"
+ .query("select floor(timestamp '2011-9-14 19:27:23' to month) as c\n"
+ "from \"foodmart\".\"employee\" limit 1")
// disable for MySQL; birth_date suffers timezone shift
// disable for H2; Calcite generates incorrect FLOOR syntax
@@ -3837,16 +3837,16 @@ public class JdbcTest {
@Test public void testNestedWin() {
CalciteAssert.hr()
- .query("select \n"
- + " lag(a2, 1, 0) over (partition by \"deptno\" order by a1) as lagx \n"
- + "from \n"
+ .query("select\n"
+ + " lag(a2, 1, 0) over (partition by \"deptno\" order by a1) as lagx\n"
+ + "from\n"
+ " (\n"
- + " select \n"
- + " \"deptno\", \n"
- + " \"salary\" / \"commission\" as a1, \n"
+ + " select\n"
+ + " \"deptno\",\n"
+ + " \"salary\" / \"commission\" as a1,\n"
+ " sum(\"commission\") over ( partition by \"deptno\" order by \"salary\" / "
- + "\"commission\") / sum(\"commission\") over (partition by \"deptno\") as a2 \n"
- + " from \n"
+ + "\"commission\") / sum(\"commission\") over (partition by \"deptno\") as a2\n"
+ + " from\n"
+ " \"hr\".\"emps\"\n"
+ " )\n")
.typeIs(
diff --git a/core/src/test/java/org/apache/calcite/test/MaterializationTest.java b/core/src/test/java/org/apache/calcite/test/MaterializationTest.java
index 902f60a..5db1113 100644
--- a/core/src/test/java/org/apache/calcite/test/MaterializationTest.java
+++ b/core/src/test/java/org/apache/calcite/test/MaterializationTest.java
@@ -2403,7 +2403,7 @@ public class MaterializationTest {
+ "(select * from \"emps\" where \"empid\" = 1) \"a\"\n"
+ "join \"depts\" using (\"deptno\")\n"
+ "join \"dependents\" using (\"empid\")",
- "select \"a\".\"empid\" from \n"
+ "select \"a\".\"empid\" from\n"
+ "(select * from \"emps\" where \"empid\" = 1) \"a\"\n"
+ "join \"dependents\" using (\"empid\")\n")
.withResultContains(
@@ -2416,7 +2416,7 @@ public class MaterializationTest {
+ "(select * from \"emps\" where \"empid\" = 1) \"a\"\n"
+ "join \"depts\" using (\"deptno\")\n"
+ "join \"dependents\" using (\"empid\")",
- "select \"a\".\"empid\" from \n"
+ "select \"a\".\"empid\" from\n"
+ "(select * from \"emps\" where \"empid\" = 1) \"a\"\n"
+ "join \"dependents\" using (\"empid\")\n")
.withResultContains(
@@ -2430,7 +2430,7 @@ public class MaterializationTest {
+ "(select * from \"emps\" where \"empid\" = 1) \"a\"\n"
+ "join \"depts\" using (\"deptno\")\n"
+ "join \"dependents\" using (\"empid\")",
- "select \"a\".\"name\" from \n"
+ "select \"a\".\"name\" from\n"
+ "(select * from \"emps\" where \"empid\" = 1) \"a\"\n"
+ "join \"dependents\" using (\"empid\")\n")
.noMat();
diff --git a/core/src/test/java/org/apache/calcite/test/ModelTest.java b/core/src/test/java/org/apache/calcite/test/ModelTest.java
index 417b7ba..8bcfbd0 100644
--- a/core/src/test/java/org/apache/calcite/test/ModelTest.java
+++ b/core/src/test/java/org/apache/calcite/test/ModelTest.java
@@ -353,7 +353,7 @@ public class ModelTest {
@Test public void testYamlInlineDetection() throws Exception {
// yaml model with different line endings
final String yamlModel = "version: 1.0\r\n"
- + "schemas: \n"
+ + "schemas:\n"
+ "- type: custom\r\n"
+ " name: 'MyCustomSchema'\n"
+ " factory: " + JdbcTest.MySchemaFactory.class.getName() + "\r\n";
diff --git a/core/src/test/java/org/apache/calcite/test/RelMetadataTest.java b/core/src/test/java/org/apache/calcite/test/RelMetadataTest.java
index 2b84ae2..1d7cfeb 100644
--- a/core/src/test/java/org/apache/calcite/test/RelMetadataTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelMetadataTest.java
@@ -992,11 +992,11 @@ public class RelMetadataTest extends SqlToRelTestBase {
}
@Test public void testFullOuterJoinUniqueness1() {
- final String sql = "select e.empno, d.deptno \n"
+ final String sql = "select e.empno, d.deptno\n"
+ "from (select cast(null as int) empno from sales.emp "
- + " where empno = 10 group by cast(null as int)) as e \n"
+ + " where empno = 10 group by cast(null as int)) as e\n"
+ "full outer join (select cast (null as int) deptno from sales.dept "
- + "group by cast(null as int)) as d on e.empno = d.deptno \n"
+ + "group by cast(null as int)) as d on e.empno = d.deptno\n"
+ "group by e.empno, d.deptno";
RelNode rel = convertSql(sql);
final RelMetadataQuery mq = rel.getCluster().getMetadataQuery();
@@ -2344,10 +2344,10 @@ public class RelMetadataTest extends SqlToRelTestBase {
@Test public void testExpressionLineageMultiUnion() {
// empno is column 0 in catalog.sales.emp
// sal is column 5 in catalog.sales.emp
- final RelNode rel = convertSql("select a.empno + b.sal from \n"
+ final RelNode rel = convertSql("select a.empno + b.sal from\n"
+ " (select empno, ename from emp,dept) a join "
- + " (select * from emp union all select * from emp) b \n"
- + " on a.empno = b.empno \n"
+ + " (select * from emp union all select * from emp) b\n"
+ + " on a.empno = b.empno\n"
+ " where b.deptno = 10");
final RelMetadataQuery mq = rel.getCluster().getMetadataQuery();
@@ -2474,7 +2474,7 @@ public class RelMetadataTest extends SqlToRelTestBase {
@Test public void testAllPredicatesAggregate2() {
final String sql = "select * from (select a, max(b) from (\n"
+ " select empno as a, sal as b from emp)subq\n"
- + "group by a) \n"
+ + "group by a)\n"
+ "where a = 5";
final RelNode rel = convertSql(sql);
final RelMetadataQuery mq = rel.getCluster().getMetadataQuery();
@@ -2493,7 +2493,7 @@ public class RelMetadataTest extends SqlToRelTestBase {
@Test public void testAllPredicatesAggregate3() {
final String sql = "select * from (select a, max(b) as b from (\n"
+ " select empno as a, sal as b from emp)subq\n"
- + "group by a) \n"
+ + "group by a)\n"
+ "where b = 5";
final RelNode rel = convertSql(sql);
final RelMetadataQuery mq = rel.getCluster().getMetadataQuery();
diff --git a/core/src/test/java/org/apache/calcite/test/RexTransformerTest.java b/core/src/test/java/org/apache/calcite/test/RexTransformerTest.java
index e572581..ea85f20 100644
--- a/core/src/test/java/org/apache/calcite/test/RexTransformerTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RexTransformerTest.java
@@ -354,9 +354,9 @@ public class RexTransformerTest {
* RelOptUtil.splitJoinCondition attempts to split a Join-Condition which
* has a remaining condition</a>. */
@Test public void testSplitJoinCondition() {
- final String sql = "select * \n"
- + "from emp a \n"
- + "INNER JOIN dept b \n"
+ final String sql = "select *\n"
+ + "from emp a\n"
+ + "INNER JOIN dept b\n"
+ "ON CAST(a.empno AS int) <> b.deptno";
final RelNode relNode = toRel(sql);
diff --git a/core/src/test/java/org/apache/calcite/test/StreamTest.java b/core/src/test/java/org/apache/calcite/test/StreamTest.java
index b1611d5..20e72ac 100644
--- a/core/src/test/java/org/apache/calcite/test/StreamTest.java
+++ b/core/src/test/java/org/apache/calcite/test/StreamTest.java
@@ -93,7 +93,7 @@ public class StreamTest {
+ " stream: true\n"
+ " },\n"
+ " factory: '" + OrdersStreamTableFactory.class.getName() + "'\n"
- + " }, \n"
+ + " },\n"
+ " {\n"
+ " type: 'custom',\n"
+ " name: 'PRODUCTS',\n"
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 0b8aa3d..c310594 100644
--- a/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
+++ b/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
@@ -1341,9 +1341,9 @@ public class PlannerTest {
final SchemaPlus schema = Frameworks.createRootSchema(true)
.add("tpch", new ReflectiveSchema(new TpchSchema()));
- String query = "select t.psPartkey from \n"
- + "(select ps.psPartkey from `tpch`.`partsupp` ps \n"
- + "order by ps.psPartkey, ps.psSupplyCost) t \n"
+ String query = "select t.psPartkey from\n"
+ + "(select ps.psPartkey from `tpch`.`partsupp` ps\n"
+ + "order by ps.psPartkey, ps.psSupplyCost) t\n"
+ "order by t.psPartkey";
List<RelTraitDef> traitDefs = new ArrayList<>();
diff --git a/core/src/test/java/org/apache/calcite/util/UtilTest.java b/core/src/test/java/org/apache/calcite/util/UtilTest.java
index 6fc152e..9b29f39 100644
--- a/core/src/test/java/org/apache/calcite/util/UtilTest.java
+++ b/core/src/test/java/org/apache/calcite/util/UtilTest.java
@@ -2419,7 +2419,7 @@ public class UtilTest {
assertThat(describe(isLinux("X")), is("is \"X\""));
assertThat(isLinux("x\ny").matches("x\ny"), is(true));
assertThat(isLinux("x\ny").matches("x\r\ny"), is(true));
- // \n\r is not a valid windows line ending
+ //\n\r is not a valid windows line ending
assertThat(isLinux("x\ny").matches("x\n\ry"), is(false));
assertThat(isLinux("x\ny").matches("x\n\ryz"), is(false));
// left-hand side must be linux or will never match
diff --git a/druid/src/test/java/org/apache/calcite/test/DruidAdapter2IT.java b/druid/src/test/java/org/apache/calcite/test/DruidAdapter2IT.java
index c94f09b..af2d5a5 100644
--- a/druid/src/test/java/org/apache/calcite/test/DruidAdapter2IT.java
+++ b/druid/src/test/java/org/apache/calcite/test/DruidAdapter2IT.java
@@ -2038,7 +2038,7 @@ public class DruidAdapter2IT {
}
@Test public void testInterleaveBetweenAggregateAndGroupOrderByOnDimension() {
- final String sqlQuery = "select \"store_state\", \"brand_name\", \"A\" from \n"
+ final String sqlQuery = "select \"store_state\", \"brand_name\", \"A\" from\n"
+ "(select \"store_state\", sum(\"store_sales\")+sum(\"store_cost\") "
+ "as a, \"brand_name\" from \"foodmart\" group by \"store_state\", \"brand_name\") "
+ "order by \"brand_name\", \"store_state\" limit 5";
diff --git a/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java b/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
index 162df38..dad6940 100644
--- a/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
+++ b/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
@@ -2317,7 +2317,7 @@ public class DruidAdapterIT {
}
@Test public void testInterleaveBetweenAggregateAndGroupOrderByOnDimension() {
- final String sqlQuery = "select \"store_state\", \"brand_name\", \"A\" from \n"
+ final String sqlQuery = "select \"store_state\", \"brand_name\", \"A\" from\n"
+ "(select \"store_state\", sum(\"store_sales\")+sum(\"store_cost\") "
+ "as a, \"brand_name\" from \"foodmart\" group by \"store_state\", \"brand_name\") "
+ "order by \"brand_name\", \"store_state\" limit 5";
diff --git a/geode/src/test/java/org/apache/calcite/adapter/geode/rel/RelationalJdbcExample.java b/geode/src/test/java/org/apache/calcite/adapter/geode/rel/RelationalJdbcExample.java
index c29e654..2799cd1 100644
--- a/geode/src/test/java/org/apache/calcite/adapter/geode/rel/RelationalJdbcExample.java
+++ b/geode/src/test/java/org/apache/calcite/adapter/geode/rel/RelationalJdbcExample.java
@@ -60,10 +60,10 @@ public class RelationalJdbcExample {
+ " name: 'TEST',\n"
+ " factory: 'org.apache.calcite.adapter.geode.rel.GeodeSchemaFactory',\n"
+ " operand: {\n"
- + " locatorHost: 'localhost', \n"
- + " locatorPort: '10334', \n"
- + " regions: 'BookMaster,BookCustomer,BookInventory,BookOrder', \n"
- + " pdxSerializablePackagePath: 'org.apache.calcite.adapter.geode.domain.*' \n"
+ + " locatorHost: 'localhost',\n"
+ + " locatorPort: '10334',\n"
+ + " regions: 'BookMaster,BookCustomer,BookInventory,BookOrder',\n"
+ + " pdxSerializablePackagePath: 'org.apache.calcite.adapter.geode.domain.*'\n"
+ " }\n"
+ " }\n"
+ " ]\n"
diff --git a/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java b/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
index 78f51eb..2271d4c 100644
--- a/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
+++ b/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
@@ -82,7 +82,7 @@ public class KafkaTableFactory implements TableFactory<KafkaStreamTable> {
| InstantiationException | InvocationTargetException e) {
final String details = String.format(
Locale.ROOT,
- "Fail to create table '%s' with configuration: \n"
+ "Fail to create table '%s' with configuration:\n"
+ "'%s'\n"
+ "KafkaCustConsumer '%s' is invalid",
name, operand, custConsumerClass);
diff --git a/piglet/src/test/java/org/apache/calcite/test/PigRelOpTest.java b/piglet/src/test/java/org/apache/calcite/test/PigRelOpTest.java
index feb6020..c29ff62 100644
--- a/piglet/src/test/java/org/apache/calcite/test/PigRelOpTest.java
+++ b/piglet/src/test/java/org/apache/calcite/test/PigRelOpTest.java
@@ -297,7 +297,7 @@ public class PigRelOpTest extends PigRelTestBase {
+ "l2:bag{l21:(l22:int, l23:float)}, "
+ "m1:map[], m2:map[int], m3:map[(m3:float)]);\n"
+ "B = FOREACH A GENERATE a, a as a2, b, c, d, e, f, g, h, i, j, k2, "
- + "l2, m2, null as n:chararray; \n";
+ + "l2, m2, null as n:chararray;\n";
final String plan = ""
+ "LogicalProject(a=[$0], a2=[$0], b=[$1], c=[$2], d=[$3], e=[$4], "
+ "f=[$5], g=[$6], h=[$7], i=[$8], j=[$9], k2=[$11], l2=[$13], "
@@ -780,7 +780,7 @@ public class PigRelOpTest extends PigRelTestBase {
final String script = ""
+ "A = LOAD 'scott.DEPT' as (DEPTNO:int, DNAME:chararray,\n"
+ " LOC:CHARARRAY);\n"
- + "B = FOREACH A GENERATE DEPTNO; \n"
+ + "B = FOREACH A GENERATE DEPTNO;\n"
+ "C = FILTER B BY DEPTNO <= 20;\n"
+ "D = CROSS B, C;\n";
final String plan = ""
@@ -813,7 +813,7 @@ public class PigRelOpTest extends PigRelTestBase {
final String script2 = ""
+ "A = LOAD 'scott.DEPT' as (DEPTNO:int, DNAME:chararray,"
+ " LOC:CHARARRAY);\n"
- + "B = FOREACH A GENERATE DEPTNO; \n"
+ + "B = FOREACH A GENERATE DEPTNO;\n"
+ "C = FILTER B BY DEPTNO <= 20;\n"
+ "D = FILTER B BY DEPTNO > 20;\n"
+ "E = CROSS B, C, D;\n";
diff --git a/plus/src/test/java/org/apache/calcite/adapter/tpch/TpchTest.java b/plus/src/test/java/org/apache/calcite/adapter/tpch/TpchTest.java
index 933b764..8e65312 100644
--- a/plus/src/test/java/org/apache/calcite/adapter/tpch/TpchTest.java
+++ b/plus/src/test/java/org/apache/calcite/adapter/tpch/TpchTest.java
@@ -179,7 +179,7 @@ public class TpchTest {
+ "where\n"
+ "-- o_orderdate >= date '1996-10-01'\n"
+ "-- and o_orderdate < date '1996-10-01' + interval '3' month\n"
- + "-- and \n"
+ + "-- and\n"
+ " exists (\n"
+ " select\n"
+ " *\n"
@@ -452,8 +452,8 @@ public class TpchTest {
+ " c.c_custkey,\n"
+ " count(o.o_orderkey)\n"
+ " from\n"
- + " tpch.customer c \n"
- + " left outer join tpch.orders o \n"
+ + " tpch.customer c\n"
+ + " left outer join tpch.orders o\n"
+ " on c.c_custkey = o.o_custkey\n"
+ " and o.o_comment not like '%special%requests%'\n"
+ " group by\n"
diff --git a/server/src/test/java/org/apache/calcite/test/ServerTest.java b/server/src/test/java/org/apache/calcite/test/ServerTest.java
index 8ef0c5a..0c7efb7 100644
--- a/server/src/test/java/org/apache/calcite/test/ServerTest.java
+++ b/server/src/test/java/org/apache/calcite/test/ServerTest.java
@@ -173,7 +173,7 @@ public class ServerTest {
boolean b = s.execute("create schema s");
assertThat(b, is(false));
try {
- boolean f = s.execute("create function if not exists s.t \n"
+ boolean f = s.execute("create function if not exists s.t\n"
+ "as 'org.apache.calcite.udf.TableFun.demoUdf'\n"
+ "using jar 'file:/path/udf/udf-0.0.1-SNAPSHOT.jar'");
} catch (SQLException e) {