You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/01/19 14:13:18 UTC
[flink] branch FLINK-30191 created (now e5764802ea4)
This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a change to branch FLINK-30191
in repository https://gitbox.apache.org/repos/asf/flink.git
at e5764802ea4 Revert "[FLINK-30191][python] Update net.sf.py4j:py4j dependency to 0.10.9.7"
This branch includes the following new commits:
new e5764802ea4 Revert "[FLINK-30191][python] Update net.sf.py4j:py4j dependency to 0.10.9.7"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[flink] 01/01: Revert "[FLINK-30191][python] Update net.sf.py4j:py4j dependency to 0.10.9.7"
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a commit to branch FLINK-30191
in repository https://gitbox.apache.org/repos/asf/flink.git
commit e5764802ea403f6a0226ef5577c9ad2ab7393c6d
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Thu Jan 19 15:12:49 2023 +0100
Revert "[FLINK-30191][python] Update net.sf.py4j:py4j dependency to 0.10.9.7"
This reverts commit 0bbc7b1e9fed89b8c3e8ec67b7b0dad5999c2c01.
---
NOTICE | 2 +-
flink-python/README.md | 2 +-
flink-python/dev/dev-requirements.txt | 2 +-
flink-python/lib/py4j-0.10.9.3-src.zip | Bin 0 -> 83148 bytes
flink-python/lib/py4j-0.10.9.7-src.zip | Bin 86109 -> 0 bytes
flink-python/pyflink/table/table_result.py | 8 ++------
flink-python/setup.py | 2 +-
flink-python/src/main/resources/META-INF/NOTICE | 2 +-
pom.xml | 2 +-
9 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/NOTICE b/NOTICE
index 207340bd15f..37a8a1623c7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -18,7 +18,7 @@ This project bundles the following dependencies under the BSD license.
See bundled license files for details.
- cloudpickle:2.2.0
-- net.sf.py4j:py4j:0.10.9.7
+- net.sf.py4j:py4j:0.10.9.3
This project bundles the following dependencies under SIL OFL 1.1 license (https://opensource.org/licenses/OFL-1.1).
See bundled license files for details.
diff --git a/flink-python/README.md b/flink-python/README.md
index 171ace5708a..7f6c89bffae 100644
--- a/flink-python/README.md
+++ b/flink-python/README.md
@@ -26,7 +26,7 @@ The auto-generated Python docs can be found at [https://nightlies.apache.org/fli
## Python Requirements
-Apache Flink Python API depends on Py4J (currently version 0.10.9.7), CloudPickle (currently version 2.2.0), python-dateutil(currently version 2.8.0), Apache Beam (currently version 2.43.0).
+Apache Flink Python API depends on Py4J (currently version 0.10.9.3), CloudPickle (currently version 2.2.0), python-dateutil(currently version 2.8.0), Apache Beam (currently version 2.43.0).
## Development Notices
diff --git a/flink-python/dev/dev-requirements.txt b/flink-python/dev/dev-requirements.txt
index d0cb404b520..5c65ae5e655 100755
--- a/flink-python/dev/dev-requirements.txt
+++ b/flink-python/dev/dev-requirements.txt
@@ -17,7 +17,7 @@ setuptools>=18.0
wheel
apache-beam==2.43.0
cython==0.29.24
-py4j==0.10.9.7
+py4j==0.10.9.3
python-dateutil==2.8.0
cloudpickle==2.2.0
avro-python3>=1.8.1,!=1.9.2,<1.10.0
diff --git a/flink-python/lib/py4j-0.10.9.3-src.zip b/flink-python/lib/py4j-0.10.9.3-src.zip
new file mode 100644
index 00000000000..82f0b89adea
Binary files /dev/null and b/flink-python/lib/py4j-0.10.9.3-src.zip differ
diff --git a/flink-python/lib/py4j-0.10.9.7-src.zip b/flink-python/lib/py4j-0.10.9.7-src.zip
deleted file mode 100644
index 4d414b9ed18..00000000000
Binary files a/flink-python/lib/py4j-0.10.9.7-src.zip and /dev/null differ
diff --git a/flink-python/pyflink/table/table_result.py b/flink-python/pyflink/table/table_result.py
index c35ce08e8e3..6c982676d43 100644
--- a/flink-python/pyflink/table/table_result.py
+++ b/flink-python/pyflink/table/table_result.py
@@ -141,7 +141,7 @@ class TableResult(object):
.. versionadded:: 1.11.0
"""
- return TableSchema(j_table_schema=self._get_java_table_schema())
+ return TableSchema(j_table_schema=self._j_table_result.getTableSchema())
def get_result_kind(self) -> ResultKind:
"""
@@ -189,7 +189,7 @@ class TableResult(object):
.. versionadded:: 1.12.0
"""
- field_data_types = self._get_java_table_schema().getFieldDataTypes()
+ field_data_types = self._j_table_result.getTableSchema().getFieldDataTypes()
j_iter = self._j_table_result.collect()
@@ -218,10 +218,6 @@ class TableResult(object):
"""
self._j_table_result.print()
- def _get_java_table_schema(self):
- TableSchema = get_gateway().jvm.org.apache.flink.table.api.TableSchema
- return TableSchema.fromResolvedSchema(self._j_table_result.getResolvedSchema())
-
class CloseableIterator(object):
"""
diff --git a/flink-python/setup.py b/flink-python/setup.py
index f72fddd5a32..82cce4368b6 100644
--- a/flink-python/setup.py
+++ b/flink-python/setup.py
@@ -305,7 +305,7 @@ try:
'pyflink.examples': ['*.py', '*/*.py'],
'pyflink.bin': ['*']}
- install_requires = ['py4j==0.10.9.7', 'python-dateutil==2.8.0', 'apache-beam==2.43.0',
+ install_requires = ['py4j==0.10.9.3', 'python-dateutil==2.8.0', 'apache-beam==2.43.0',
'cloudpickle==2.2.0', 'avro-python3>=1.8.1,!=1.9.2,<1.10.0',
'pytz>=2018.3', 'fastavro>=1.1.0,<1.4.8', 'requests>=2.26.0',
'protobuf>=3.19.0,<=3.21',
diff --git a/flink-python/src/main/resources/META-INF/NOTICE b/flink-python/src/main/resources/META-INF/NOTICE
index ee261373067..b22182dd871 100644
--- a/flink-python/src/main/resources/META-INF/NOTICE
+++ b/flink-python/src/main/resources/META-INF/NOTICE
@@ -32,7 +32,7 @@ This project bundles the following dependencies under the Apache Software Licens
This project bundles the following dependencies under the BSD license.
See bundled license files for details
-- net.sf.py4j:py4j:0.10.9.7
+- net.sf.py4j:py4j:0.10.9.3
- com.google.protobuf:protobuf-java:3.21.7
This project bundles the following dependencies under the MIT license. (https://opensource.org/licenses/MIT)
diff --git a/pom.xml b/pom.xml
index de570f6f981..4dbe30bf532 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@ under the License.
<powermock.version>2.0.9</powermock.version>
<hamcrest.version>1.3</hamcrest.version>
<assertj.version>3.23.1</assertj.version>
- <py4j.version>0.10.9.7</py4j.version>
+ <py4j.version>0.10.9.3</py4j.version>
<beam.version>2.43.0</beam.version>
<protoc.version>3.21.7</protoc.version>
<okhttp.version>3.14.9</okhttp.version>