This is an automated email from the ASF dual-hosted git repository.
xinrong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 74deefb7894 [SPARK-40084][PYTHON] Upgrade Py4J to 0.10.9.7
74deefb7894 is described below
commit 74deefb789452c097003a958707adbcb8b2bfd38
Author: panbingkun <pbk1...@gmail.com>
AuthorDate: Tue Aug 16 10:33:54 2022 -0700
[SPARK-40084][PYTHON] Upgrade Py4J to 0.10.9.7
### What changes were proposed in this pull request?
This PR aim to upgrade Py4J 0.10.9.7, with relevant documentation changes.
### Why are the changes needed?
Py4J 0.10.9.7 support for Java 11/17.
<img width="492" alt="image"
src="https://user-images.githubusercontent.com/15246973/184638137-fa794eaf-9edc-46b8-9706-1410bc4b5135.png";>
Release notes: https://www.py4j.org/changelog.html
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Pass GA.
Closes #37523 from panbingkun/upgrade_py4j_to_0.10.9.7.
Authored-by: panbingkun <pbk1...@gmail.com>
Signed-off-by: Xinrong Meng <xinr...@apache.org>
---
bin/pyspark | 2 +-
bin/pyspark2.cmd | 2 +-
core/pom.xml | 2 +-
.../scala/org/apache/spark/api/python/PythonUtils.scala | 2 +-
dev/deps/spark-deps-hadoop-2-hive-2.3 | 2 +-
dev/deps/spark-deps-hadoop-3-hive-2.3 | 2 +-
python/docs/Makefile | 2 +-
python/docs/make2.bat | 2 +-
python/docs/source/getting_started/install.rst | 2 +-
python/lib/py4j-0.10.9.5-src.zip | Bin 42404 -> 0 bytes
python/lib/py4j-0.10.9.7-src.zip | Bin 0 -> 42424 bytes
python/setup.py | 2 +-
sbin/spark-config.sh | 2 +-
13 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/bin/pyspark b/bin/pyspark
index 21a514e5e2c..1ae28b1f507 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -50,7 +50,7 @@ export PYSPARK_DRIVER_PYTHON_OPTS
# Add the PySpark classes to the Python path:
export PYTHONPATH="${SPARK_HOME}/python/:$PYTHONPATH"
-export PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.9.5-src.zip:$PYTHONPATH"
+export PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.9.7-src.zip:$PYTHONPATH"
# Load the PySpark shell.py script when ./pyspark is used interactively:
export OLD_PYTHONSTARTUP="$PYTHONSTARTUP"
diff --git a/bin/pyspark2.cmd b/bin/pyspark2.cmd
index eec02a406b6..232813b4ffd 100644
--- a/bin/pyspark2.cmd
+++ b/bin/pyspark2.cmd
@@ -30,7 +30,7 @@ if "x%PYSPARK_DRIVER_PYTHON%"=="x" (
)
set PYTHONPATH=%SPARK_HOME%\python;%PYTHONPATH%
-set PYTHONPATH=%SPARK_HOME%\python\lib\py4j-0.10.9.5-src.zip;%PYTHONPATH%
+set PYTHONPATH=%SPARK_HOME%\python\lib\py4j-0.10.9.7-src.zip;%PYTHONPATH%
set OLD_PYTHONSTARTUP=%PYTHONSTARTUP%
set PYTHONSTARTUP=%SPARK_HOME%\python\pyspark\shell.py
diff --git a/core/pom.xml b/core/pom.xml
index 80578417b05..45e81ac843f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -458,7 +458,7 @@
<dependency>
<groupId>net.sf.py4j</groupId>
<artifactId>py4j</artifactId>
- <version>0.10.9.5</version>
+ <version>0.10.9.7</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala
b/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala
index 63361713c9b..2fed8c0059a 100644
--- a/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala
+++ b/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala
@@ -27,7 +27,7 @@ import org.apache.spark.SparkContext
import org.apache.spark.api.java.{JavaRDD, JavaSparkContext}
private[spark] object PythonUtils {
- val PY4J_ZIP_NAME = "py4j-0.10.9.5-src.zip"
+ val PY4J_ZIP_NAME = "py4j-0.10.9.7-src.zip"
/** Get the PYTHONPATH for PySpark, either from SPARK_HOME, if it is set, or
from our JAR */
def sparkPythonPath: String = {
diff --git a/dev/deps/spark-deps-hadoop-2-hive-2.3
b/dev/deps/spark-deps-hadoop-2-hive-2.3
index 8a730061c95..b68295f4eb5 100644
--- a/dev/deps/spark-deps-hadoop-2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2-hive-2.3
@@ -232,7 +232,7 @@ parquet-hadoop/1.12.3//parquet-hadoop-1.12.3.jar
parquet-jackson/1.12.3//parquet-jackson-1.12.3.jar
pickle/1.2//pickle-1.2.jar
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
-py4j/0.10.9.5//py4j-0.10.9.5.jar
+py4j/0.10.9.7//py4j-0.10.9.7.jar
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
rocksdbjni/7.4.4//rocksdbjni-7.4.4.jar
scala-collection-compat_2.12/2.2.0//scala-collection-compat_2.12-2.2.0.jar
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3
b/dev/deps/spark-deps-hadoop-3-hive-2.3
index e3ab7ba43a4..02b065f10df 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -219,7 +219,7 @@ parquet-hadoop/1.12.3//parquet-hadoop-1.12.3.jar
parquet-jackson/1.12.3//parquet-jackson-1.12.3.jar
pickle/1.2//pickle-1.2.jar
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
-py4j/0.10.9.5//py4j-0.10.9.5.jar
+py4j/0.10.9.7//py4j-0.10.9.7.jar
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
rocksdbjni/7.4.4//rocksdbjni-7.4.4.jar
scala-collection-compat_2.12/2.2.0//scala-collection-compat_2.12-2.2.0.jar
diff --git a/python/docs/Makefile b/python/docs/Makefile
index 65ab6cfa3ec..c9596209f52 100644
--- a/python/docs/Makefile
+++ b/python/docs/Makefile
@@ -21,7 +21,7 @@ SPHINXBUILD ?= sphinx-build
SOURCEDIR ?= source
BUILDDIR ?= build
-export PYTHONPATH=$(realpath ..):$(realpath ../lib/py4j-0.10.9.5-src.zip)
+export PYTHONPATH=$(realpath ..):$(realpath ../lib/py4j-0.10.9.7-src.zip)
# Put it first so that "make" without argument is like "make help".
help:
diff --git a/python/docs/make2.bat b/python/docs/make2.bat
index d36b7a1abc0..41e33cd07d4 100644
--- a/python/docs/make2.bat
+++ b/python/docs/make2.bat
@@ -25,7 +25,7 @@ if "%SPHINXBUILD%" == "" (
set SOURCEDIR=source
set BUILDDIR=build
-set PYTHONPATH=..;..\lib\py4j-0.10.9.5-src.zip
+set PYTHONPATH=..;..\lib\py4j-0.10.9.7-src.zip
if "%1" == "" goto help
diff --git a/python/docs/source/getting_started/install.rst
b/python/docs/source/getting_started/install.rst
index afcdb7291c5..a8abed01666 100644
--- a/python/docs/source/getting_started/install.rst
+++ b/python/docs/source/getting_started/install.rst
@@ -156,7 +156,7 @@ Package Minimum supported version Note
============= ========================= ======================================
`pandas` 1.0.5 Optional for Spark SQL
`pyarrow` 1.0.0 Optional for Spark SQL
-`py4j` 0.10.9.5 Required
+`py4j` 0.10.9.7 Required
`pandas` 1.0.5 Required for pandas API on Spark
`pyarrow` 1.0.0 Required for pandas API on Spark
`numpy` 1.15 Required for pandas API on Spark and
MLLib DataFrame-based API; Optional for Spark SQL
diff --git a/python/lib/py4j-0.10.9.5-src.zip b/python/lib/py4j-0.10.9.5-src.zip
deleted file mode 100644
index 478d4b09bef..00000000000
Binary files a/python/lib/py4j-0.10.9.5-src.zip and /dev/null differ
diff --git a/python/lib/py4j-0.10.9.7-src.zip b/python/lib/py4j-0.10.9.7-src.zip
new file mode 100644
index 00000000000..6abba4efa0f
Binary files /dev/null and b/python/lib/py4j-0.10.9.7-src.zip differ
diff --git a/python/setup.py b/python/setup.py
index 061dc9d663d..af102f23083 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -259,7 +259,7 @@ try:
license='http://www.apache.org/licenses/LICENSE-2.0',
# Don't forget to update python/docs/source/getting_started/install.rst
# if you're updating the versions or dependencies.
- install_requires=['py4j==0.10.9.5'],
+ install_requires=['py4j==0.10.9.7'],
extras_require={
'ml': ['numpy>=1.15'],
'mllib': ['numpy>=1.15'],
diff --git a/sbin/spark-config.sh b/sbin/spark-config.sh
index 6044de2599e..0bea4a45040 100755
--- a/sbin/spark-config.sh
+++ b/sbin/spark-config.sh
@@ -28,6 +28,6 @@ export
SPARK_CONF_DIR="${SPARK_CONF_DIR:-"${SPARK_HOME}/conf"}"
# Add the PySpark classes to the PYTHONPATH:
if [ -z "${PYSPARK_PYTHONPATH_SET}" ]; then
export PYTHONPATH="${SPARK_HOME}/python:${PYTHONPATH}"
- export
PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.9.5-src.zip:${PYTHONPATH}"
+ export
PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.9.7-src.zip:${PYTHONPATH}"
export PYSPARK_PYTHONPATH_SET=1
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
![https://user-images.githubusercontent.com/15246973/184638137-fa794eaf-9edc-46b8-9706-1410bc4b5135.png"](https://user-images.githubusercontent.com/15246973/184638137-fa794eaf-9edc-46b8-9706-1410bc4b5135.png"){kind=link}