You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by xc...@apache.org on 2018/08/25 01:33:28 UTC

[flink] branch master updated: [FLINK-10201] [table] [test] The batchTestUtil was mistakenly used in some stream sql tests

This is an automated email from the ASF dual-hosted git repository.

xccui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d28a65  [FLINK-10201] [table] [test] The batchTestUtil was mistakenly used in some stream sql tests
6d28a65 is described below

commit 6d28a65092ffe4a4390fccacb4deb7e403924f51
Author: Xingcan Cui <xc...@apache.org>
AuthorDate: Thu Aug 23 10:16:44 2018 +0800

    [FLINK-10201] [table] [test] The batchTestUtil was mistakenly used in some stream sql tests
    
    This closes #6605.
---
 .../flink/table/api/stream/sql/CorrelateTest.scala | 12 +++++-----
 .../table/api/stream/sql/SetOperatorsTest.scala    | 27 ++++++++++------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/CorrelateTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/CorrelateTest.scala
index efb83b4..f179ae6 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/CorrelateTest.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/CorrelateTest.scala
@@ -106,7 +106,7 @@ class CorrelateTest extends TableTestBase {
 
   @Test
   def testLeftOuterJoinAsSubQuery(): Unit = {
-    val util = batchTestUtil()
+    val util = streamTestUtil()
     val func1 = new TableFunc1
     util.addTable[(Int, Long, String)]("MyTable", 'a, 'b, 'c)
     util.addTable[(Int, Long, String)]("MyTable2", 'a2, 'b2, 'c2)
@@ -121,13 +121,13 @@ class CorrelateTest extends TableTestBase {
         | ON c2 = s """.stripMargin
 
     val expected = binaryNode(
-      "DataSetJoin",
-      batchTableNode(1),
+      "DataStreamJoin",
+      streamTableNode(1),
       unaryNode(
-        "DataSetCalc",
+        "DataStreamCalc",
         unaryNode(
-          "DataSetCorrelate",
-          batchTableNode(0),
+          "DataStreamCorrelate",
+          streamTableNode(0),
           term("invocation", "func1($cor0.c)"),
           term("correlate", "table(func1($cor0.c))"),
           term("select", "a", "b", "c", "f0"),
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/SetOperatorsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/SetOperatorsTest.scala
index 97dbe0d..fb4b4b5 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/SetOperatorsTest.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/SetOperatorsTest.scala
@@ -173,29 +173,26 @@ class SetOperatorsTest extends TableTestBase {
 
   @Test
   def testValuesWithCast(): Unit = {
-    val util = batchTestUtil()
+    val util = streamTestUtil()
 
     val expected = naryNode(
-      "DataSetUnion",
+      "DataStreamUnion",
       List(
-        unaryNode("DataSetCalc",
-          values("DataSetValues",
-            tuples(List("0")),
-            "values=[ZERO]"),
+        unaryNode("DataStreamCalc",
+          values("DataStreamValues",
+            tuples(List("0"))),
           term("select", "1 AS EXPR$0, 1 AS EXPR$1")),
-        unaryNode("DataSetCalc",
-          values("DataSetValues",
-            tuples(List("0")),
-            "values=[ZERO]"),
+        unaryNode("DataStreamCalc",
+          values("DataStreamValues",
+            tuples(List("0"))),
           term("select", "2 AS EXPR$0, 2 AS EXPR$1")),
-        unaryNode("DataSetCalc",
-          values("DataSetValues",
-            tuples(List("0")),
-            "values=[ZERO]"),
+        unaryNode("DataStreamCalc",
+          values("DataStreamValues",
+            tuples(List("0"))),
           term("select", "3 AS EXPR$0, 3 AS EXPR$1"))
       ),
       term("all", "true"),
-      term("union", "EXPR$0, EXPR$1")
+      term("union all", "EXPR$0, EXPR$1")
     )
 
     util.verifySql(