This is an automated email from the ASF dual-hosted git repository. robinyqiu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push: new 4eee2dc Add test for timestamp from date in default timezone new 1aa4fb3 Merge pull request #12154 from robinyqiu/timezone 4eee2dc is described below commit 4eee2dc58d771ba16a826939278b935716e69553 Author: Yueyang Qiu <robiny...@gmail.com> AuthorDate: Wed Jul 1 12:21:26 2020 -0700 Add test for timestamp from date in default timezone --- .../sql/zetasql/ZetaSQLDialectSpecTest.java | 116 ++++++++++++--------- 1 file changed, 66 insertions(+), 50 deletions(-) diff --git a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLDialectSpecTest.java b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLDialectSpecTest.java index 4d47043..532103e 100644 --- a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLDialectSpecTest.java +++ b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLDialectSpecTest.java @@ -2793,56 +2793,6 @@ public class ZetaSQLDialectSpecTest extends ZetaSQLTestBase { } @Test - public void testSelectNullIntersectDistinct() { - String sql = "SELECT NULL INTERSECT DISTINCT SELECT 2"; - - ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); - BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); - PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); - System.err.println("SCHEMA " + stream.getSchema()); - - PAssert.that(stream).empty(); - pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); - } - - @Test - public void testSelectNullIntersectAll() { - String sql = "SELECT NULL INTERSECT ALL SELECT 2"; - - ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); - BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); - PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); - System.err.println("SCHEMA " + stream.getSchema()); - - PAssert.that(stream).empty(); - pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); - } - - @Test - public void testSelectNullExceptDistinct() { - String sql = "SELECT NULL EXCEPT DISTINCT SELECT 2"; - - ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); - BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); - PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); - - PAssert.that(stream).containsInAnyOrder(Row.nullRow(stream.getSchema())); - pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); - } - - @Test - public void testSelectNullExceptAll() { - String sql = "SELECT NULL EXCEPT ALL SELECT 2"; - - ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); - BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); - PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); - - PAssert.that(stream).containsInAnyOrder(Row.nullRow(stream.getSchema())); - pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); - } - - @Test public void testMultipleSelectStatementsThrowsException() { String sql = "SELECT 1; SELECT 2;"; ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); @@ -3087,6 +3037,22 @@ public class ZetaSQLDialectSpecTest extends ZetaSQLTestBase { } @Test + public void testTimestampFromDate() { + String sql = "SELECT TIMESTAMP(DATE '2014-01-31')"; + + ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); + BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); + PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); + + PAssert.that(stream) + .containsInAnyOrder( + Row.withSchema(Schema.builder().addDateTimeField("f_timestamp").build()) + .addValues(parseTimestampWithTimeZone("2014-01-31 00:00:00+00")) + .build()); + pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); + } + + @Test public void testTimestampAdd() { String sql = "SELECT " @@ -3850,6 +3816,56 @@ public class ZetaSQLDialectSpecTest extends ZetaSQLTestBase { } @Test + public void testSelectNullIntersectDistinct() { + String sql = "SELECT NULL INTERSECT DISTINCT SELECT 2"; + + ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); + BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); + PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); + System.err.println("SCHEMA " + stream.getSchema()); + + PAssert.that(stream).empty(); + pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); + } + + @Test + public void testSelectNullIntersectAll() { + String sql = "SELECT NULL INTERSECT ALL SELECT 2"; + + ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); + BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); + PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); + System.err.println("SCHEMA " + stream.getSchema()); + + PAssert.that(stream).empty(); + pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); + } + + @Test + public void testSelectNullExceptDistinct() { + String sql = "SELECT NULL EXCEPT DISTINCT SELECT 2"; + + ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); + BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); + PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); + + PAssert.that(stream).containsInAnyOrder(Row.nullRow(stream.getSchema())); + pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); + } + + @Test + public void testSelectNullExceptAll() { + String sql = "SELECT NULL EXCEPT ALL SELECT 2"; + + ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); + BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); + PCollection<Row> stream = BeamSqlRelUtils.toPCollection(pipeline, beamRelNode); + + PAssert.that(stream).containsInAnyOrder(Row.nullRow(stream.getSchema())); + pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); + } + + @Test public void testSelectFromEmptyTable() { String sql = "SELECT * FROM table_empty;"; ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config);