You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by di...@apache.org on 2020/06/10 02:36:47 UTC

[flink] 02/02: [hotfix][python] Remove unnecessary methods in JobExecutionResult

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

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

commit f81b2c101e56da845ea60c4bfea7be6589ec3f32
Author: Dian Fu <di...@apache.org>
AuthorDate: Tue Jun 9 20:40:11 2020 +0800

    [hotfix][python] Remove unnecessary methods in JobExecutionResult
---
 .../pyflink/common/job_execution_result.py         | 23 ----------------------
 .../dataset/tests/test_execution_environment.py    |  2 --
 .../tests/test_stream_execution_environment.py     |  2 --
 flink-python/pyflink/table/tests/test_sql.py       |  4 +---
 .../table/tests/test_table_environment_api.py      | 12 ++++-------
 5 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/flink-python/pyflink/common/job_execution_result.py b/flink-python/pyflink/common/job_execution_result.py
index bef45a8..c215013 100644
--- a/flink-python/pyflink/common/job_execution_result.py
+++ b/flink-python/pyflink/common/job_execution_result.py
@@ -42,29 +42,6 @@ class JobExecutionResult(object):
         """
         return JobID(self._j_job_execution_result.getJobID())
 
-    def is_job_execution_result(self):
-        """
-        Checks if this JobSubmissionResult is also a JobExecutionResult.
-
-        .. seealso:: :func:`get_job_execution_result` to retrieve the JobExecutionResult.
-
-        :return: ``True`` if this is a JobExecutionResult, ``False`` otherwise.
-
-        .. versionadded:: 1.11.0
-        """
-        return self._j_job_execution_result.isJobExecutionResult()
-
-    def get_job_execution_result(self):
-        """
-        Returns the JobExecutionResult if available.
-
-        :throws: Exception if this is not a JobExecutionResult.
-        :return: The JobExecutionResult.
-
-        .. versionadded:: 1.11.0
-        """
-        return self
-
     def get_net_runtime(self):
         """
         Gets the net execution time of the job, i.e., the execution time in the parallel system,
