diff options
| author | Michael Armbrust <michael@databricks.com> | 2014-05-13 21:23:51 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-05-13 21:23:51 -0700 |
| commit | 44233865cf8020741d862d33cc660c88e9315dea (patch) | |
| tree | 09f5181583b21ebda534bfa0b50c2efbcea8505d /sql/core | |
| parent | 753b04dea4b04ba9d0dd0011f00e9d70367e76fc (diff) | |
| download | spark-44233865cf8020741d862d33cc660c88e9315dea.tar.gz spark-44233865cf8020741d862d33cc660c88e9315dea.tar.bz2 spark-44233865cf8020741d862d33cc660c88e9315dea.zip | |
[SQL] Make it possible to create Java/Python SQLContexts from an existing Scala SQLContext.
Author: Michael Armbrust <michael@databricks.com>
Closes #761 from marmbrus/existingContext and squashes the following commits:
4651051 [Michael Armbrust] Make it possible to create Java/Python SQLContexts from an existing Scala SQLContext.
Diffstat (limited to 'sql/core')
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala index 57facbe10f..6f7d431b9a 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala @@ -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 |