-
Notifications
You must be signed in to change notification settings - Fork 444
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GLUTEN-6705][CH] Basic Support Delta write (#6767)
* Basic Support Native Delta Write * Fix Build for spark 3.2 and 3.3 * Clean up * Fix UT failed. * Fix build error and warning in scala 2.13
- Loading branch information
1 parent
920cfaf
commit 2dd5632
Showing
14 changed files
with
675 additions
and
129 deletions.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
...ds-clickhouse/src/main/delta-20/org/apache/spark/sql/execution/CHDeltaColumnarWrite.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,30 @@ | ||
| /* | ||
| * 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.execution | ||
|
|
||
| import org.apache.gluten.exception.GlutenNotSupportException | ||
|
|
||
| import org.apache.spark.internal.io.FileCommitProtocol | ||
| import org.apache.spark.sql.execution.datasources.WriteJobDescription | ||
|
|
||
| object CHDeltaColumnarWrite { | ||
| def apply( | ||
| jobTrackerID: String, | ||
| description: WriteJobDescription, | ||
| committer: FileCommitProtocol): CHColumnarWrite[FileCommitProtocol] = | ||
| throw new GlutenNotSupportException("Delta Native is not supported in Spark 3.2") | ||
| } |
30 changes: 30 additions & 0 deletions
30
...ds-clickhouse/src/main/delta-23/org/apache/spark/sql/execution/CHDeltaColumnarWrite.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,30 @@ | ||
| /* | ||
| * 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.execution | ||
|
|
||
| import org.apache.gluten.exception.GlutenNotSupportException | ||
|
|
||
| import org.apache.spark.internal.io.FileCommitProtocol | ||
| import org.apache.spark.sql.execution.datasources.WriteJobDescription | ||
|
|
||
| object CHDeltaColumnarWrite { | ||
| def apply( | ||
| jobTrackerID: String, | ||
| description: WriteJobDescription, | ||
| committer: FileCommitProtocol): CHColumnarWrite[FileCommitProtocol] = | ||
| throw new GlutenNotSupportException("Delta Native is not supported in Spark 3.3") | ||
| } |
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
144 changes: 144 additions & 0 deletions
144
...ds-clickhouse/src/main/delta-32/org/apache/spark/sql/execution/CHDeltaColumnarWrite.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,144 @@ | ||
| /* | ||
| * 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.execution | ||
|
|
||
| import org.apache.gluten.backendsapi.BackendsApiManager | ||
| import org.apache.gluten.exception.GlutenNotSupportException | ||
|
|
||
| import org.apache.spark.internal.Logging | ||
| import org.apache.spark.internal.io.FileCommitProtocol | ||
| import org.apache.spark.sql.delta.files.DelayedCommitProtocol | ||
| import org.apache.spark.sql.execution.datasources.{ExecutedWriteSummary, WriteJobDescription, WriteTaskResult} | ||
| import org.apache.spark.sql.vectorized.ColumnarBatch | ||
| import org.apache.spark.util.Utils | ||
|
|
||
| import org.apache.hadoop.mapreduce.TaskAttemptContext | ||
|
|
||
| import scala.collection.mutable | ||
| import scala.collection.mutable.ArrayBuffer | ||
|
|
||
| /** A Wrapper of [[DelayedCommitProtocol]] for accessing protected methods and fields. */ | ||
| class CHDelayedCommitProtocol( | ||
| jobId: String, | ||
| val outputPath: String, | ||
| randomPrefixLength: Option[Int], | ||
| subdir: Option[String]) | ||
| extends DelayedCommitProtocol(jobId, outputPath, randomPrefixLength, subdir) { | ||
|
|
||
| override def getFileName( | ||
| taskContext: TaskAttemptContext, | ||
| ext: String, | ||
| partitionValues: Map[String, String]): String = { | ||
| super.getFileName(taskContext, ext, partitionValues) | ||
| } | ||
|
|
||
| def updateAddedFiles(files: Seq[(Map[String, String], String)]): Unit = { | ||
| assert(addedFiles.isEmpty) | ||
| addedFiles ++= files | ||
| } | ||
|
|
||
| override def parsePartitions(dir: String): Map[String, String] = | ||
| super.parsePartitions(dir) | ||
| } | ||
|
|
||
| case class CHDelayedCommitProtocolWrite( | ||
| override val jobTrackerID: String, | ||
| override val description: WriteJobDescription, | ||
| override val committer: CHDelayedCommitProtocol) | ||
| extends CHColumnarWrite[CHDelayedCommitProtocol] | ||
| with Logging { | ||
|
|
||
| override def doSetupNativeTask(): Unit = { | ||
| assert(description.path == committer.outputPath) | ||
| val nameSpec = CreateFileNameSpec(taskAttemptContext, description) | ||
| val writePath = description.path | ||
| val writeFileName = committer.getFileName(taskAttemptContext, nameSpec.suffix, Map.empty) | ||
| logDebug(s"Native staging write path: $writePath and file name: $writeFileName") | ||
| BackendsApiManager.getIteratorApiInstance.injectWriteFilesTempPath(writePath, writeFileName) | ||
| } | ||
|
|
||
| private def doCollectNativeResult( | ||
| cb: ColumnarBatch): Option[(Seq[(Map[String, String], String)], ExecutedWriteSummary)] = { | ||
| val numFiles = cb.numRows() | ||
| // Write an empty iterator | ||
| if (numFiles == 0) { | ||
| None | ||
| } else { | ||
| val file_col = cb.column(0) | ||
| val partition_col = cb.column(1) | ||
| val count_col = cb.column(2) | ||
|
|
||
| val partitions: mutable.Set[String] = mutable.Set[String]() | ||
| val addedFiles: ArrayBuffer[(Map[String, String], String)] = | ||
| new ArrayBuffer[(Map[String, String], String)] | ||
|
|
||
| var numWrittenRows: Long = 0 | ||
| Range(0, cb.numRows()).foreach { | ||
| i => | ||
| val fileName = file_col.getUTF8String(i).toString | ||
| val partition = partition_col.getUTF8String(i).toString | ||
| if (partition == "__NO_PARTITION_ID__") { | ||
| addedFiles.append((Map.empty[String, String], fileName)) | ||
| } else { | ||
| val partitionValues = committer.parsePartitions(partition) | ||
| addedFiles.append((partitionValues, s"$partition/$fileName")) | ||
| } | ||
| numWrittenRows += count_col.getLong(i) | ||
| } | ||
| val updatedPartitions = partitions.toSet | ||
| Some( | ||
| ( | ||
| addedFiles.toSeq, | ||
| ExecutedWriteSummary( | ||
| updatedPartitions = updatedPartitions, | ||
| stats = Seq(CreateBasicWriteTaskStats(numFiles, updatedPartitions, numWrittenRows))))) | ||
| } | ||
| } | ||
|
|
||
| override def commitTask(batch: ColumnarBatch): Option[WriteTaskResult] = { | ||
| doCollectNativeResult(batch).map { | ||
| case (addedFiles, summary) => | ||
| require(addedFiles.nonEmpty, "No files to commit") | ||
|
|
||
| committer.updateAddedFiles(addedFiles) | ||
|
|
||
| val (taskCommitMessage, taskCommitTime) = Utils.timeTakenMs { | ||
| committer.commitTask(taskAttemptContext) | ||
| } | ||
|
|
||
| // Just for update task commit time | ||
| description.statsTrackers.foreach { | ||
| stats => stats.newTaskInstance().getFinalStats(taskCommitTime) | ||
| } | ||
| WriteTaskResult(taskCommitMessage, summary) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| object CHDeltaColumnarWrite { | ||
| def apply( | ||
| jobTrackerID: String, | ||
| description: WriteJobDescription, | ||
| committer: FileCommitProtocol): CHColumnarWrite[FileCommitProtocol] = committer match { | ||
| case c: CHDelayedCommitProtocol => | ||
| CHDelayedCommitProtocolWrite(jobTrackerID, description, c) | ||
| .asInstanceOf[CHColumnarWrite[FileCommitProtocol]] | ||
| case _ => | ||
| throw new GlutenNotSupportException( | ||
| s"Unsupported committer type: ${committer.getClass.getSimpleName}") | ||
| } | ||
| } |
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.