diff --git a/flink-python/pyflink/dataset/tests/test_execution_environment.py b/flink-python/pyflink/dataset/tests/test_execution_environment.py
index 77c1550..596c3d1 100644
--- a/flink-python/pyflink/dataset/tests/test_execution_environment.py
+++ b/flink-python/pyflink/dataset/tests/test_execution_environment.py
@@ -130,8 +130,6 @@ class ExecutionEnvironmentTests(PyFlinkTestCase):
         t_env.insert_into('Results', t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c']))
         execution_result = t_env.execute('test_batch_execute')
         self.assertIsNotNone(execution_result.get_job_id())
-        self.assertTrue(execution_result.is_job_execution_result())
-        self.assertIsNotNone(execution_result.get_job_execution_result().get_job_id())
         self.assertIsNotNone(execution_result.get_net_runtime())
         self.assertEqual(len(execution_result.get_all_accumulator_results()), 0)
         self.assertIsNone(execution_result.get_accumulator_result('accumulator'))
diff --git a/flink-python/pyflink/datastream/tests/test_stream_execution_environment.py b/flink-python/pyflink/datastream/tests/test_stream_execution_environment.py
index d27df00..a7ca5ee 100644
--- a/flink-python/pyflink/datastream/tests/test_stream_execution_environment.py
+++ b/flink-python/pyflink/datastream/tests/test_stream_execution_environment.py
@@ -207,8 +207,6 @@ class StreamExecutionEnvironmentTests(PyFlinkTestCase):
         t_env.insert_into('Results', t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c']))
         execution_result = t_env.execute('test_stream_execute')
         self.assertIsNotNone(execution_result.get_job_id())
-        self.assertTrue(execution_result.is_job_execution_result())
-        self.assertIsNotNone(execution_result.get_job_execution_result().get_job_id())
         self.assertIsNotNone(execution_result.get_net_runtime())
         self.assertEqual(len(execution_result.get_all_accumulator_results()), 0)
         self.assertIsNone(execution_result.get_accumulator_result('accumulator'))
diff --git a/flink-python/pyflink/table/tests/test_sql.py b/flink-python/pyflink/table/tests/test_sql.py
index c8c0ee1..e04206e 100644
--- a/flink-python/pyflink/table/tests/test_sql.py
+++ b/flink-python/pyflink/table/tests/test_sql.py
@@ -84,10 +84,8 @@ class StreamSqlTests(SqlTests, PyFlinkStreamTableTestCase):
             "sinks",
             source_sink_utils.TestAppendSink(field_names, field_types))
         table_result = t_env.execute_sql("insert into sinks select * from tbl")
-        job_execution_result = table_result.get_job_client().get_job_execution_result(
-            get_gateway().jvm.Thread.currentThread().getContextClassLoader()).result()
+        job_execution_result = table_result.get_job_client().get_job_execution_result().result()
         self.assertIsNotNone(job_execution_result.get_job_id())
-        self.assertIsNotNone(job_execution_result.get_job_execution_result())
         self.assert_equals(table_result.get_table_schema().get_field_names(),
                            ["default_catalog.default_database.sinks"])
         self.assertEqual(table_result.get_result_kind(), ResultKind.SUCCESS_WITH_CONTENT)
diff --git a/flink-python/pyflink/table/tests/test_table_environment_api.py b/flink-python/pyflink/table/tests/test_table_environment_api.py
index 2bf40c8..e4bd22a 100644
--- a/flink-python/pyflink/table/tests/test_table_environment_api.py
+++ b/flink-python/pyflink/table/tests/test_table_environment_api.py
@@ -444,8 +444,7 @@ class StreamTableEnvironmentTests(TableEnvironmentTest, PyFlinkStreamTableTestCa
         t_env.create_temporary_view("source", source)
         t_env.execute_sql("select func1(a, b), func2(a, b) from source") \
             .get_job_client() \
-            .get_job_execution_result(
-                get_gateway().jvm.Thread.currentThread().getContextClassLoader()) \
+            .get_job_execution_result() \
             .result()
 
     def execute_with_statement_set(self, t_env):
@@ -453,8 +452,7 @@ class StreamTableEnvironmentTests(TableEnvironmentTest, PyFlinkStreamTableTestCa
         result = source.select("func1(a, b), func2(a, b)")
         t_env.create_statement_set().add_insert("sink", result).execute() \
             .get_job_client() \
-            .get_job_execution_result(
-                get_gateway().jvm.Thread.currentThread().getContextClassLoader()) \
+            .get_job_execution_result() \
             .result()
         actual = source_sink_utils.results()
         expected = ['1 and Hi,1 or Hi', '2 and Hello,2 or Hello']
@@ -466,8 +464,7 @@ class StreamTableEnvironmentTests(TableEnvironmentTest, PyFlinkStreamTableTestCa
         result = source.select("func1(a, b), func2(a, b)")
         result.execute() \
             .get_job_client() \
-            .get_job_execution_result(
-                get_gateway().jvm.Thread.currentThread().getContextClassLoader()) \
+            .get_job_execution_result() \
             .result()
 
     def execute_with_table_execute_insert(self, t_env):
@@ -475,8 +472,7 @@ class StreamTableEnvironmentTests(TableEnvironmentTest, PyFlinkStreamTableTestCa
         result = source.select("func1(a, b), func2(a, b)")
         result.execute_insert("sink") \
             .get_job_client() \
-            .get_job_execution_result(
-                get_gateway().jvm.Thread.currentThread().getContextClassLoader()) \
+            .get_job_execution_result() \
             .result()
         actual = source_sink_utils.results()
         expected = ['1 and Hi,1 or Hi', '2 and Hello,2 or Hello']