You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/12/06 12:45:12 UTC
[GitHub] [spark] ulysses-you opened a new pull request, #38939: [WIP][SPARK-41407][SQL] Pull out v1 write to WriteFiles
ulysses-you opened a new pull request, #38939:
URL: https://github.com/apache/spark/pull/38939
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042862929
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala:
##########
@@ -223,6 +224,19 @@ abstract class SparkPlan extends QueryPlan[SparkPlan] with Logging with Serializ
doExecuteColumnar()
}
+ /**
+ * Returns the result of writes as an RDD[WriterCommitMessage] variable by delegating to
+ * `doExecuteWrite` after preparations.
+ *
+ * Concrete implementations of SparkPlan should override `doExecuteWrite`.
+ */
+ def executeWrite(writeSpec: WriteSpec): RDD[WriterCommitMessage] = executeQuery {
Review Comment:
Let me list the required things of current v1 write files:
- WriteJobDescription, includes hadoop job (hadoop conf), fileFormat, outputSpec, partitionColumns, bucketSpec, options, statsTrackers
- FileCommitProtocol, includes output path, dynamic partition overwrite flag
- ConcurrentOutputWriterSpec, includes requiredOrdering, bucketSpec, physical sortPlan
According to the existed datasource v1 writes command. `WriteFiles` should hold at least: FileFormat, OutputSpec, partitionColumns, bucketSpec, options, requiredOrdering.
```scala
case class InsertIntoHadoopFsRelationCommand(
outputPath: Path,
staticPartitions: TablePartitionSpec,
ifPartitionNotExists: Boolean,
partitionColumns: Seq[Attribute],
bucketSpec: Option[BucketSpec],
fileFormat: FileFormat,
options: Map[String, String],
query: LogicalPlan,
mode: SaveMode,
catalogTable: Option[CatalogTable],
fileIndex: Option[FileIndex],
outputColumnNames: Seq[String])
```
Due to we can not get physical plan at logical side, and ConcurrentOutputWriterSpec depend on physical. It should be held in `WriteFilesSpec`.
FileCommitProtocol should be held in `WriteFilesSpec`, because `WriteFiles` only do the partial work about task due to the pipeline `setup job -> setup task -> commit task -> commit job`.
And the same reason for statsTrackers.
According to the usage of hadoop job (FileCommitProtocol.setup(Job)), I tend to make `WriteFilesSpec` hold hadoop job and hadoop conf.
-------------
In sum:
`WriteFiles`: FileFormat, OutputSpec, partitionColumns, bucketSpec, options and requiredOrdering.
`WriteFilesSpec`: FileCommitProtocol, statsTrackers, ConcurrentOutputWriterSpec, hadoop job and hadoop conf.
Notes: the aboved does not consider how hard to implement, just based on semantic level.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan closed pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
cloud-fan closed pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
URL: https://github.com/apache/spark/pull/38939
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042157495
##########
sql/core/src/main/java/org/apache/spark/sql/connector/write/WriteSpec.java:
##########
@@ -0,0 +1,33 @@
+/*
+ * 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.connector.write;
+
+import java.io.Serializable;
+
+/**
+ * Write spec is a input parameter of
+ * {@link org.apache.spark.sql.execution.SparkPlan#executeWrite}.
+ *
+ * <p>
+ * This is an empty interface, the concrete class which implements
+ * {@link org.apache.spark.sql.execution.SparkPlan#doExecuteWrite}
+ * should define its own class and use it.
+ *
+ * @since 3.4.0
+ */
+public interface WriteSpec extends Serializable {}
Review Comment:
it is actually not for v2. The new added method has two interfaces:
```
`def executeWrite(writeSpec: WriteSpec): RDD[WriterCommitMessage]`
```
I just make `WriteSpec` as a java interface to be consistent with `WriterCommitMessage`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042285999
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala:
##########
@@ -123,42 +116,106 @@ object FileFormatWriter extends Logging {
val outputWriterFactory =
fileFormat.prepareWrite(sparkSession, job, caseInsensitiveOptions, dataSchema)
- val description = new WriteJobDescription(
+ new WriteJobDescription(
uuid = UUID.randomUUID.toString,
serializableHadoopConf = new SerializableConfiguration(job.getConfiguration),
outputWriterFactory = outputWriterFactory,
- allColumns = finalOutputSpec.outputColumns,
+ allColumns = outputSpec.outputColumns,
dataColumns = dataColumns,
partitionColumns = partitionColumns,
bucketSpec = writerBucketSpec,
- path = finalOutputSpec.outputPath,
- customPartitionLocations = finalOutputSpec.customPartitionLocations,
+ path = outputSpec.outputPath,
+ customPartitionLocations = outputSpec.customPartitionLocations,
maxRecordsPerFile = caseInsensitiveOptions.get("maxRecordsPerFile").map(_.toLong)
.getOrElse(sparkSession.sessionState.conf.maxRecordsPerFile),
timeZoneId = caseInsensitiveOptions.get(DateTimeUtils.TIMEZONE_OPTION)
.getOrElse(sparkSession.sessionState.conf.sessionLocalTimeZone),
statsTrackers = statsTrackers
)
+ }
+
+ private def createSortPlan(
+ plan: SparkPlan,
+ requiredOrdering: Seq[Expression],
+ outputSpec: OutputSpec): SortExec = {
+ // SPARK-21165: the `requiredOrdering` is based on the attributes from analyzed plan, and
+ // the physical plan may have different attribute ids due to optimizer removing some
+ // aliases. Here we bind the expression ahead to avoid potential attribute ids mismatch.
+ val orderingExpr = bindReferences(
+ requiredOrdering.map(SortOrder(_, Ascending)), outputSpec.outputColumns)
+ SortExec(
+ orderingExpr,
+ global = false,
+ child = plan)
+ }
+
+ private def createConcurrentOutputWriterSpec(
+ sparkSession: SparkSession,
+ sortPlan: SortExec,
+ sortColumns: Seq[Attribute]): Option[ConcurrentOutputWriterSpec] = {
+ val maxWriters = sparkSession.sessionState.conf.maxConcurrentOutputFileWriters
+ val concurrentWritersEnabled = maxWriters > 0 && sortColumns.isEmpty
+ if (concurrentWritersEnabled) {
+ Some(ConcurrentOutputWriterSpec(maxWriters, () => sortPlan.createSorter()))
+ } else {
+ None
+ }
+ }
+
+ /**
+ * Write files using [[SparkPlan.executeWrite]]
+ */
+ private def executeWrite(
+ session: SparkSession,
+ planForWrites: SparkPlan,
+ writeFilesSpec: WriteFilesSpec,
+ job: Job): Set[String] = {
+ val committer = writeFilesSpec.committer
+ val description = writeFilesSpec.description
+
+ writeAndCommit(session, job, description, committer) {
+ val rdd = planForWrites.executeWrite(writeFilesSpec)
+ val ret = new Array[WriteTaskResult](rdd.partitions.length)
+ session.sparkContext.runJob(
+ rdd,
+ (context: TaskContext, iter: Iterator[WriterCommitMessage]) => {
+ assert(iter.hasNext)
Review Comment:
we should make sure this iterator only have one element
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042862929
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala:
##########
@@ -223,6 +224,19 @@ abstract class SparkPlan extends QueryPlan[SparkPlan] with Logging with Serializ
doExecuteColumnar()
}
+ /**
+ * Returns the result of writes as an RDD[WriterCommitMessage] variable by delegating to
+ * `doExecuteWrite` after preparations.
+ *
+ * Concrete implementations of SparkPlan should override `doExecuteWrite`.
+ */
+ def executeWrite(writeSpec: WriteSpec): RDD[WriterCommitMessage] = executeQuery {
Review Comment:
Let me list the required things of current v1 write files:
- WriteJobDescription, includes hadoop job (hadoop conf), fileFormat, outputSpec, partitionColumns, bucketSpec, options, statsTrackers
- FileCommitProtocol, includes output path, dynamic partition overwrite flag
- ConcurrentOutputWriterSpec, includes requiredOrdering, bucketSpec, physical sortPlan
According to the existed datasource v1 writes command. `WriteFiles` should hold at least: FileFormat, OutputSpec, partitionColumns, bucketSpec, options, requiredOrdering.
```scala
case class InsertIntoHadoopFsRelationCommand(
outputPath: Path,
staticPartitions: TablePartitionSpec,
ifPartitionNotExists: Boolean,
partitionColumns: Seq[Attribute],
bucketSpec: Option[BucketSpec],
fileFormat: FileFormat,
options: Map[String, String],
query: LogicalPlan,
mode: SaveMode,
catalogTable: Option[CatalogTable],
fileIndex: Option[FileIndex],
outputColumnNames: Seq[String])
```
Due to we can not get physical plan at logical side, and ConcurrentOutputWriterSpec depend on physical. It should be held in `WriteFilesSpec`.
FileCommitProtocol should be held in `WriteFilesSpec`, because `WriteFiles` only do the partial work about task due to the pipeline
`setup job -> set up task -> commit task -> commit job`. And the same reason for statsTrackers.
According to the usage of hadoop job (FileCommitProtocol.setup(Job)), I tend to make `WriteFilesSpec` hold hadoop job and hadoop conf.
-------------
In sum:
`WriteFiles`: FileFormat, OutputSpec, partitionColumns, bucketSpec, options and requiredOrdering.
`WriteFilesSpec`: FileCommitProtocol, statsTrackers, ConcurrentOutputWriterSpec, hadoop job and hadoop conf.
Notes: the aboved does not consider how hard to implement, just based on semantic level.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on PR #38939:
URL: https://github.com/apache/spark/pull/38939#issuecomment-1363815008
thanks, merging to master!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042986658
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/command/createDataSourceTables.scala:
##########
@@ -145,6 +145,12 @@ case class CreateDataSourceTableAsSelectCommand(
outputColumnNames: Seq[String])
extends V1WriteCommand {
+ override def fileFormatProvider: Boolean = {
+ table.provider.forall { provider =>
+ classOf[FileFormat].isAssignableFrom(DataSource.providingClass(provider, conf))
Review Comment:
`CreateDataSourceTableAsSelectCommand` is not only used write files, we should only plan v1 writes whose provider is `FileFormat `
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042126606
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala:
##########
@@ -223,6 +224,19 @@ abstract class SparkPlan extends QueryPlan[SparkPlan] with Logging with Serializ
doExecuteColumnar()
}
+ /**
+ * Returns the result of writes as an RDD[WriterCommitMessage] variable by delegating to
+ * `doExecuteWrite` after preparations.
+ *
+ * Concrete implementations of SparkPlan should override `doExecuteWrite`.
+ */
+ def executeWrite(writeSpec: WriteSpec): RDD[WriterCommitMessage] = executeQuery {
Review Comment:
regardless of how hard to implement, ideally which information should be in the WriteFiles operator and which should be passed as parameters?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042986658
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/command/createDataSourceTables.scala:
##########
@@ -145,6 +145,12 @@ case class CreateDataSourceTableAsSelectCommand(
outputColumnNames: Seq[String])
extends V1WriteCommand {
+ override def fileFormatProvider: Boolean = {
+ table.provider.forall { provider =>
+ classOf[FileFormat].isAssignableFrom(DataSource.providingClass(provider, conf))
Review Comment:
`CreateDataSourceTableAsSelectCommand` is not only used to write files, we should only plan v1 writes whose provider is `FileFormat `
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042159772
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/WriteFiles.scala:
##########
@@ -0,0 +1,103 @@
+/*
+ * 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.datasources
+
+import java.util.Date
+
+import org.apache.spark.{SparkException, TaskContext}
+import org.apache.spark.internal.io.FileCommitProtocol
+import org.apache.spark.rdd.RDD
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.expressions.Attribute
+import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, UnaryNode}
+import org.apache.spark.sql.connector.write.{WriterCommitMessage, WriteSpec}
+import org.apache.spark.sql.execution.{SparkPlan, UnaryExecNode}
+import org.apache.spark.sql.execution.datasources.FileFormatWriter.ConcurrentOutputWriterSpec
+
+/**
+ * The write files spec holds all information of [[V1WriteCommand]] if its provider is
+ * [[FileFormat]].
+ */
+case class WriteFilesSpec(
+ description: WriteJobDescription,
+ committer: FileCommitProtocol,
+ concurrentOutputWriterSpecFunc: SparkPlan => Option[ConcurrentOutputWriterSpec])
+ extends WriteSpec
+
+/**
+ * During Optimizer, [[V1Writes]] injects the [[WriteFiles]] between [[V1WriteCommand]] and query.
+ * [[WriteFiles]] must be the root plan as the child of [[V1WriteCommand]].
+ */
+case class WriteFiles(child: LogicalPlan) extends UnaryNode {
+ override def output: Seq[Attribute] = child.output
Review Comment:
It should be `child.output`, otherwise `DataWritingCommand` can not work. `WriteFiles` is the child of `DataWritingCommand` and `DataWritingCommand` use its child output as the final output at planner phase.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042165051
##########
sql/core/src/main/java/org/apache/spark/sql/connector/write/WriteSpec.java:
##########
@@ -0,0 +1,33 @@
+/*
+ * 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.connector.write;
+
+import java.io.Serializable;
+
+/**
+ * Write spec is a input parameter of
+ * {@link org.apache.spark.sql.execution.SparkPlan#executeWrite}.
+ *
+ * <p>
+ * This is an empty interface, the concrete class which implements
+ * {@link org.apache.spark.sql.execution.SparkPlan#doExecuteWrite}
+ * should define its own class and use it.
+ *
+ * @since 3.4.0
+ */
+public interface WriteSpec extends Serializable {}
Review Comment:
then this is in the wrong package. it should be put in an internal package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042109423
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/WriteFiles.scala:
##########
@@ -0,0 +1,103 @@
+/*
+ * 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.datasources
+
+import java.util.Date
+
+import org.apache.spark.{SparkException, TaskContext}
+import org.apache.spark.internal.io.FileCommitProtocol
+import org.apache.spark.rdd.RDD
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.expressions.Attribute
+import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, UnaryNode}
+import org.apache.spark.sql.connector.write.{WriterCommitMessage, WriteSpec}
+import org.apache.spark.sql.execution.{SparkPlan, UnaryExecNode}
+import org.apache.spark.sql.execution.datasources.FileFormatWriter.ConcurrentOutputWriterSpec
+
+/**
+ * The write files spec holds all information of [[V1WriteCommand]] if its provider is
+ * [[FileFormat]].
+ */
+case class WriteFilesSpec(
+ description: WriteJobDescription,
+ committer: FileCommitProtocol,
+ concurrentOutputWriterSpecFunc: SparkPlan => Option[ConcurrentOutputWriterSpec])
+ extends WriteSpec
+
+/**
+ * During Optimizer, [[V1Writes]] injects the [[WriteFiles]] between [[V1WriteCommand]] and query.
+ * [[WriteFiles]] must be the root plan as the child of [[V1WriteCommand]].
+ */
+case class WriteFiles(child: LogicalPlan) extends UnaryNode {
+ override def output: Seq[Attribute] = child.output
Review Comment:
the output should match physical plan and be Nil as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042102119
##########
sql/core/src/main/java/org/apache/spark/sql/connector/write/WriteSpec.java:
##########
@@ -0,0 +1,33 @@
+/*
+ * 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.connector.write;
+
+import java.io.Serializable;
+
+/**
+ * Write spec is a input parameter of
+ * {@link org.apache.spark.sql.execution.SparkPlan#executeWrite}.
+ *
+ * <p>
+ * This is an empty interface, the concrete class which implements
+ * {@link org.apache.spark.sql.execution.SparkPlan#doExecuteWrite}
+ * should define its own class and use it.
+ *
+ * @since 3.4.0
+ */
+public interface WriteSpec extends Serializable {}
Review Comment:
does it need to be a public DS v2 API?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042836989
##########
sql/core/src/main/java/org/apache/spark/sql/connector/write/WriteSpec.java:
##########
@@ -0,0 +1,33 @@
+/*
+ * 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.connector.write;
+
+import java.io.Serializable;
+
+/**
+ * Write spec is a input parameter of
+ * {@link org.apache.spark.sql.execution.SparkPlan#executeWrite}.
+ *
+ * <p>
+ * This is an empty interface, the concrete class which implements
+ * {@link org.apache.spark.sql.execution.SparkPlan#doExecuteWrite}
+ * should define its own class and use it.
+ *
+ * @since 3.4.0
+ */
+public interface WriteSpec extends Serializable {}
Review Comment:
changed to internal package
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala:
##########
@@ -123,42 +116,106 @@ object FileFormatWriter extends Logging {
val outputWriterFactory =
fileFormat.prepareWrite(sparkSession, job, caseInsensitiveOptions, dataSchema)
- val description = new WriteJobDescription(
+ new WriteJobDescription(
uuid = UUID.randomUUID.toString,
serializableHadoopConf = new SerializableConfiguration(job.getConfiguration),
outputWriterFactory = outputWriterFactory,
- allColumns = finalOutputSpec.outputColumns,
+ allColumns = outputSpec.outputColumns,
dataColumns = dataColumns,
partitionColumns = partitionColumns,
bucketSpec = writerBucketSpec,
- path = finalOutputSpec.outputPath,
- customPartitionLocations = finalOutputSpec.customPartitionLocations,
+ path = outputSpec.outputPath,
+ customPartitionLocations = outputSpec.customPartitionLocations,
maxRecordsPerFile = caseInsensitiveOptions.get("maxRecordsPerFile").map(_.toLong)
.getOrElse(sparkSession.sessionState.conf.maxRecordsPerFile),
timeZoneId = caseInsensitiveOptions.get(DateTimeUtils.TIMEZONE_OPTION)
.getOrElse(sparkSession.sessionState.conf.sessionLocalTimeZone),
statsTrackers = statsTrackers
)
+ }
+
+ private def createSortPlan(
+ plan: SparkPlan,
+ requiredOrdering: Seq[Expression],
+ outputSpec: OutputSpec): SortExec = {
+ // SPARK-21165: the `requiredOrdering` is based on the attributes from analyzed plan, and
+ // the physical plan may have different attribute ids due to optimizer removing some
+ // aliases. Here we bind the expression ahead to avoid potential attribute ids mismatch.
+ val orderingExpr = bindReferences(
+ requiredOrdering.map(SortOrder(_, Ascending)), outputSpec.outputColumns)
+ SortExec(
+ orderingExpr,
+ global = false,
+ child = plan)
+ }
+
+ private def createConcurrentOutputWriterSpec(
+ sparkSession: SparkSession,
+ sortPlan: SortExec,
+ sortColumns: Seq[Attribute]): Option[ConcurrentOutputWriterSpec] = {
+ val maxWriters = sparkSession.sessionState.conf.maxConcurrentOutputFileWriters
+ val concurrentWritersEnabled = maxWriters > 0 && sortColumns.isEmpty
+ if (concurrentWritersEnabled) {
+ Some(ConcurrentOutputWriterSpec(maxWriters, () => sortPlan.createSorter()))
+ } else {
+ None
+ }
+ }
+
+ /**
+ * Write files using [[SparkPlan.executeWrite]]
+ */
+ private def executeWrite(
+ session: SparkSession,
+ planForWrites: SparkPlan,
+ writeFilesSpec: WriteFilesSpec,
+ job: Job): Set[String] = {
+ val committer = writeFilesSpec.committer
+ val description = writeFilesSpec.description
+
+ writeAndCommit(session, job, description, committer) {
+ val rdd = planForWrites.executeWrite(writeFilesSpec)
+ val ret = new Array[WriteTaskResult](rdd.partitions.length)
+ session.sparkContext.runJob(
+ rdd,
+ (context: TaskContext, iter: Iterator[WriterCommitMessage]) => {
+ assert(iter.hasNext)
Review Comment:
addressed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #38939: [SPARK-41407][SQL] Pull out v1 write to WriteFiles
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #38939:
URL: https://github.com/apache/spark/pull/38939#discussion_r1042983373
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala:
##########
@@ -785,7 +785,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase {
def taskFailedWhileWritingRowsError(cause: Throwable): Throwable = {
new SparkException(
errorClass = "_LEGACY_ERROR_TEMP_2054",
- messageParameters = Map.empty,
+ messageParameters = Map("message" -> cause.getMessage),
Review Comment:
@cloud-fan after we introduce Writefiles, the error stack for writing changes.
before:
```
org.apache.spark.SparkException: Job aborted due to stage failure: Task 0 in stage 15.0 failed 1 times, most recent failure: Lost task 0.0 in stage 15.0 (TID 15) (10.221.97.76 executor driver): java.lang.RuntimeException: Exceeds char/varchar type length limitation: 5
at org.apache.spark.sql.catalyst.util.CharVarcharCodegenUtils.trimTrailingSpaces(CharVarcharCodegenUtils.java:30)
at org.apache.spark.sql.catalyst.util.CharVarcharCodegenUtils.charTypeWriteSideCheck(CharVarcharCodegenUtils.java:43)
at org.apache.spark.sql.catalyst.expressions.GeneratedClass$GeneratedIteratorForCodegenStage1.processNext(Unknown Source)
```
after:
```
org.apache.spark.SparkException: Job aborted due to stage failure: Task 0 in stage 15.0 failed 1 times, most recent failure: Lost task 0.0 in stage 15.0 (TID 15) (10.221.97.76 executor driver): org.apache.spark.SparkException: Task failed while writing rows.
at org.apache.spark.sql.errors.QueryExecutionErrors$.taskFailedWhileWritingRowsError(QueryExecutionErrors.scala:789)
at org.apache.spark.sql.execution.datasources.FileFormatWriter$.executeTask(FileFormatWriter.scala:416)
at org.apache.spark.sql.execution.datasources.WriteFilesExec.$anonfun$doExecuteWrite$1(WriteFiles.scala:89)
at org.apache.spark.rdd.RDD.$anonfun$mapPartitionsInternal$2(RDD.scala:888)
at org.apache.spark.rdd.RDD.$anonfun$mapPartitionsInternal$2$adapted(RDD.scala:888)
at org.apache.spark.rdd.MapPartitionsRDD.compute(MapPartitionsRDD.scala:52)
at org.apache.spark.rdd.RDD.computeOrReadCheckpoint(RDD.scala:364)
at org.apache.spark.rdd.RDD.iterator(RDD.scala:328)
at org.apache.spark.scheduler.ResultTask.runTask(ResultTask.scala:92)
at org.apache.spark.TaskContext.runTaskWithListeners(TaskContext.scala:161)
at org.apache.spark.scheduler.Task.run(Task.scala:139)
at org.apache.spark.executor.Executor$TaskRunner.$anonfun$run$3(Executor.scala:554)
at org.apache.spark.util.Utils$.tryWithSafeFinally(Utils.scala:1502)
at org.apache.spark.executor.Executor$TaskRunner.run(Executor.scala:557)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at java.lang.Thread.run(Thread.java:750)
Caused by: java.lang.RuntimeException: Exceeds char/varchar type length limitation: 5
at org.apache.spark.sql.catalyst.util.CharVarcharCodegenUtils.trimTrailingSpaces(CharVarcharCodegenUtils.java:30)
at org.apache.spark.sql.catalyst.util.CharVarcharCodegenUtils.charTypeWriteSideCheck(CharVarcharCodegenUtils.java:43)
at org.apache.spark.sql.catalyst.expressions.GeneratedClass$GeneratedIteratorForCodegenStage1.processNext(Unknown Source)
```
So I added the root cause mesagge into the wrapped `SparkException`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org