[jira] [Work logged] (BEAM-5101) Improve Floor and Ceil tests at DSL level

[ASF GitHub Bot (JIRA)]

     [ 
https://issues.apache.org/jira/browse/BEAM-5101?focusedWorklogId=135414&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-135414
 ]

ASF GitHub Bot logged work on BEAM-5101:
----------------------------------------

                Author: ASF GitHub Bot
            Created on: 16/Aug/18 16:50
            Start Date: 16/Aug/18 16:50
    Worklog Time Spent: 10m 
      Work Description: apilloud closed pull request #6207: [BEAM-5101][SQL] 
Improve tests of Floor and Ceil functions
URL: https://github.com/apache/beam/pull/6207
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
 
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
index a04c150157b..ebca6afa24d 100644
--- 
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
+++ 
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
@@ -1112,16 +1112,29 @@ public void testBasicDateTimeFunctions() {
   }
 
   @Test
-  // More needed @SqlOperatorTest(name = "FLOOR", kind = "FLOOR")
-  // More needed @SqlOperatorTest(name = "CEIL", kind = "CEIL")
-  public void testFloorAndCeil() {
+  // https://issues.apache.org/jira/browse/BEAM-5128
+  // @SqlOperatorTest(name = "FLOOR", kind = "FLOOR")
+  public void testFloor() {
     ExpressionChecker checker =
         new ExpressionChecker()
             .addExpr("FLOOR(ts TO MONTH)", parseDate("1986-02-01 00:00:00"))
             .addExpr("FLOOR(ts TO YEAR)", parseDate("1986-01-01 00:00:00"))
+            .addExpr("FLOOR(c_double)", 1.0);
+
+    checker.buildRunAndCheck(getFloorCeilingTestPCollection());
+  }
+
+  @Test
+  // https://issues.apache.org/jira/browse/BEAM-5128
+  // @SqlOperatorTest(name = "CEIL", kind = "CEIL")
+  public void testCeil() {
+    ExpressionChecker checker =
+        new ExpressionChecker()
             .addExpr("CEIL(ts TO MONTH)", parseDate("1986-03-01 00:00:00"))
-            .addExpr("CEIL(ts TO YEAR)", parseDate("1987-01-01 00:00:00"));
-    checker.buildRunAndCheck();
+            .addExpr("CEIL(ts TO YEAR)", parseDate("1987-01-01 00:00:00"))
+            .addExpr("CEIL(c_double)", 2.0);
+
+    checker.buildRunAndCheck(getFloorCeilingTestPCollection());
   }
 
   @Test
diff --git 
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java
 
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java
index 0bc55bce7a9..28b5c630b01 100644
--- 
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java
+++ 
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java
@@ -106,6 +106,12 @@
           .addNullableField("c_decimal", FieldType.DECIMAL)
           .build();
 
+  private static final Schema ROW_TYPE_THREE =
+      Schema.builder()
+          .addField("ts", FieldType.DATETIME)
+          .addField("c_double", FieldType.DOUBLE)
+          .build();
+
   @Rule public final TestPipeline pipeline = TestPipeline.create();
 
   protected PCollection<Row> getTestPCollection() {
@@ -131,6 +137,17 @@
     }
   }
 
+  protected PCollection<Row> getFloorCeilingTestPCollection() {
+    try {
+      return MockedBoundedTable.of(ROW_TYPE_THREE)
+          .addRows(parseDate("1986-02-15 11:35:26"), 1.4)
+          .buildIOReader(pipeline.begin())
+          .setRowSchema(ROW_TYPE_THREE);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   protected PCollection<Row> getAggregationTestPCollection() {
     try {
       return MockedBoundedTable.of(ROW_TYPE_TWO)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


Issue Time Tracking
-------------------

    Worklog Id:     (was: 135414)
    Time Spent: 2h 40m  (was: 2.5h)

> Improve Floor and Ceil tests at DSL level
> -----------------------------------------
>
>                 Key: BEAM-5101
>                 URL: https://issues.apache.org/jira/browse/BEAM-5101
>             Project: Beam
>          Issue Type: Sub-task
>          Components: dsl-sql
>            Reporter: Rui Wang
>            Assignee: Rui Wang
>            Priority: Major
>          Time Spent: 2h 40m
>  Remaining Estimate: 0h
>




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)