-
Notifications
You must be signed in to change notification settings - Fork 593
[WIP][GLUTEN-10215][VL] Delta 4 native write support for Spark 4.0 #11924
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * 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.gluten.component | ||
|
|
||
| import org.apache.gluten.config.GlutenConfig | ||
| import org.apache.gluten.extension.columnar.heuristic.HeuristicTransform | ||
| import org.apache.gluten.extension.columnar.validator.Validators | ||
| import org.apache.gluten.extension.injector.Injector | ||
|
|
||
| import org.apache.spark.sql.execution.datasources.v2.OffloadDeltaCommand | ||
|
|
||
| class VeloxDelta40WriteComponent extends Component { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A component file is needed to activate the component: https://github.com/apache/gluten/blob/main/backends-velox/src-delta33/main/resources/META-INF/gluten-components/org.apache.gluten.component.VeloxDelta33WriteComponent |
||
| override def name(): String = "velox-delta40-write" | ||
|
|
||
| override def dependencies(): Seq[Class[_ <: Component]] = classOf[VeloxDeltaComponent] :: Nil | ||
|
|
||
| override def injectRules(injector: Injector): Unit = { | ||
| val legacy = injector.gluten.legacy | ||
| legacy.injectTransform { | ||
| c => | ||
| val offload = Seq( | ||
| OffloadDeltaCommand() | ||
| ).map(_.toStrcitRule()) | ||
| HeuristicTransform.Simple( | ||
| Validators.newValidator(new GlutenConfig(c.sqlConf), offload), | ||
| offload) | ||
| } | ||
| } | ||
| } | ||
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| /* | ||
| * 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.delta | ||
|
|
||
| import org.apache.gluten.backendsapi.velox.VeloxBatchType | ||
| import org.apache.gluten.extension.columnar.transition.Transitions | ||
|
|
||
| import org.apache.spark.sql.{AnalysisException, Dataset} | ||
| import org.apache.spark.sql.delta.actions.{AddFile, FileAction} | ||
| import org.apache.spark.sql.delta.constraints.{Constraint, Constraints, DeltaInvariantCheckerExec} | ||
| import org.apache.spark.sql.delta.files.{GlutenDeltaFileFormatWriter, TransactionalWrite} | ||
| import org.apache.spark.sql.delta.hooks.AutoCompact | ||
| import org.apache.spark.sql.delta.perf.{DeltaOptimizedWriterExec, GlutenDeltaOptimizedWriterExec} | ||
| import org.apache.spark.sql.delta.schema.InnerInvariantViolationException | ||
| import org.apache.spark.sql.delta.sources.DeltaSQLConf | ||
| import org.apache.spark.sql.execution.{SparkPlan, SQLExecution} | ||
| import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec | ||
| import org.apache.spark.sql.execution.datasources.{BasicWriteJobStatsTracker, FileFormatWriter, WriteJobStatsTracker} | ||
| import org.apache.spark.sql.internal.SQLConf | ||
| import org.apache.spark.sql.util.ScalaExtensions.OptionExt | ||
| import org.apache.spark.util.SerializableConfiguration | ||
|
|
||
| import scala.collection.mutable.ListBuffer | ||
|
|
||
| class GlutenOptimisticTransaction(delegate: OptimisticTransaction) | ||
| extends OptimisticTransaction( | ||
| delegate.deltaLog, | ||
| delegate.catalogTable, | ||
| delegate.snapshot | ||
| ) { | ||
|
|
||
| override def writeFiles( | ||
| inputData: Dataset[_], | ||
| writeOptions: Option[DeltaOptions], | ||
| isOptimize: Boolean, | ||
| additionalConstraints: Seq[Constraint]): Seq[FileAction] = { | ||
| hasWritten = true | ||
|
|
||
| val spark = inputData.sparkSession | ||
|
|
||
| val (data, partitionSchema) = performCDCPartition(inputData) | ||
| val outputPath = deltaLog.dataPath | ||
|
|
||
| val (queryExecution, output, generatedColumnConstraints, trackFromData) = | ||
| normalizeData(deltaLog, writeOptions, data) | ||
| // Use the track set from the transaction if set, | ||
| // otherwise use the track set from `normalizeData()`. | ||
| val trackIdentityHighWaterMarks = trackHighWaterMarks.getOrElse(trackFromData) | ||
|
|
||
| val partitioningColumns = getPartitioningColumns(partitionSchema, output) | ||
|
|
||
| val committer = getCommitter(outputPath) | ||
|
|
||
| val (statsDataSchema, _) = getStatsSchema(output, partitionSchema) | ||
|
|
||
| // If Statistics Collection is enabled, then create a stats tracker that will be injected during | ||
| // the FileFormatWriter.write call below and will collect per-file stats using | ||
| // StatisticsCollection | ||
| val optionalStatsTracker = | ||
| getOptionalStatsTrackerAndStatsCollection(output, outputPath, partitionSchema, data)._1 | ||
|
|
||
| val constraints = | ||
| Constraints.getAll(metadata, spark) ++ generatedColumnConstraints ++ additionalConstraints | ||
|
|
||
| val identityTrackerOpt = IdentityColumn | ||
| .createIdentityColumnStatsTracker( | ||
| spark, | ||
| deltaLog.newDeltaHadoopConf(), | ||
| outputPath, | ||
| metadata.schema, | ||
| statsDataSchema, | ||
| trackIdentityHighWaterMarks | ||
| ) | ||
|
|
||
| SQLExecution.withNewExecutionId(queryExecution, Option("deltaTransactionalWrite")) { | ||
| val outputSpec = FileFormatWriter.OutputSpec(outputPath.toString, Map.empty, output) | ||
|
|
||
| val empty2NullPlan = | ||
| convertEmptyToNullIfNeeded(queryExecution.executedPlan, partitioningColumns, constraints) | ||
| val maybeCheckInvariants = if (constraints.isEmpty) { | ||
| // Compared to vanilla Delta, we simply avoid adding the invariant checker | ||
| // when the constraint list is empty, to prevent the unnecessary transitions | ||
| // from being added around the invariant checker. | ||
| empty2NullPlan | ||
| } else { | ||
| DeltaInvariantCheckerExec(spark, empty2NullPlan, constraints) | ||
| } | ||
| def toVeloxPlan(plan: SparkPlan): SparkPlan = plan match { | ||
| case aqe: AdaptiveSparkPlanExec => | ||
| assert(!aqe.isFinalPlan) | ||
| aqe.copy(supportsColumnar = true) | ||
| case _ => Transitions.toBatchPlan(maybeCheckInvariants, VeloxBatchType) | ||
| } | ||
| // No need to plan optimized write if the write command is OPTIMIZE, which aims to produce | ||
| // evenly-balanced data files already. | ||
| val physicalPlan = | ||
| if ( | ||
| !isOptimize && | ||
| shouldOptimizeWrite(writeOptions, spark.sessionState.conf) | ||
| ) { | ||
| // We uniformly convert the query plan to a columnar plan. If | ||
| // the further write operation turns out to be non-offload-able, the | ||
| // columnar plan will be converted back to a row-based plan. | ||
| val veloxPlan = toVeloxPlan(maybeCheckInvariants) | ||
| try { | ||
| val glutenWriterExec = | ||
| GlutenDeltaOptimizedWriterExec(veloxPlan, metadata.partitionColumns, deltaLog) | ||
| val validationResult = glutenWriterExec.doValidate() | ||
| if (validationResult.ok()) { | ||
| glutenWriterExec | ||
| } else { | ||
| logInfo( | ||
| s"GlutenDeltaOptimizedWriterExec: Internal shuffle validated negative," + | ||
| s" reason: ${validationResult.reason()}. Falling back to row-based shuffle.") | ||
| DeltaOptimizedWriterExec(maybeCheckInvariants, metadata.partitionColumns, deltaLog) | ||
| } | ||
| } catch { | ||
| case e: AnalysisException => | ||
| logWarning( | ||
| s"GlutenDeltaOptimizedWriterExec: Failed to create internal shuffle," + | ||
| s" reason: ${e.getMessage()}. Falling back to row-based shuffle.") | ||
| DeltaOptimizedWriterExec(maybeCheckInvariants, metadata.partitionColumns, deltaLog) | ||
| } | ||
| } else { | ||
| val veloxPlan = toVeloxPlan(maybeCheckInvariants) | ||
| veloxPlan | ||
| } | ||
|
|
||
| val statsTrackers: ListBuffer[WriteJobStatsTracker] = ListBuffer() | ||
|
|
||
| if (spark.conf.get(DeltaSQLConf.DELTA_HISTORY_METRICS_ENABLED)) { | ||
| val basicWriteJobStatsTracker = new BasicWriteJobStatsTracker( | ||
| new SerializableConfiguration(deltaLog.newDeltaHadoopConf()), | ||
| BasicWriteJobStatsTracker.metrics) | ||
| registerSQLMetrics(spark, basicWriteJobStatsTracker.driverSideMetrics) | ||
| statsTrackers.append(basicWriteJobStatsTracker) | ||
| } | ||
|
|
||
| // Iceberg spec requires partition columns in data files | ||
| val writePartitionColumns = IcebergCompat.isAnyEnabled(metadata) | ||
| // Retain only a minimal selection of Spark writer options to avoid any potential | ||
| // compatibility issues | ||
| val options = (writeOptions match { | ||
| case None => Map.empty[String, String] | ||
| case Some(writeOptions) => | ||
| writeOptions.options.filterKeys { | ||
| key => | ||
| key.equalsIgnoreCase(DeltaOptions.MAX_RECORDS_PER_FILE) || | ||
| key.equalsIgnoreCase(DeltaOptions.COMPRESSION) | ||
| }.toMap | ||
| }) + (DeltaOptions.WRITE_PARTITION_COLUMNS -> writePartitionColumns.toString) | ||
|
|
||
| try { | ||
| GlutenDeltaFileFormatWriter.write( | ||
| sparkSession = spark, | ||
| plan = physicalPlan, | ||
| fileFormat = new GlutenDeltaParquetFileFormat( | ||
| protocol, | ||
| metadata | ||
| ), // This is changed to Gluten's Delta format. | ||
| committer = committer, | ||
| outputSpec = outputSpec, | ||
| // scalastyle:off deltahadoopconfiguration | ||
| hadoopConf = | ||
| spark.sessionState.newHadoopConfWithOptions(metadata.configuration ++ deltaLog.options), | ||
| // scalastyle:on deltahadoopconfiguration | ||
| partitionColumns = partitioningColumns, | ||
| bucketSpec = None, | ||
| statsTrackers = optionalStatsTracker.toSeq | ||
| ++ statsTrackers | ||
| ++ identityTrackerOpt.toSeq, | ||
| options = options | ||
| ) | ||
| } catch { | ||
| case InnerInvariantViolationException(violationException) => | ||
| // Pull an InvariantViolationException up to the top level if it was the root cause. | ||
| throw violationException | ||
| } | ||
| statsTrackers.foreach { | ||
| case tracker: BasicWriteJobStatsTracker => | ||
| val numOutputRowsOpt = tracker.driverSideMetrics.get("numOutputRows").map(_.value) | ||
| IdentityColumn.logTableWrite(snapshot, trackIdentityHighWaterMarks, numOutputRowsOpt) | ||
| case _ => () | ||
| } | ||
| } | ||
|
|
||
| var resultFiles = | ||
| (if (optionalStatsTracker.isDefined) { | ||
| committer.addedStatuses.map { | ||
| a => | ||
| a.copy(stats = optionalStatsTracker | ||
| .map(_.recordedStats(a.toPath.getName)) | ||
| .getOrElse(a.stats)) | ||
| } | ||
| } else { | ||
| committer.addedStatuses | ||
| }) | ||
| .filter { | ||
| // In some cases, we can write out an empty `inputData`. Some examples of this (though, they | ||
| // may be fixed in the future) are the MERGE command when you delete with empty source, or | ||
| // empty target, or on disjoint tables. This is hard to catch before the write without | ||
| // collecting the DF ahead of time. Instead, we can return only the AddFiles that | ||
| // a) actually add rows, or | ||
| // b) don't have any stats so we don't know the number of rows at all | ||
| case a: AddFile => a.numLogicalRecords.forall(_ > 0) | ||
| case _ => true | ||
| } | ||
|
|
||
| // add [[AddFile.Tags.ICEBERG_COMPAT_VERSION.name]] tags to addFiles | ||
| if (IcebergCompatV2.isEnabled(metadata)) { | ||
| resultFiles = resultFiles.map { | ||
| addFile => | ||
| val tags = if (addFile.tags != null) addFile.tags else Map.empty[String, String] | ||
| addFile.copy(tags = tags + (AddFile.Tags.ICEBERG_COMPAT_VERSION.name -> "2")) | ||
| } | ||
| } | ||
|
|
||
| if (resultFiles.nonEmpty && !isOptimize) registerPostCommitHook(AutoCompact) | ||
| // Record the updated high water marks to be used during transaction commit. | ||
| identityTrackerOpt.ifDefined { | ||
| tracker => updatedIdentityHighWaterMarks.appendAll(tracker.highWaterMarks.toSeq) | ||
| } | ||
|
|
||
| resultFiles.toSeq ++ committer.changeFiles | ||
| } | ||
|
|
||
| private def shouldOptimizeWrite( | ||
| writeOptions: Option[DeltaOptions], | ||
| sessionConf: SQLConf): Boolean = { | ||
| writeOptions | ||
| .flatMap(_.optimizeWrite) | ||
| .getOrElse(TransactionalWrite.shouldOptimizeWrite(metadata, sessionConf)) | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * 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.delta | ||
|
|
||
| import org.apache.gluten.execution.datasource.GlutenFormatFactory | ||
|
|
||
| import org.apache.spark.internal.Logging | ||
| import org.apache.spark.sql.SparkSession | ||
| import org.apache.spark.sql.execution.datasources.{OutputWriter, OutputWriterFactory} | ||
| import org.apache.spark.sql.execution.datasources.parquet.{ParquetFileFormat, ParquetOptions} | ||
| import org.apache.spark.sql.sources.DataSourceRegister | ||
| import org.apache.spark.sql.types.StructType | ||
|
|
||
| import org.apache.hadoop.fs.FileStatus | ||
| import org.apache.hadoop.mapreduce.{Job, TaskAttemptContext} | ||
| import org.apache.parquet.hadoop.ParquetOutputFormat | ||
| import org.apache.parquet.hadoop.codec.CodecConfig | ||
| import org.apache.parquet.hadoop.util.ContextUtil | ||
| class GlutenParquetFileFormat | ||
| extends ParquetFileFormat | ||
| with DataSourceRegister | ||
| with Logging | ||
| with Serializable { | ||
|
|
||
| override def shortName(): String = "gluten-parquet" | ||
|
|
||
| override def toString: String = "GlutenParquet" | ||
|
|
||
| override def hashCode(): Int = getClass.hashCode() | ||
|
|
||
| override def equals(other: Any): Boolean = other.isInstanceOf[GlutenParquetFileFormat] | ||
|
|
||
| override def inferSchema( | ||
| sparkSession: SparkSession, | ||
| options: Map[String, String], | ||
| files: Seq[FileStatus]): Option[StructType] = { | ||
| super.inferSchema(sparkSession, options, files) | ||
| } | ||
|
|
||
| override def prepareWrite( | ||
| sparkSession: SparkSession, | ||
| job: Job, | ||
| options: Map[String, String], | ||
| dataSchema: StructType): OutputWriterFactory = { | ||
| // Pass compression to job conf so that the file extension can be aware of it. | ||
| val conf = ContextUtil.getConfiguration(job) | ||
| val parquetOptions = new ParquetOptions(options, sparkSession.sessionState.conf) | ||
| conf.set(ParquetOutputFormat.COMPRESSION, parquetOptions.compressionCodecClassName) | ||
| val nativeConf = | ||
| GlutenFormatFactory("parquet") | ||
| .nativeConf(options, parquetOptions.compressionCodecClassName) | ||
|
|
||
| new OutputWriterFactory { | ||
| override def getFileExtension(context: TaskAttemptContext): String = { | ||
| CodecConfig.from(context).getCodec.getExtension + ".parquet" | ||
| } | ||
|
|
||
| override def newInstance( | ||
| path: String, | ||
| dataSchema: StructType, | ||
| context: TaskAttemptContext): OutputWriter = { | ||
| GlutenFormatFactory("parquet") | ||
| .createOutputWriter(path, dataSchema, context, nativeConf) | ||
|
|
||
| } | ||
| } | ||
| } | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A out-of-topic question: Do you think we can possibly support e.g.,
src-spark4/src-delta4folder-activation in Gluten's Maven settings? So we might not have to port these code again for Spark 4.1 if lucky.Something like:
Current code is a bit inflexible, it was introduced in #9996.