This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 9a17d8b [SPARK-37004][PYTHON] Upgrade to Py4J 0.10.9.3
9a17d8b is described below
commit 9a17d8b8657a7bb9eadb8e297ea75c8ca19ed988
Author: Hyukjin Kwon <gurwls...@apache.org>
AuthorDate: Mon Dec 6 17:33:43 2021 +0900
[SPARK-37004][PYTHON] Upgrade to Py4J 0.10.9.3
This PR upgrades Py4J from 0.10.9.2 to 0.10.9.3 which contains the bug fix
(https://github.com/bartdag/py4j/pull/440) that directly affected us.
For example, once you cancel a cell in Jupyter, all following cells simply
fail. This PR fixes the bug by upgrading Py4J.
To fix a regression in Spark 3.2.0 in notebooks like Jupyter.
Fixes a regression described in SPARK-37004
Manually tested the fix when I land
https://github.com/bartdag/py4j/pull/440 to Py4J.
Closes #34814 from HyukjinKwon/SPARK-37004.
Authored-by: Hyukjin Kwon <gurwls...@apache.org>
Signed-off-by: Hyukjin Kwon <gurwls...@apache.org>
(cherry picked from commit 72669b574ecbcfd35873aaf751807c90bb415c8f)
Signed-off-by: Hyukjin Kwon <gurwls...@apache.org>
---
bin/pyspark | 2 +-
bin/pyspark2.cmd | 2 +-
core/pom.xml | 2 +-
.../org/apache/spark/api/python/PythonUtils.scala | 2 +-
dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 2 +-
dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 2 +-
python/docs/Makefile | 2 +-
python/docs/make2.bat | 2 +-
python/docs/source/getting_started/install.rst | 2 +-
...{py4j-0.10.9.2-src.zip => py4j-0.10.9.3-src.zip} | Bin 41839 -> 42021 bytes
python/setup.py | 2 +-
sbin/spark-config.sh | 2 +-
12 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/bin/pyspark b/bin/pyspark
index 38ebe51..4840589 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.2-src.zip:$PYTHONPATH"
+export PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.9.3-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 f5f9fad..a19627a 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.2-src.zip;%PYTHONPATH%
+set PYTHONPATH=%SPARK_HOME%\python\lib\py4j-0.10.9.3-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 2229a95..936ab7f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -433,7 +433,7 @@
<dependency>
<groupId>net.sf.py4j</groupId>
<artifactId>py4j</artifactId>
- <version>0.10.9.2</version>
+ <version>0.10.9.3</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 549edc4..8daba86 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.2-src.zip"
+ val PY4J_ZIP_NAME = "py4j-0.10.9.3-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.7-hive-2.3
b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
index ae774b3..909a77c 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
@@ -208,7 +208,7 @@
parquet-format-structures/1.12.2//parquet-format-structures-1.12.2.jar
parquet-hadoop/1.12.2//parquet-hadoop-1.12.2.jar
parquet-jackson/1.12.2//parquet-jackson-1.12.2.jar
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
-py4j/0.10.9.2//py4j-0.10.9.2.jar
+py4j/0.10.9.3//py4j-0.10.9.3.jar
pyrolite/4.30//pyrolite-4.30.jar
rocksdbjni/6.20.3//rocksdbjni-6.20.3.jar
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
index a02f318..79d730c 100644
--- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
@@ -179,7 +179,7 @@
parquet-format-structures/1.12.2//parquet-format-structures-1.12.2.jar
parquet-hadoop/1.12.2//parquet-hadoop-1.12.2.jar
parquet-jackson/1.12.2//parquet-jackson-1.12.2.jar
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
-py4j/0.10.9.2//py4j-0.10.9.2.jar
+py4j/0.10.9.3//py4j-0.10.9.3.jar
pyrolite/4.30//pyrolite-4.30.jar
rocksdbjni/6.20.3//rocksdbjni-6.20.3.jar
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
diff --git a/python/docs/Makefile b/python/docs/Makefile
index a0275b9..9cb1a17 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.2-src.zip)
+export PYTHONPATH=$(realpath ..):$(realpath ../lib/py4j-0.10.9.3-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 29321bb..2e4e2b5 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.2-src.zip
+set PYTHONPATH=..;..\lib\py4j-0.10.9.3-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 2efcfec..ee66067 100644
--- a/python/docs/source/getting_started/install.rst
+++ b/python/docs/source/getting_started/install.rst
@@ -157,7 +157,7 @@ Package Minimum supported version Note
`pandas` 0.23.2 Optional for Spark SQL
`NumPy` 1.7 Required for MLlib DataFrame-based API
`pyarrow` 1.0.0 Optional for Spark SQL
-`Py4J` 0.10.9.2 Required
+`Py4J` 0.10.9.3 Required
`pandas` 0.23.2 Required for pandas API on Spark
`pyarrow` 1.0.0 Required for pandas API on Spark
`Numpy` 1.14 Required for pandas API on Spark
diff --git a/python/lib/py4j-0.10.9.2-src.zip b/python/lib/py4j-0.10.9.3-src.zip
similarity index 55%
rename from python/lib/py4j-0.10.9.2-src.zip
rename to python/lib/py4j-0.10.9.3-src.zip
index f82d64e..428f3ac 100644
Binary files a/python/lib/py4j-0.10.9.2-src.zip and
b/python/lib/py4j-0.10.9.3-src.zip differ
diff --git a/python/setup.py b/python/setup.py
index 187399c..962f232 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -258,7 +258,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.2'],
+ install_requires=['py4j==0.10.9.3'],
extras_require={
'ml': ['numpy>=1.7'],
'mllib': ['numpy>=1.7'],
diff --git a/sbin/spark-config.sh b/sbin/spark-config.sh
index ae8b223..f27b6fe 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.2-src.zip:${PYTHONPATH}"
+ export
PYTHONPATH="${SPARK_HOME}/python/lib/py4j-0.10.9.3-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
