Skip to content
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

Jump to bottom

SPARKNLP 643 detecting spark version in a safer way #13035

Merged
merged 2 commits into from
Nov 4, 2022
Merged

SPARKNLP 643 detecting spark version in a safer way #13035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
146c3b9
SPARKNLP-643 Extract only the spark version(numbers)
maziyarpanahi Nov 4, 2022
ec85f76
SPARKNLP-643 Replace regex with LooseVersion from distutils
maziyarpanahi Nov 4, 2022
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
6 changes: 3 additions & 3 deletions python/sparknlp/internal/extended_java_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from pyspark import SparkContext
from pyspark.ml.wrapper import JavaWrapper
from pyspark.sql import DataFrame
from distutils.version import LooseVersion


class ExtendedJavaWrapper(JavaWrapper):
Expand Down Expand Up @@ -53,11 +54,10 @@ def new_java_array_integer(self, pylist):
return java_array

def spark_version(self):
spark_version = self.sc.version.split(".")
return int("".join(spark_version))
return self.sc.version

def getDataFrame(self, spark, jdf):
if self.spark_version() >= 330:
if LooseVersion(self.spark_version()) >= LooseVersion("3.3.0"):
return DataFrame(jdf, spark._getActiveSessionOrCreate())
else:
return DataFrame(jdf, spark._wrapped)