You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by dw...@apache.org on 2019/06/21 15:07:32 UTC
[flink] branch master updated: [hotfix][python] Using fully
qualified function names in python tests.
This is an automated email from the ASF dual-hosted git repository.
dwysakowicz 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 de1fd6d [hotfix][python] Using fully qualified function names in python tests.
de1fd6d is described below
commit de1fd6ddddc7042d0cc64d3b07a43834e0863f17
Author: Dawid Wysakowicz <dw...@apache.org>
AuthorDate: Fri Jun 21 17:06:38 2019 +0200
[hotfix][python] Using fully qualified function names in python tests.
---
flink-python/pyflink/table/tests/test_aggregate.py | 3 ++-
flink-python/pyflink/table/tests/test_calc.py | 11 ++++++++---
flink-python/pyflink/table/tests/test_column_operation.py | 8 ++++++--
flink-python/pyflink/table/tests/test_join.py | 12 ++++++++----
flink-python/pyflink/table/tests/test_sort.py | 3 ++-
5 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/flink-python/pyflink/table/tests/test_aggregate.py b/flink-python/pyflink/table/tests/test_aggregate.py
index f0e70b9..9c78fde 100644
--- a/flink-python/pyflink/table/tests/test_aggregate.py
+++ b/flink-python/pyflink/table/tests/test_aggregate.py
@@ -26,7 +26,8 @@ class StreamTableAggregateTests(PyFlinkStreamTableTestCase):
result = t.group_by("c").select("a.sum, c as b")
query_operation = result._j_table.getQueryOperation().getChildren().get(0)
self.assertEqual("[c]", query_operation.getGroupingExpressions().toString())
- self.assertEqual("[as(sum(a), 'EXPR$0')]",
+ self.assertEqual("[`default_catalog`.`default_database`.`as`("
+ "`default_catalog`.`default_database`.`sum`(a), 'EXPR$0')]",
query_operation.getAggregateExpressions().toString())
diff --git a/flink-python/pyflink/table/tests/test_calc.py b/flink-python/pyflink/table/tests/test_calc.py
index 970d357..e035fe6 100644
--- a/flink-python/pyflink/table/tests/test_calc.py
+++ b/flink-python/pyflink/table/tests/test_calc.py
@@ -33,7 +33,8 @@ class StreamTableCalcTests(PyFlinkStreamTableTestCase):
t = self.t_env.from_elements([(1, 'hi', 'hello')], ['a', 'b', 'c'])
result = t.select("a + 1, b, c")
query_operation = result._j_table.getQueryOperation()
- self.assertEqual('[plus(a, 1), b, c]', query_operation.getProjectList().toString())
+ self.assertEqual('[`default_catalog`.`default_database`.`plus`(a, 1), b, c]',
+ query_operation.getProjectList().toString())
def test_alias(self):
t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
@@ -46,14 +47,18 @@ class StreamTableCalcTests(PyFlinkStreamTableTestCase):
t = t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
result = t.where("a > 1 && b = 'Hello'")
query_operation = result._j_table.getQueryOperation()
- self.assertEqual("and(greaterThan(a, 1), equals(b, 'Hello'))",
+ self.assertEqual("`default_catalog`.`default_database`.`and`("
+ "`default_catalog`.`default_database`.`greaterThan`(a, 1), "
+ "`default_catalog`.`default_database`.`equals`(b, 'Hello'))",
query_operation.getCondition().toString())
def test_filter(self):
t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
result = t.filter("a > 1 && b = 'Hello'")
query_operation = result._j_table.getQueryOperation()
- self.assertEqual("and(greaterThan(a, 1), equals(b, 'Hello'))",
+ self.assertEqual("`default_catalog`.`default_database`.`and`("
+ "`default_catalog`.`default_database`.`greaterThan`(a, 1), "
+ "`default_catalog`.`default_database`.`equals`(b, 'Hello'))",
query_operation.getCondition().toString())
def test_from_element(self):
diff --git a/flink-python/pyflink/table/tests/test_column_operation.py b/flink-python/pyflink/table/tests/test_column_operation.py
index 278821f..e9a49e6 100644
--- a/flink-python/pyflink/table/tests/test_column_operation.py
+++ b/flink-python/pyflink/table/tests/test_column_operation.py
@@ -25,13 +25,17 @@ class StreamTableColumnsOperationTests(PyFlinkStreamTableTestCase):
t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
result = t.select("a").add_columns("a + 1 as b, a + 2 as c")
query_operation = result._j_table.getQueryOperation()
- self.assertEqual('[a, plus(a, 1), plus(a, 2)]', query_operation.getProjectList().toString())
+ self.assertEqual('[a, `default_catalog`.`default_database`.`plus`(a, 1), '
+ '`default_catalog`.`default_database`.`plus`(a, 2)]',
+ query_operation.getProjectList().toString())
def test_add_or_replace_columns(self):
t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
result = t.select("a").add_or_replace_columns("a + 1 as b, a + 2 as a")
query_operation = result._j_table.getQueryOperation()
- self.assertEqual('[plus(a, 2), plus(a, 1)]', query_operation.getProjectList().toString())
+ self.assertEqual('[`default_catalog`.`default_database`.`plus`(a, 2), '
+ '`default_catalog`.`default_database`.`plus`(a, 1)]',
+ query_operation.getProjectList().toString())
def test_rename_columns(self):
t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
diff --git a/flink-python/pyflink/table/tests/test_join.py b/flink-python/pyflink/table/tests/test_join.py
index c8f7388..f36d379 100644
--- a/flink-python/pyflink/table/tests/test_join.py
+++ b/flink-python/pyflink/table/tests/test_join.py
@@ -29,7 +29,8 @@ class StreamTableJoinTests(PyFlinkStreamTableTestCase):
query_operation = result._j_table.getQueryOperation()
self.assertEqual('INNER', query_operation.getJoinType().toString())
- self.assertEqual('equals(a, d)', query_operation.getCondition().toString())
+ self.assertEqual('`default_catalog`.`default_database`.`equals`(a, d)',
+ query_operation.getCondition().toString())
self.assertFalse(query_operation.isCorrelated())
def test_join_with_where(self):
@@ -51,7 +52,8 @@ class StreamTableJoinTests(PyFlinkStreamTableTestCase):
query_operation = result._j_table.getQueryOperation()
self.assertEqual('LEFT_OUTER', query_operation.getJoinType().toString())
- self.assertEqual('equals(a, d)', query_operation.getCondition().toString())
+ self.assertEqual('`default_catalog`.`default_database`.`equals`(a, d)',
+ query_operation.getCondition().toString())
self.assertFalse(query_operation.isCorrelated())
def test_left_outer_join_with_where(self):
@@ -73,7 +75,8 @@ class StreamTableJoinTests(PyFlinkStreamTableTestCase):
query_operation = result._j_table.getQueryOperation()
self.assertEqual('RIGHT_OUTER', query_operation.getJoinType().toString())
- self.assertEqual('equals(a, d)', query_operation.getCondition().toString())
+ self.assertEqual('`default_catalog`.`default_database`.`equals`(a, d)',
+ query_operation.getCondition().toString())
self.assertFalse(query_operation.isCorrelated())
def test_full_outer_join(self):
@@ -84,7 +87,8 @@ class StreamTableJoinTests(PyFlinkStreamTableTestCase):
result = t1.full_outer_join(t2, "a = d")
query_operation = result._j_table.getQueryOperation()
self.assertEqual('FULL_OUTER', query_operation.getJoinType().toString())
- self.assertEqual('equals(a, d)', query_operation.getCondition().toString())
+ self.assertEqual('`default_catalog`.`default_database`.`equals`(a, d)',
+ query_operation.getCondition().toString())
self.assertFalse(query_operation.isCorrelated())
diff --git a/flink-python/pyflink/table/tests/test_sort.py b/flink-python/pyflink/table/tests/test_sort.py
index 0d490c7..d03b42a 100644
--- a/flink-python/pyflink/table/tests/test_sort.py
+++ b/flink-python/pyflink/table/tests/test_sort.py
@@ -28,7 +28,8 @@ class BatchTableSortTests(PyFlinkBatchTableTestCase):
query_operation = result._j_table.getQueryOperation()
self.assertEqual(2, query_operation.getOffset())
self.assertEqual(2, query_operation.getFetch())
- self.assertEqual('[desc(a)]', query_operation.getOrder().toString())
+ self.assertEqual('[`default_catalog`.`default_database`.`desc`(a)]',
+ query_operation.getOrder().toString())
if __name__ == '__main__':