Skip to content

[fix](fe) remove table from waitToCommitTxnCountMap in CloudGlobalTransactionMgr when drop table #59757

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
dataroaring merged 1 commit into from
Jan 13, 2026
Merged

[fix](fe) remove table from waitToCommitTxnCountMap in CloudGlobalTransactionMgr when drop table #59757

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
63 changes: 19 additions & 44 deletions fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ public void setWaitDeleteBitmapLockCostTimeMs(long waitDeleteBitmapLockCostTimeM
private Map<Long, AtomicInteger> waitToCommitTxnCountMap = new ConcurrentHashMap<>();
private Map<Long, CommitCostTimeStatistic> commitCostTimeStatisticMap = new ConcurrentHashMap<>();

// dbId -> tableId -> txnId
private Map<Long, Map<Long, Long>> lastTxnIdMap = Maps.newConcurrentMap();
// dbId -> txnId -> signature
private Map<Long, Map<Long, Long>> txnLastSignatureMap = Maps.newConcurrentMap();
// tableId -> txnId
private Map<Long, Long> lastTxnIdMap = Maps.newConcurrentMap();
// txnId -> signature
private Map<Long, Long> txnLastSignatureMap = Maps.newConcurrentMap();

private final AutoPartitionCacheManager autoPartitionCacheManager = new AutoPartitionCacheManager();

Expand Down Expand Up @@ -2589,55 +2589,30 @@ private void decreaseWaitingLockCount(List<Table> tableList) {
}
}

public long getTableLastTxnId(long dbId, long tableId) {
Map<Long, Long> tabletIdToTxnId = lastTxnIdMap.get(dbId);
if (tabletIdToTxnId == null) {
return -1;
}
return tabletIdToTxnId.getOrDefault(tableId, -1L);
private long getTableLastTxnId(long dbId, long tableId) {
return lastTxnIdMap.getOrDefault(tableId, -1L);
}

public void setTableLastTxnId(long dbId, long tableId, long txnId) {
lastTxnIdMap.compute(dbId, (k, v) -> {
if (v == null) {
v = Maps.newConcurrentMap();
}
LOG.debug("setTableLastTxnId dbId: {}, tableId: {}, txnId: {}", dbId, tableId, txnId);
v.put(tableId, txnId);
return v;
});
private void setTableLastTxnId(long dbId, long tableId, long txnId) {
lastTxnIdMap.put(tableId, txnId);
LOG.debug("setTableLastTxnId dbId: {}, tableId: {}, txnId: {}", dbId, tableId, txnId);
}

public void clearTableLastTxnId(long dbId, long tableId) {
lastTxnIdMap.computeIfPresent(dbId, (k, v) -> {
v.remove(tableId);
return v.isEmpty() ? null : v;
});
public void afterDropTable(long dbId, long tableId) {
lastTxnIdMap.remove(tableId);
waitToCommitTxnCountMap.remove(tableId);
}
Comment thread
mymeiyi marked this conversation as resolved.

public long getTxnLastSignature(long dbId, long txnId) {
Map<Long, Long> txnIdToLastSignature = txnLastSignatureMap.get(dbId);
if (txnIdToLastSignature == null) {
return -1;
}
return txnIdToLastSignature.getOrDefault(txnId, -1L);
private long getTxnLastSignature(long dbId, long txnId) {
return txnLastSignatureMap.getOrDefault(txnId, -1L);
}

public void setTxnLastSignature(long dbId, long txnId, long signature) {
txnLastSignatureMap.compute(dbId, (k, v) -> {
if (v == null) {
v = Maps.newConcurrentMap();
}
LOG.debug("setTxnLastSignature dbId: {}, txnId: {}, signature: {}", dbId, txnId, signature);
v.put(txnId, signature);
return v;
});
private void setTxnLastSignature(long dbId, long txnId, long signature) {
txnLastSignatureMap.put(txnId, signature);
LOG.debug("setTxnLastSignature dbId: {}, txnId: {}, signature: {}", dbId, txnId, signature);
}

public void clearTxnLastSignature(long dbId, long txnId) {
txnLastSignatureMap.computeIfPresent(dbId, (k, v) -> {
v.remove(txnId);
return v.isEmpty() ? null : v;
});
private void clearTxnLastSignature(long dbId, long txnId) {
txnLastSignatureMap.remove(txnId);
}
}
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,8 +990,8 @@ private void dropTableInternal(Database db, Table table, boolean isView, boolean
Env.getCurrentEnv().getMtmvService().dropTable(table);
}
if (Config.isCloudMode()) {
((CloudGlobalTransactionMgr) Env.getCurrentGlobalTransactionMgr())
.clearTableLastTxnId(db.getId(), table.getId());
((CloudGlobalTransactionMgr) Env.getCurrentGlobalTransactionMgr()).afterDropTable(db.getId(),
table.getId());
}
}

Expand Down
Loading