Skip to content

[SPARK-51936][SQL] ReplaceTableAsSelect should overwrite the new table instead of append #50739

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

[SPARK-51936][SQL] ReplaceTableAsSelect should overwrite the new table instead of append #50739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions ...rc/main/scala/org/apache/spark/sql/execution/datasources/v2/WriteToDataSourceV2Exec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import org.apache.spark.internal.{Logging, LogKeys, MDC}
import org.apache.spark.rdd.RDD
import org.apache.spark.sql.catalyst.{InternalRow, ProjectingInternalRow}
import org.apache.spark.sql.catalyst.analysis.NoSuchTableException
import org.apache.spark.sql.catalyst.expressions.Attribute
import org.apache.spark.sql.catalyst.plans.logical.{AppendData, LogicalPlan, TableSpec, UnaryNode}
import org.apache.spark.sql.catalyst.expressions.{Attribute, Literal}
import org.apache.spark.sql.catalyst.plans.logical.{AppendData, LogicalPlan, OverwriteByExpression, TableSpec, UnaryNode}
import org.apache.spark.sql.catalyst.util.{removeInternalMetadata, CharVarcharUtils, ReplaceDataProjections, WriteDeltaProjections}
import org.apache.spark.sql.catalyst.util.RowDeltaUtils.{DELETE_OPERATION, INSERT_OPERATION, REINSERT_OPERATION, UPDATE_OPERATION, WRITE_OPERATION, WRITE_WITH_METADATA_OPERATION}
import org.apache.spark.sql.connector.catalog.{CatalogV2Util, Column, Identifier, StagedTable, StagingTableCatalog, Table, TableCatalog, TableInfo, TableWritePrivilege}
Expand Down Expand Up @@ -89,7 +89,7 @@ case class CreateTableAsSelectExec(
.build()
val table = Option(catalog.createTable(ident, tableInfo))
.getOrElse(catalog.loadTable(ident, Set(TableWritePrivilege.INSERT).asJava))
writeToTable(catalog, table, writeOptions, ident, query)
writeToTable(catalog, table, writeOptions, ident, query, overwrite = false)
}
}

Expand Down Expand Up @@ -130,7 +130,7 @@ case class AtomicCreateTableAsSelectExec(
.build()
val stagedTable = Option(catalog.stageCreate(ident, tableInfo)
).getOrElse(catalog.loadTable(ident, Set(TableWritePrivilege.INSERT).asJava))
writeToTable(catalog, stagedTable, writeOptions, ident, query)
writeToTable(catalog, stagedTable, writeOptions, ident, query, overwrite = false)
}
}

Expand Down Expand Up @@ -180,7 +180,7 @@ case class ReplaceTableAsSelectExec(
.build()
val table = Option(catalog.createTable(ident, tableInfo))
.getOrElse(catalog.loadTable(ident, Set(TableWritePrivilege.INSERT).asJava))
writeToTable(catalog, table, writeOptions, ident, query)
writeToTable(catalog, table, writeOptions, ident, query, overwrite = true)
}
}

Expand Down Expand Up @@ -242,7 +242,7 @@ case class AtomicReplaceTableAsSelectExec(
}
val table = Option(staged).getOrElse(
catalog.loadTable(ident, Set(TableWritePrivilege.INSERT).asJava))
writeToTable(catalog, table, writeOptions, ident, query)
writeToTable(catalog, table, writeOptions, ident, query, overwrite = true)
}
}

Expand Down Expand Up @@ -697,15 +697,18 @@ private[v2] trait V2CreateTableAsSelectBaseExec extends LeafV2CommandExec {
table: Table,
writeOptions: Map[String, String],
ident: Identifier,
query: LogicalPlan): Seq[InternalRow] = {
query: LogicalPlan,
overwrite: Boolean): Seq[InternalRow] = {
Utils.tryWithSafeFinallyAndFailureCallbacks({
val relation = DataSourceV2Relation.create(table, Some(catalog), Some(ident))
val append = AppendData.byPosition(relation, query, writeOptions)
val qe = session.sessionState.executePlan(append)
val writeCommand = if (overwrite) {
OverwriteByExpression.byPosition(relation, query, Literal.TrueLiteral, writeOptions)
} else {
AppendData.byPosition(relation, query, writeOptions)
}
val qe = session.sessionState.executePlan(writeCommand)
qe.assertCommandExecuted()

DataSourceV2Utils.commitStagedChanges(sparkContext, table, metrics)

Nil
})(catchBlock = {
table match {
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
|OPTIONS (PATH '$path')
|AS VALUES (2, 3)
|""".stripMargin)
checkAnswer(sql("SELECT * FROM test"), Seq(Row(0, 1), Row(0, 1), Row(1, 2), Row(2, 3)))
Copy link
Contributor Author

@cloud-fan cloud-fan Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RTAS with ds v2 source is newly supported in 4.0: #44190

It's not too late to change it as 4.0 is not released yet.

checkAnswer(sql("SELECT * FROM test"), Seq(Row(2, 3)))
// Replace the table without the path options.
sql(
s"""
Expand Down