Skip to content

[SQL] Make it possible to create Java/Python SQLContexts from an existing Scala SQLContext. #761

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
wants to merge 1 commit into from
Closed

[SQL] Make it possible to create Java/Python SQLContexts from an existing Scala SQLContext. #761

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
7 changes: 5 additions & 2 deletions python/pyspark/sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class SQLContext:
register L{SchemaRDD}s as tables, execute sql over tables, cache tables, and read parquet files.
"""

def __init__(self, sparkContext):
def __init__(self, sparkContext, sqlContext = None):
"""
Create a new SQLContext.

Expand Down Expand Up @@ -58,10 +58,13 @@ def __init__(self, sparkContext):
self._jvm = self._sc._jvm
self._pythonToJavaMap = self._jvm.PythonRDD.pythonToJavaMap

if sqlContext:
self._scala_SQLContext = sqlContext

@property
def _ssql_ctx(self):
"""
Accessor for the JVM SparkSQL context. Subclasses can overrite this property to provide
Accessor for the JVM SparkSQL context. Subclasses can override this property to provide
their own JVM Contexts.
"""
if not hasattr(self, '_scala_SQLContext'):
Expand Down
4 changes: 2 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import org.apache.spark.util.Utils
/**
* The entry point for executing Spark SQL queries from a Java program.
*/
class JavaSQLContext(sparkContext: JavaSparkContext) {
class JavaSQLContext(val sqlContext: SQLContext) {

val sqlContext = new SQLContext(sparkContext.sc)
def this(sparkContext: JavaSparkContext) = this(new SQLContext(sparkContext.sc))

/**
* Executes a query expressed in SQL, returning the result as a JavaSchemaRDD
Expand Down