This is an automated email from the ASF dual-hosted git repository.
gurwls223 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 7f59565b9fc1 Revert "[SPARK-46213][PYTHON] Introduce
`PySparkImportError` for error framework"
7f59565b9fc1 is described below
commit 7f59565b9fc19c496bc7600e168650e7663c0065
Author: Hyukjin Kwon <[email protected]>
AuthorDate: Tue Dec 5 10:29:25 2023 +0900
Revert "[SPARK-46213][PYTHON] Introduce `PySparkImportError` for error
framework"
This reverts commit 75b0eb2d601763847507a5e715b3732db004544a.
---
python/docs/source/reference/pyspark.errors.rst | 1 -
python/pyspark/errors/__init__.py | 2 --
python/pyspark/errors/error_classes.py | 10 -------
python/pyspark/errors/exceptions/base.py | 6 ----
python/pyspark/sql/connect/utils.py | 36 +++++++----------------
python/pyspark/sql/pandas/utils.py | 38 +++++++------------------
6 files changed, 21 insertions(+), 72 deletions(-)
diff --git a/python/docs/source/reference/pyspark.errors.rst
b/python/docs/source/reference/pyspark.errors.rst
index a4997506b41e..56fdde2584c5 100644
--- a/python/docs/source/reference/pyspark.errors.rst
+++ b/python/docs/source/reference/pyspark.errors.rst
@@ -44,7 +44,6 @@ Classes
PySparkRuntimeError
PySparkTypeError
PySparkValueError
- PySparkImportError
PySparkIndexError
PythonException
QueryExecutionException
diff --git a/python/pyspark/errors/__init__.py
b/python/pyspark/errors/__init__.py
index 07033d216432..0a55084a4a59 100644
--- a/python/pyspark/errors/__init__.py
+++ b/python/pyspark/errors/__init__.py
@@ -39,7 +39,6 @@ from pyspark.errors.exceptions.base import ( # noqa: F401
SparkNoSuchElementException,
PySparkTypeError,
PySparkValueError,
- PySparkImportError,
PySparkIndexError,
PySparkAttributeError,
PySparkRuntimeError,
@@ -71,7 +70,6 @@ __all__ = [
"SparkNoSuchElementException",
"PySparkTypeError",
"PySparkValueError",
- "PySparkImportError",
"PySparkIndexError",
"PySparkAttributeError",
"PySparkRuntimeError",
diff --git a/python/pyspark/errors/error_classes.py
b/python/pyspark/errors/error_classes.py
index 8ca73ca85de6..e0ca8a938ec2 100644
--- a/python/pyspark/errors/error_classes.py
+++ b/python/pyspark/errors/error_classes.py
@@ -682,11 +682,6 @@ ERROR_CLASSES_JSON = """
"Only a single trigger is allowed."
]
},
- "PACKAGE_NOT_INSTALLED" : {
- "message" : [
- "<package_name> >= <minimum_version> must be installed; however, it was
not found."
- ]
- },
"PIPE_FUNCTION_EXITED" : {
"message" : [
"Pipe function `<func_name>` exited with error code <error_code>."
@@ -943,11 +938,6 @@ ERROR_CLASSES_JSON = """
"<operation> is not supported."
]
},
- "UNSUPPORTED_PACKAGE_VERSION" : {
- "message" : [
- "<package_name> >= <minimum_version> must be installed; however, your
version is <current_version>."
- ]
- },
"UNSUPPORTED_PARAM_TYPE_FOR_HIGHER_ORDER_FUNCTION" : {
"message" : [
"Function `<func_name>` should use only POSITIONAL or POSITIONAL OR
KEYWORD arguments."
diff --git a/python/pyspark/errors/exceptions/base.py
b/python/pyspark/errors/exceptions/base.py
index 0f4001483b7f..e7f1e4386d7a 100644
--- a/python/pyspark/errors/exceptions/base.py
+++ b/python/pyspark/errors/exceptions/base.py
@@ -260,12 +260,6 @@ class PySparkPicklingError(PySparkException,
PicklingError):
"""
-class PySparkImportError(PySparkException, ImportError):
- """
- Wrapper class for ImportError to support error classes.
- """
-
-
class PySparkKeyError(PySparkException, KeyError):
"""
Wrapper class for KeyError to support error classes.
diff --git a/python/pyspark/sql/connect/utils.py
b/python/pyspark/sql/connect/utils.py
index 88f26202b0b2..fd85d75060b5 100644
--- a/python/pyspark/sql/connect/utils.py
+++ b/python/pyspark/sql/connect/utils.py
@@ -18,7 +18,6 @@ import sys
from pyspark.loose_version import LooseVersion
from pyspark.sql.pandas.utils import require_minimum_pandas_version,
require_minimum_pyarrow_version
-from pyspark.errors import PySparkImportError
def check_dependencies(mod_name: str) -> None:
@@ -46,21 +45,13 @@ def require_minimum_grpc_version() -> None:
try:
import grpc
except ImportError as error:
- raise PySparkImportError(
- error_class="PACKAGE_NOT_INSTALLED",
- message_parameters={
- "package_name:": "grpcio",
- "minimum_version": str(minimum_grpc_version),
- },
+ raise ImportError(
+ f"grpcio >= {minimum_grpc_version} must be installed; however, it
was not found."
) from error
if LooseVersion(grpc.__version__) < LooseVersion(minimum_grpc_version):
- raise PySparkImportError(
- error_class="UNSUPPORTED_PACKAGE_VERSION",
- message_parameters={
- "package_name:": "grpcio",
- "minimum_version": str(minimum_grpc_version),
- "current_version": str(grpc.__version__),
- },
+ raise ImportError(
+ f"grpcio >= {minimum_grpc_version} must be installed; however, "
+ f"your version was {grpc.__version__}."
)
@@ -71,12 +62,8 @@ def require_minimum_grpcio_status_version() -> None:
try:
import grpc_status # noqa
except ImportError as error:
- raise PySparkImportError(
- error_class="PACKAGE_NOT_INSTALLED",
- message_parameters={
- "package_name:": "grpcio-status",
- "minimum_version": str(minimum_grpc_version),
- },
+ raise ImportError(
+ f"grpcio-status >= {minimum_grpc_version} must be installed;
however, it was not found."
) from error
@@ -87,12 +74,9 @@ def require_minimum_googleapis_common_protos_version() ->
None:
try:
import google.rpc # noqa
except ImportError as error:
- raise PySparkImportError(
- error_class="PACKAGE_NOT_INSTALLED",
- message_parameters={
- "package_name:": "googleapis-common-protos",
- "minimum_version": str(minimum_common_protos_version),
- },
+ raise ImportError(
+ f"googleapis-common-protos >= {minimum_common_protos_version} must
be installed; "
+ "however, it was not found."
) from error
diff --git a/python/pyspark/sql/pandas/utils.py
b/python/pyspark/sql/pandas/utils.py
index 25152fd5cc1b..b62be2081028 100644
--- a/python/pyspark/sql/pandas/utils.py
+++ b/python/pyspark/sql/pandas/utils.py
@@ -16,7 +16,6 @@
#
from pyspark.loose_version import LooseVersion
-from pyspark.errors import PySparkImportError
def require_minimum_pandas_version() -> None:
@@ -32,21 +31,13 @@ def require_minimum_pandas_version() -> None:
have_pandas = False
raised_error = error
if not have_pandas:
- raise PySparkImportError(
- error_class="PACKAGE_NOT_INSTALLED",
- message_parameters={
- "package_name:": "Pandas",
- "minimum_version": str(minimum_pandas_version),
- },
+ raise ImportError(
+ "Pandas >= %s must be installed; however, " "it was not found." %
minimum_pandas_version
) from raised_error
if LooseVersion(pandas.__version__) < LooseVersion(minimum_pandas_version):
- raise PySparkImportError(
- error_class="UNSUPPORTED_PACKAGE_VERSION",
- message_parameters={
- "package_name:": "Pandas",
- "minimum_version": str(minimum_pandas_version),
- "current_version": str(pandas.__version__),
- },
+ raise ImportError(
+ "Pandas >= %s must be installed; however, "
+ "your version was %s." % (minimum_pandas_version,
pandas.__version__)
)
@@ -65,21 +56,14 @@ def require_minimum_pyarrow_version() -> None:
have_arrow = False
raised_error = error
if not have_arrow:
- raise PySparkImportError(
- error_class="PACKAGE_NOT_INSTALLED",
- message_parameters={
- "package_name:": "PyArrow",
- "minimum_version": str(minimum_pyarrow_version),
- },
+ raise ImportError(
+ "PyArrow >= %s must be installed; however, "
+ "it was not found." % minimum_pyarrow_version
) from raised_error
if LooseVersion(pyarrow.__version__) <
LooseVersion(minimum_pyarrow_version):
- raise PySparkImportError(
- error_class="UNSUPPORTED_PACKAGE_VERSION",
- message_parameters={
- "package_name:": "PyArrow",
- "minimum_version": str(minimum_pyarrow_version),
- "current_version": str(pyarrow.__version__),
- },
+ raise ImportError(
+ "PyArrow >= %s must be installed; however, "
+ "your version was %s." % (minimum_pyarrow_version,
pyarrow.__version__)
)
if os.environ.get("ARROW_PRE_0_15_IPC_FORMAT", "0") == "1":
raise RuntimeError(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
