Skip to content

[MINOR][PYTHON] Use a helper in PythonUtils instead of direct accessing Scala package #22483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HyukjinKwon wants to merge 1 commit into from
Closed

[MINOR][PYTHON] Use a helper in PythonUtils instead of direct accessing Scala package #22483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ private[spark] object PythonUtils {
def toScalaMap[K, V](jm: java.util.Map[K, V]): Map[K, V] = {
jm.asScala.toMap
}

def getEncryptionEnabled(sc: JavaSparkContext): Boolean = {
sc.conf.get(org.apache.spark.internal.config.IO_ENCRYPTION_ENABLED)
}
}
4 changes: 1 addition & 3 deletions python/pyspark/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,7 @@ def _do_init(self, master, appName, sparkHome, pyFiles, environment, batchSize,
# If encryption is enabled, we need to setup a server in the jvm to read broadcast
# data via a socket.
# scala's mangled names w/ $ in them require special treatment.
encryption_conf = self._jvm.org.apache.spark.internal.config.__getattr__("package$")\
.__getattr__("MODULE$").IO_ENCRYPTION_ENABLED()
self._encryption_enabled = self._jsc.sc().conf().get(encryption_conf)
self._encryption_enabled = self._jvm.PythonUtils.getEncryptionEnabled(self._jsc)

self.pythonExec = os.environ.get("PYSPARK_PYTHON", 'python')
self.pythonVer = "%d.%d" % sys.version_info[:2]
Expand Down