Skip to content

Commit

Permalink
[Spark] Add CREATE TABLE LIKE compatibility with user-provided table …
Browse files Browse the repository at this point in the history
…properties (#3138)

<!--
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://github.com/delta-io/delta/blob/master/CONTRIBUTING.md
2. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP]
Your PR title ...'.
  3. Be sure to keep the PR description updated to reflect all changes.
  4. Please write your PR title to summarize what this PR proposes.
5. If possible, provide a concise example to reproduce the issue for a
faster review.
6. If applicable, include the corresponding issue number in the PR title
and link it in the body.
-->

#### Which Delta project/connector is this regarding?
<!--
Please add the component selected below to the beginning of the pull
request title
For example: [Spark] Title of my pull request
-->

- [x] Spark
- [ ] Standalone
- [ ] Flink
- [ ] Kernel
- [ ] Other (fill in here)

## Description

<!--
- Describe what this PR changes.
- Describe why we need the change.
 
If this PR resolves an issue be sure to include "Resolves #XXX" to
correctly link and close the issue upon merge.
-->

User provided properties when performing CREATE LIKE commands were being
ignored and only the properties from source table were being added. This
PR adds/overwrites any applicable properties with the user provided
ones.

## How was this patch tested?

<!--
If tests were added, say they were added here. Please make sure to test
the changes thoroughly including negative and positive cases if
possible.
If the changes were tested in any way other than 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 the changes were not tested, please explain why.
-->

Unit tests were created replicating the customer issue for CREATE LIKE
commands both originating in Delta tables and other formats.

## Does this PR introduce _any_ user-facing changes?

<!--
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 Delta Lake versions or within the unreleased
branches such as master.
If no, write 'No'.
-->

No
  • Loading branch information
jamesd-db committed May 24, 2024
1 parent ff5b36f commit 3cd9529
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class DeltaAnalysis(session: SparkSession)
tableType = tblType,
storage = newStorage,
schema = sourceMetadata.schema,
properties = config,
properties = config ++ ctl.properties,
partitionColumnNames = sourceMetadata.partitionColumns,
provider = Some("delta"),
comment = Option(sourceMetadata.description)
Expand All @@ -171,7 +171,7 @@ class DeltaAnalysis(session: SparkSession)
tableType = tblType,
storage = newStorage,
schema = src.schema,
properties = src.properties,
properties = src.properties ++ ctl.properties,
partitionColumnNames = src.partitionColumnNames,
provider = Some("delta"),
comment = src.comment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,4 +397,40 @@ class DeltaCreateTableLikeSuite extends QueryTest
checkTableCopyDelta(srcTbl, targetTbl)
}
}

test("CREATE TABLE LIKE where user explicitly provides table properties") {
val srcTbl = "srcTbl"
val targetTbl = "targetTbl"
val expectedTbl = "expectedTbl"
withTable(srcTbl, targetTbl, expectedTbl) {
createTable(srcTbl, addTblProperties = false)
createTable(expectedTbl, addTblProperties = false)
spark.sql(s"ALTER TABLE $srcTbl" +
" SET TBLPROPERTIES(this.is.my.key = 14, 'this.is.my.key2' = false," +
"'delta.appendOnly' = 'false')")
spark.sql(s"ALTER TABLE $expectedTbl" +
" SET TBLPROPERTIES(this.is.my.key = 14, 'this.is.my.key2' = false, " +
"'this.is.my.key3' = true, 'delta.appendOnly' = 'true')")
spark.sql(s"CREATE TABLE $targetTbl LIKE $srcTbl TBLPROPERTIES('this.is.my.key3' = true, " +
s"'delta.appendOnly' = 'true')")
checkTableCopyDelta(expectedTbl, targetTbl)
}
}

test("CREATE TABLE LIKE where sourceTable is a parquet table and " +
"user explicitly provides table properties"
) {
val srcTbl = "srcTbl"
val targetTbl = "targetTbl"
withTable(srcTbl, targetTbl) {
createTable(srcTbl, format = "parquet")
spark.sql(s"CREATE TABLE $targetTbl LIKE $srcTbl USING DELTA " +
"TBLPROPERTIES('this.is.my.key3' = true)")
spark.sql(s"ALTER TABLE $srcTbl SET TBLPROPERTIES('this.is.my.key3' = true)")
val msg = intercept[TestFailedException] {
checkTableCopy(srcTbl, targetTbl, checkDesc = false)
}.getMessage
assert(msg.contains("provider does not match"))
}
}
}

0 comments on commit 3cd9529

Please sign in to comment.