-
Notifications
You must be signed in to change notification settings - Fork 2k
[Server-Side Planning] Add ServerSidePlanningClient interface and DSv2 table implementation #5621
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.
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
Merged
tdas
merged 3 commits into
delta-io:master
from
murali-db:upstream/row1-interface-and-table
Dec 9, 2025
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
205 changes: 205 additions & 0 deletions
205
...src/main/scala/org/apache/spark/sql/delta/serverSidePlanning/ServerSidePlannedTable.scala
This file contains hidden or 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,205 @@ | ||
| /* | ||
| * Copyright (2025) The Delta Lake Project Authors. | ||
| * | ||
| * Licensed 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.delta.serverSidePlanning | ||
|
|
||
| import java.util | ||
| import java.util.Locale | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import org.apache.spark.paths.SparkPath | ||
| import org.apache.spark.sql.SparkSession | ||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.delta.serverSidePlanning.ServerSidePlanningClient | ||
| import org.apache.spark.sql.connector.catalog.{SupportsRead, Table, TableCapability} | ||
| import org.apache.spark.sql.connector.read._ | ||
| import org.apache.spark.sql.execution.datasources.{FileFormat, PartitionedFile} | ||
| import org.apache.spark.sql.execution.datasources.parquet.ParquetFileFormat | ||
| import org.apache.spark.sql.types.StructType | ||
| import org.apache.spark.sql.util.CaseInsensitiveStringMap | ||
|
|
||
| /** | ||
| * A Spark Table implementation that uses server-side scan planning | ||
| * to get the list of files to read. Used as a fallback when Unity Catalog | ||
| * doesn't provide credentials. | ||
| * | ||
| * Similar to DeltaTableV2, we accept SparkSession as a constructor parameter | ||
| * since Tables are created on the driver and are not serialized to executors. | ||
| */ | ||
| class ServerSidePlannedTable( | ||
| spark: SparkSession, | ||
| databaseName: String, | ||
| tableName: String, | ||
| tableSchema: StructType, | ||
| planningClient: ServerSidePlanningClient) extends Table with SupportsRead { | ||
|
|
||
| // Returns fully qualified name (e.g., "catalog.database.table"). | ||
| // The databaseName parameter receives ident.namespace().mkString(".") from DeltaCatalog, | ||
| // which includes the catalog name when present, similar to DeltaTableV2's name() method. | ||
| override def name(): String = s"$databaseName.$tableName" | ||
|
|
||
| override def schema(): StructType = tableSchema | ||
|
|
||
| override def capabilities(): util.Set[TableCapability] = { | ||
| Set(TableCapability.BATCH_READ).asJava | ||
| } | ||
|
|
||
| override def newScanBuilder(options: CaseInsensitiveStringMap): ScanBuilder = { | ||
| new ServerSidePlannedScanBuilder(spark, databaseName, tableName, tableSchema, planningClient) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * ScanBuilder that uses ServerSidePlanningClient to plan the scan. | ||
| */ | ||
| class ServerSidePlannedScanBuilder( | ||
| spark: SparkSession, | ||
| databaseName: String, | ||
| tableName: String, | ||
| tableSchema: StructType, | ||
| planningClient: ServerSidePlanningClient) extends ScanBuilder { | ||
|
|
||
| override def build(): Scan = { | ||
| new ServerSidePlannedScan(spark, databaseName, tableName, tableSchema, planningClient) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Scan implementation that calls the server-side planning API to get file list. | ||
| */ | ||
| class ServerSidePlannedScan( | ||
| spark: SparkSession, | ||
| databaseName: String, | ||
| tableName: String, | ||
| tableSchema: StructType, | ||
| planningClient: ServerSidePlanningClient) extends Scan with Batch { | ||
|
|
||
| override def readSchema(): StructType = tableSchema | ||
|
|
||
| override def toBatch: Batch = this | ||
|
|
||
| override def planInputPartitions(): Array[InputPartition] = { | ||
| // Call the server-side planning API to get the scan plan | ||
| val scanPlan = planningClient.planScan(databaseName, tableName) | ||
|
|
||
| // Convert each file to an InputPartition | ||
| scanPlan.files.map { file => | ||
| ServerSidePlannedFileInputPartition(file.filePath, file.fileSizeInBytes, file.fileFormat) | ||
| }.toArray | ||
| } | ||
|
|
||
| override def createReaderFactory(): PartitionReaderFactory = { | ||
| new ServerSidePlannedFilePartitionReaderFactory(spark, tableSchema) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * InputPartition representing a single file from the server-side scan plan. | ||
| */ | ||
| case class ServerSidePlannedFileInputPartition( | ||
| filePath: String, | ||
| fileSizeInBytes: Long, | ||
| fileFormat: String) extends InputPartition | ||
|
|
||
| /** | ||
| * Factory for creating PartitionReaders that read server-side planned files. | ||
| * Builds reader functions on the driver for Parquet files. | ||
| */ | ||
| class ServerSidePlannedFilePartitionReaderFactory( | ||
| spark: SparkSession, | ||
| tableSchema: StructType) | ||
| extends PartitionReaderFactory { | ||
|
|
||
| import org.apache.spark.util.SerializableConfiguration | ||
|
|
||
| // scalastyle:off deltahadoopconfiguration | ||
| // We use sessionState.newHadoopConf() here instead of deltaLog.newDeltaHadoopConf(). | ||
| // This means DataFrame options (like custom S3 credentials) passed by users will NOT be | ||
| // included in the Hadoop configuration. This is intentional: | ||
| // - Server-side planning uses server-provided credentials, not user-specified credentials | ||
| // - ServerSidePlannedTable is NOT a Delta table, so we don't want Delta-specific options | ||
| // from deltaLog.newDeltaHadoopConf() | ||
| // - General Spark options from spark.hadoop.* are included and work for all tables | ||
| private val hadoopConf = new SerializableConfiguration(spark.sessionState.newHadoopConf()) | ||
| // scalastyle:on deltahadoopconfiguration | ||
|
|
||
| // Pre-build reader function for Parquet on the driver | ||
| // This function will be serialized and sent to executors | ||
| private val parquetReaderBuilder = new ParquetFileFormat().buildReaderWithPartitionValues( | ||
| sparkSession = spark, | ||
| dataSchema = tableSchema, | ||
| partitionSchema = StructType(Nil), | ||
| requiredSchema = tableSchema, | ||
| filters = Seq.empty, | ||
| options = Map( | ||
| FileFormat.OPTION_RETURNING_BATCH -> "false" | ||
| ), | ||
| hadoopConf = hadoopConf.value | ||
| ) | ||
|
|
||
| override def createReader(partition: InputPartition): PartitionReader[InternalRow] = { | ||
| val filePartition = partition.asInstanceOf[ServerSidePlannedFileInputPartition] | ||
|
|
||
| // Verify file format is Parquet | ||
| // Scalastyle suppression needed: the caselocale regex incorrectly flags even correct usage | ||
| // of toLowerCase(Locale.ROOT). Similar to PartitionUtils.scala and SchemaUtils.scala. | ||
| // scalastyle:off caselocale | ||
| if (filePartition.fileFormat.toLowerCase(Locale.ROOT) != "parquet") { | ||
| // scalastyle:on caselocale | ||
| throw new UnsupportedOperationException( | ||
| s"File format '${filePartition.fileFormat}' is not supported. Only Parquet is supported.") | ||
| } | ||
|
|
||
| new ServerSidePlannedFilePartitionReader(filePartition, parquetReaderBuilder) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * PartitionReader that reads a single file using a pre-built reader function. | ||
| * The reader function was created on the driver and is executed on the executor. | ||
| */ | ||
| class ServerSidePlannedFilePartitionReader( | ||
| partition: ServerSidePlannedFileInputPartition, | ||
| readerBuilder: PartitionedFile => Iterator[InternalRow]) | ||
| extends PartitionReader[InternalRow] { | ||
|
|
||
| // Create PartitionedFile for this file | ||
| private val partitionedFile = PartitionedFile( | ||
| partitionValues = InternalRow.empty, | ||
| filePath = SparkPath.fromPathString(partition.filePath), | ||
| start = 0, | ||
| length = partition.fileSizeInBytes | ||
| ) | ||
|
|
||
| // Call the pre-built reader function with our PartitionedFile | ||
| // This happens on the executor and doesn't need SparkSession | ||
| private lazy val readerIterator: Iterator[InternalRow] = { | ||
| readerBuilder(partitionedFile) | ||
| } | ||
|
|
||
| override def next(): Boolean = { | ||
| readerIterator.hasNext | ||
| } | ||
|
|
||
| override def get(): InternalRow = { | ||
| readerIterator.next() | ||
| } | ||
|
|
||
| override def close(): Unit = { | ||
| // Reader cleanup is handled by Spark | ||
| } | ||
| } | ||
111 changes: 111 additions & 0 deletions
111
...c/main/scala/org/apache/spark/sql/delta/serverSidePlanning/ServerSidePlanningClient.scala
This file contains hidden or 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,111 @@ | ||
| /* | ||
| * Copyright (2025) The Delta Lake Project Authors. | ||
| * | ||
| * Licensed 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.delta.serverSidePlanning | ||
|
|
||
| import org.apache.spark.sql.SparkSession | ||
|
|
||
| /** | ||
| * Simple data class representing a file to scan. | ||
| * No dependencies on Iceberg types. | ||
| */ | ||
| case class ScanFile( | ||
| filePath: String, | ||
| fileSizeInBytes: Long, | ||
| fileFormat: String // "parquet", "orc", etc. | ||
| ) | ||
|
|
||
| /** | ||
| * Result of a table scan plan operation. | ||
| */ | ||
| case class ScanPlan( | ||
| files: Seq[ScanFile] | ||
| ) | ||
|
|
||
| /** | ||
| * Interface for planning table scans via server-side planning (e.g., Iceberg REST catalog). | ||
| * This interface is intentionally simple and has no dependencies | ||
| * on Iceberg libraries, allowing it to live in delta-spark module. | ||
| */ | ||
| trait ServerSidePlanningClient { | ||
| /** | ||
| * Plan a table scan and return the list of files to read. | ||
| * | ||
| * @param databaseName The database or schema name | ||
| * @param table The table name | ||
| * @return ScanPlan containing files to read | ||
| */ | ||
| def planScan(databaseName: String, table: String): ScanPlan | ||
| } | ||
|
|
||
| /** | ||
| * Factory for creating ServerSidePlanningClient instances. | ||
| * This allows for configurable implementations (REST, mock, Spark-based, etc.) | ||
| */ | ||
| private[serverSidePlanning] trait ServerSidePlanningClientFactory { | ||
| /** | ||
| * Create a client for a specific catalog by reading catalog-specific configuration. | ||
| * This method reads configuration from spark.sql.catalog.<catalogName>.uri and | ||
| * spark.sql.catalog.<catalogName>.token. | ||
| * | ||
| * @param spark The SparkSession | ||
| * @param catalogName The name of the catalog (e.g., "spark_catalog", "unity") | ||
| * @return A ServerSidePlanningClient configured for the specified catalog | ||
| */ | ||
| def buildForCatalog(spark: SparkSession, catalogName: String): ServerSidePlanningClient | ||
| } | ||
|
|
||
| /** | ||
| * Registry for client factories. Can be configured for testing or to provide | ||
| * production implementations (e.g., IcebergRESTCatalogPlanningClientFactory). | ||
| * | ||
| * By default, no factory is registered. Production code should register an appropriate | ||
| * factory implementation before attempting to create clients. | ||
| */ | ||
| private[serverSidePlanning] object ServerSidePlanningClientFactory { | ||
| @volatile private var registeredFactory: Option[ServerSidePlanningClientFactory] = None | ||
|
|
||
| /** | ||
| * Set a factory for production use or testing. | ||
| */ | ||
| private[serverSidePlanning] def setFactory(factory: ServerSidePlanningClientFactory): Unit = { | ||
| registeredFactory = Some(factory) | ||
| } | ||
|
|
||
| /** | ||
| * Clear the registered factory. | ||
| */ | ||
| private[serverSidePlanning] def clearFactory(): Unit = { | ||
| registeredFactory = None | ||
| } | ||
|
|
||
| /** | ||
| * Get a client for a specific catalog using the registered factory. | ||
| * This is the single public entry point for obtaining a ServerSidePlanningClient. | ||
| * | ||
| * @param spark The SparkSession | ||
| * @param catalogName The name of the catalog (e.g., "spark_catalog", "unity") | ||
| * @return A ServerSidePlanningClient configured for the specified catalog | ||
| * @throws IllegalStateException if no factory has been registered | ||
| */ | ||
| def getClient(spark: SparkSession, catalogName: String): ServerSidePlanningClient = { | ||
| registeredFactory.getOrElse { | ||
| throw new IllegalStateException( | ||
| "No ServerSidePlanningClientFactory has been registered. " + | ||
| "Call ServerSidePlanningClientFactory.setFactory() to register an implementation.") | ||
| }.buildForCatalog(spark, catalogName) | ||
| } | ||
murali-db marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.