-
Notifications
You must be signed in to change notification settings - Fork 28.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-49436][CONNECT][SQL] Common interface for SQLContext
### What changes were proposed in this pull request? This PR adds an abstraction for `SQLContext` in the `spark-api` package. Both sides (Classic and Connect) maintain their own implementation. ### Why are the changes needed? To unify the API interface and make `SQLContext` available to Spark Connect. ### Does this PR introduce _any_ user-facing change? Yes. Connect users are now able to call `sparkSession.sqlContext` and the APIs it provides. ### How was this patch tested? Not needed. All new methods are mirrored from SparkSession except `tables()`, which is covered by existing tests in `ListTablesSuite`. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #48958 from xupefei/api-sqlcontext. Authored-by: Paddy Xu <[email protected]> Signed-off-by: Hyukjin Kwon <[email protected]>
- Loading branch information
1 parent
2cb66e6
commit 7f6d554
Showing
11 changed files
with
1,592 additions
and
877 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
336 changes: 336 additions & 0 deletions
336
connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/SQLContext.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,336 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.spark.sql | ||
|
||
import java.util.{List => JList, Map => JMap, Properties} | ||
|
||
import scala.jdk.CollectionConverters.PropertiesHasAsScala | ||
import scala.reflect.runtime.universe.TypeTag | ||
|
||
import org.apache.spark.SparkContext | ||
import org.apache.spark.annotation.Stable | ||
import org.apache.spark.api.java.JavaRDD | ||
import org.apache.spark.rdd.RDD | ||
import org.apache.spark.sql.connect.ConnectClientUnsupportedErrors | ||
import org.apache.spark.sql.connect.ConnectConversions._ | ||
import org.apache.spark.sql.sources.BaseRelation | ||
import org.apache.spark.sql.streaming.{DataStreamReader, StreamingQueryManager} | ||
import org.apache.spark.sql.types.StructType | ||
import org.apache.spark.sql.util.ExecutionListenerManager | ||
|
||
@Stable | ||
class SQLContext private[sql] (override val sparkSession: SparkSession) | ||
extends api.SQLContext(sparkSession) { | ||
|
||
/** @inheritdoc */ | ||
def newSession(): SQLContext = sparkSession.newSession().sqlContext | ||
|
||
/** @inheritdoc */ | ||
def listenerManager: ExecutionListenerManager = sparkSession.listenerManager | ||
|
||
/** @inheritdoc */ | ||
def setConf(props: Properties): Unit = sparkSession.conf.synchronized { | ||
props.asScala.foreach { case (k, v) => sparkSession.conf.set(k, v) } | ||
} | ||
|
||
/** @inheritdoc */ | ||
def experimental: ExperimentalMethods = sparkSession.experimental | ||
|
||
/** @inheritdoc */ | ||
def udf: UDFRegistration = sparkSession.udf | ||
|
||
// scalastyle:off | ||
// Disable style checker so "implicits" object can start with lowercase i | ||
|
||
/** @inheritdoc */ | ||
object implicits extends SQLImplicits { | ||
|
||
/** @inheritdoc */ | ||
override protected def session: SparkSession = sparkSession | ||
} | ||
|
||
// scalastyle:on | ||
|
||
/** @inheritdoc */ | ||
def read: DataFrameReader = sparkSession.read | ||
|
||
/** @inheritdoc */ | ||
def readStream: DataStreamReader = sparkSession.readStream | ||
|
||
/** | ||
* Returns a `StreamingQueryManager` that allows managing all the | ||
* [[org.apache.spark.sql.streaming.StreamingQuery StreamingQueries]] active on `this` context. | ||
* | ||
* @since 4.0.0 | ||
*/ | ||
def streams: StreamingQueryManager = sparkSession.streams | ||
|
||
/** @inheritdoc */ | ||
override def sparkContext: SparkContext = { | ||
throw ConnectClientUnsupportedErrors.sparkContext() | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def emptyDataFrame: Dataset[Row] = super.emptyDataFrame | ||
|
||
/** @inheritdoc */ | ||
override def createDataFrame[A <: Product: TypeTag](rdd: RDD[A]): Dataset[Row] = | ||
super.createDataFrame(rdd) | ||
|
||
/** @inheritdoc */ | ||
override def createDataFrame[A <: Product: TypeTag](data: Seq[A]): Dataset[Row] = | ||
super.createDataFrame(data) | ||
|
||
/** @inheritdoc */ | ||
override def baseRelationToDataFrame(baseRelation: BaseRelation): Dataset[Row] = | ||
super.baseRelationToDataFrame(baseRelation) | ||
|
||
/** @inheritdoc */ | ||
override def createDataFrame(rowRDD: RDD[Row], schema: StructType): Dataset[Row] = | ||
super.createDataFrame(rowRDD, schema) | ||
|
||
/** @inheritdoc */ | ||
override def createDataset[T: Encoder](data: Seq[T]): Dataset[T] = super.createDataset(data) | ||
|
||
/** @inheritdoc */ | ||
override def createDataset[T: Encoder](data: RDD[T]): Dataset[T] = super.createDataset(data) | ||
|
||
/** @inheritdoc */ | ||
override def createDataset[T: Encoder](data: JList[T]): Dataset[T] = | ||
super.createDataset(data) | ||
|
||
/** @inheritdoc */ | ||
override def createDataFrame(rowRDD: JavaRDD[Row], schema: StructType): Dataset[Row] = | ||
super.createDataFrame(rowRDD, schema) | ||
|
||
/** @inheritdoc */ | ||
override def createDataFrame(rows: JList[Row], schema: StructType): Dataset[Row] = | ||
super.createDataFrame(rows, schema) | ||
|
||
/** @inheritdoc */ | ||
override def createDataFrame(rdd: RDD[_], beanClass: Class[_]): Dataset[Row] = | ||
super.createDataFrame(rdd, beanClass) | ||
|
||
/** @inheritdoc */ | ||
override def createDataFrame(rdd: JavaRDD[_], beanClass: Class[_]): Dataset[Row] = | ||
super.createDataFrame(rdd, beanClass) | ||
|
||
/** @inheritdoc */ | ||
override def createDataFrame(data: JList[_], beanClass: Class[_]): Dataset[Row] = | ||
super.createDataFrame(data, beanClass) | ||
|
||
/** @inheritdoc */ | ||
override def createExternalTable(tableName: String, path: String): Dataset[Row] = | ||
super.createExternalTable(tableName, path) | ||
|
||
/** @inheritdoc */ | ||
override def createExternalTable( | ||
tableName: String, | ||
path: String, | ||
source: String): Dataset[Row] = { | ||
super.createExternalTable(tableName, path, source) | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def createExternalTable( | ||
tableName: String, | ||
source: String, | ||
options: JMap[String, String]): Dataset[Row] = { | ||
super.createExternalTable(tableName, source, options) | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def createExternalTable( | ||
tableName: String, | ||
source: String, | ||
options: Map[String, String]): Dataset[Row] = { | ||
super.createExternalTable(tableName, source, options) | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def createExternalTable( | ||
tableName: String, | ||
source: String, | ||
schema: StructType, | ||
options: JMap[String, String]): Dataset[Row] = { | ||
super.createExternalTable(tableName, source, schema, options) | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def createExternalTable( | ||
tableName: String, | ||
source: String, | ||
schema: StructType, | ||
options: Map[String, String]): Dataset[Row] = { | ||
super.createExternalTable(tableName, source, schema, options) | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def range(end: Long): Dataset[Row] = super.range(end) | ||
|
||
/** @inheritdoc */ | ||
override def range(start: Long, end: Long): Dataset[Row] = super.range(start, end) | ||
|
||
/** @inheritdoc */ | ||
override def range(start: Long, end: Long, step: Long): Dataset[Row] = | ||
super.range(start, end, step) | ||
|
||
/** @inheritdoc */ | ||
override def range(start: Long, end: Long, step: Long, numPartitions: Int): Dataset[Row] = | ||
super.range(start, end, step, numPartitions) | ||
|
||
/** @inheritdoc */ | ||
override def sql(sqlText: String): Dataset[Row] = super.sql(sqlText) | ||
|
||
/** @inheritdoc */ | ||
override def table(tableName: String): Dataset[Row] = super.table(tableName) | ||
|
||
/** @inheritdoc */ | ||
override def tables(): Dataset[Row] = super.tables() | ||
|
||
/** @inheritdoc */ | ||
override def tables(databaseName: String): Dataset[Row] = super.tables(databaseName) | ||
|
||
/** @inheritdoc */ | ||
override def applySchema(rowRDD: RDD[Row], schema: StructType): Dataset[Row] = | ||
super.applySchema(rowRDD, schema) | ||
|
||
/** @inheritdoc */ | ||
override def applySchema(rowRDD: JavaRDD[Row], schema: StructType): Dataset[Row] = | ||
super.applySchema(rowRDD, schema) | ||
|
||
/** @inheritdoc */ | ||
override def applySchema(rdd: RDD[_], beanClass: Class[_]): Dataset[Row] = | ||
super.applySchema(rdd, beanClass) | ||
|
||
/** @inheritdoc */ | ||
override def applySchema(rdd: JavaRDD[_], beanClass: Class[_]): Dataset[Row] = | ||
super.applySchema(rdd, beanClass) | ||
|
||
/** @inheritdoc */ | ||
@scala.annotation.varargs | ||
override def parquetFile(paths: String*): Dataset[Row] = super.parquetFile(paths: _*) | ||
|
||
/** @inheritdoc */ | ||
override def jsonFile(path: String): Dataset[Row] = super.jsonFile(path) | ||
|
||
/** @inheritdoc */ | ||
override def jsonFile(path: String, schema: StructType): Dataset[Row] = | ||
super.jsonFile(path, schema) | ||
|
||
/** @inheritdoc */ | ||
override def jsonFile(path: String, samplingRatio: Double): Dataset[Row] = | ||
super.jsonFile(path, samplingRatio) | ||
|
||
/** @inheritdoc */ | ||
override def jsonRDD(json: RDD[String]): Dataset[Row] = super.jsonRDD(json) | ||
|
||
/** @inheritdoc */ | ||
override def jsonRDD(json: JavaRDD[String]): Dataset[Row] = super.jsonRDD(json) | ||
|
||
/** @inheritdoc */ | ||
override def jsonRDD(json: RDD[String], schema: StructType): Dataset[Row] = | ||
super.jsonRDD(json, schema) | ||
|
||
/** @inheritdoc */ | ||
override def jsonRDD(json: JavaRDD[String], schema: StructType): Dataset[Row] = | ||
super.jsonRDD(json, schema) | ||
|
||
/** @inheritdoc */ | ||
override def jsonRDD(json: RDD[String], samplingRatio: Double): Dataset[Row] = | ||
super.jsonRDD(json, samplingRatio) | ||
|
||
/** @inheritdoc */ | ||
override def jsonRDD(json: JavaRDD[String], samplingRatio: Double): Dataset[Row] = | ||
super.jsonRDD(json, samplingRatio) | ||
|
||
/** @inheritdoc */ | ||
override def load(path: String): Dataset[Row] = super.load(path) | ||
|
||
/** @inheritdoc */ | ||
override def load(path: String, source: String): Dataset[Row] = super.load(path, source) | ||
|
||
/** @inheritdoc */ | ||
override def load(source: String, options: JMap[String, String]): Dataset[Row] = | ||
super.load(source, options) | ||
|
||
/** @inheritdoc */ | ||
override def load(source: String, options: Map[String, String]): Dataset[Row] = | ||
super.load(source, options) | ||
|
||
/** @inheritdoc */ | ||
override def load( | ||
source: String, | ||
schema: StructType, | ||
options: JMap[String, String]): Dataset[Row] = { | ||
super.load(source, schema, options) | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def load( | ||
source: String, | ||
schema: StructType, | ||
options: Map[String, String]): Dataset[Row] = { | ||
super.load(source, schema, options) | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def jdbc(url: String, table: String): Dataset[Row] = super.jdbc(url, table) | ||
|
||
/** @inheritdoc */ | ||
override def jdbc( | ||
url: String, | ||
table: String, | ||
columnName: String, | ||
lowerBound: Long, | ||
upperBound: Long, | ||
numPartitions: Int): Dataset[Row] = { | ||
super.jdbc(url, table, columnName, lowerBound, upperBound, numPartitions) | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def jdbc(url: String, table: String, theParts: Array[String]): Dataset[Row] = { | ||
super.jdbc(url, table, theParts) | ||
} | ||
} | ||
object SQLContext extends api.SQLContextCompanion { | ||
|
||
override private[sql] type SQLContextImpl = SQLContext | ||
override private[sql] type SparkContextImpl = SparkContext | ||
|
||
/** | ||
* Get the singleton SQLContext if it exists or create a new one. | ||
* | ||
* This function can be used to create a singleton SQLContext object that can be shared across | ||
* the JVM. | ||
* | ||
* If there is an active SQLContext for current thread, it will be returned instead of the | ||
* global one. | ||
* | ||
* @param sparkContext | ||
* The SparkContext. This parameter is not used in Spark Connect. | ||
* | ||
* @since 4.0.0 | ||
*/ | ||
def getOrCreate(sparkContext: SparkContext): SQLContext = { | ||
SparkSession.builder().getOrCreate().sqlContext | ||
} | ||
|
||
/** @inheritdoc */ | ||
override def setActive(sqlContext: SQLContext): Unit = super.setActive(sqlContext) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.