Skip to content

branch-2.1: [fix](iceberg) Fix transaction issues (#52716) #53238

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

Merged
yiguolei merged 1 commit into from
Jul 16, 2025
Merged

branch-2.1: [fix](iceberg) Fix transaction issues (#52716) #53238

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 fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public void finishInsert(SimpleTableInfo tableInfo, Optional<InsertCommandContex
}

private void updateManifestAfterInsert(TUpdateMode updateMode) {
PartitionSpec spec = table.spec();
FileFormat fileFormat = IcebergUtils.getFileFormat(table);
PartitionSpec spec = transaction.table().spec();
FileFormat fileFormat = IcebergUtils.getFileFormat(transaction.table());

List<WriteResult> pendingResults;
if (commitDataList.isEmpty()) {
Expand All @@ -125,9 +125,9 @@ private void updateManifestAfterInsert(TUpdateMode updateMode) {
}

if (updateMode == TUpdateMode.APPEND) {
commitAppendTxn(table, pendingResults);
commitAppendTxn(pendingResults);
} else {
commitReplaceTxn(table, pendingResults);
commitReplaceTxn(pendingResults);
}
}

Expand All @@ -146,16 +146,15 @@ public long getUpdateCnt() {
return commitDataList.stream().mapToLong(TIcebergCommitData::getRowCount).sum();
}


private synchronized Table getNativeTable(SimpleTableInfo tableInfo) {
Objects.requireNonNull(tableInfo);
ExternalCatalog externalCatalog = ops.getExternalCatalog();
return IcebergUtils.getRemoteTable(externalCatalog, tableInfo);
}

private void commitAppendTxn(Table table, List<WriteResult> pendingResults) {
private void commitAppendTxn(List<WriteResult> pendingResults) {
// commit append files.
AppendFiles appendFiles = table.newAppend().scanManifestsWith(ops.getThreadPoolWithPreAuth());
AppendFiles appendFiles = transaction.newAppend().scanManifestsWith(ops.getThreadPoolWithPreAuth());
for (WriteResult result : pendingResults) {
Preconditions.checkState(result.referencedDataFiles().length == 0,
"Should have no referenced data files for append.");
Expand All @@ -165,13 +164,15 @@ private void commitAppendTxn(Table table, List<WriteResult> pendingResults) {
}


private void commitReplaceTxn(Table table, List<WriteResult> pendingResults) {
private void commitReplaceTxn(List<WriteResult> pendingResults) {
if (pendingResults.isEmpty()) {
// such as : insert overwrite table `dst_tb` select * from `empty_tb`
// 1. if dst_tb is a partitioned table, it will return directly.
// 2. if dst_tb is an unpartitioned table, the `dst_tb` table will be emptied.
if (!table.spec().isPartitioned()) {
OverwriteFiles overwriteFiles = table.newOverwrite().scanManifestsWith(ops.getThreadPoolWithPreAuth());
if (!transaction.table().spec().isPartitioned()) {
OverwriteFiles overwriteFiles = transaction
.newOverwrite()
.scanManifestsWith(ops.getThreadPoolWithPreAuth());
try (CloseableIterable<FileScanTask> fileScanTasks = table.newScan().planFiles()) {
fileScanTasks.forEach(f -> overwriteFiles.deleteFile(f.file()));
} catch (IOException e) {
Expand All @@ -183,7 +184,9 @@ private void commitReplaceTxn(Table table, List<WriteResult> pendingResults) {
}

// commit replace partitions
ReplacePartitions appendPartitionOp = table.newReplacePartitions();
ReplacePartitions appendPartitionOp = transaction
.newReplacePartitions()
.scanManifestsWith(ops.getThreadPoolWithPreAuth());
for (WriteResult result : pendingResults) {
Preconditions.checkState(result.referencedDataFiles().length == 0,
"Should have no referenced data files.");
Expand Down