Skip to content

Revert #2960 and commit no-op partition replacement operations #3043

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
hankfanchiu wants to merge 1 commit into from
Closed

Revert #2960 and commit no-op partition replacement operations #3043

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
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/BaseReplacePartitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public ReplacePartitions validateAppendOnly() {

@Override
public List<ManifestFile> apply(TableMetadata base) {
if (writeSpec().fields().size() <= 0) {
if (!addedFiles().isEmpty() && writeSpec().fields().size() <= 0) {
// replace all data in an unpartitioned table
deleteByRowFilter(Expressions.alwaysTrue());
}
Expand Down
9 changes: 1 addition & 8 deletions spark2/src/main/java/org/apache/iceberg/spark/source/Writer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,10 @@ private void append(WriterCommitMessage[] messages) {
}

private void replacePartitions(WriterCommitMessage[] messages) {
Iterable<DataFile> files = files(messages);

if (!files.iterator().hasNext()) {
LOG.info("Dyanmic overwrite is empty, skipping commit");
return;
}

ReplacePartitions dynamicOverwrite = table.newReplacePartitions();

int numFiles = 0;
for (DataFile file : files) {
for (DataFile file : files(messages)) {
numFiles += 1;
dynamicOverwrite.addFile(file);
}
Expand Down
9 changes: 1 addition & 8 deletions spark3/src/main/java/org/apache/iceberg/spark/source/SparkWrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,17 +262,10 @@ public void commit(WriterCommitMessage[] messages) {
private class DynamicOverwrite extends BaseBatchWrite {
@Override
public void commit(WriterCommitMessage[] messages) {
Iterable<DataFile> files = files(messages);

if (!files.iterator().hasNext()) {
LOG.info("Dynamic overwrite is empty, skipping commit");
return;
}

ReplacePartitions dynamicOverwrite = table.newReplacePartitions();

int numFiles = 0;
for (DataFile file : files) {
for (DataFile file : files(messages)) {
numFiles += 1;
dynamicOverwrite.addFile(file);
}
Expand Down