database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[enhancement](delete-handler) split Deletehandler#commitJob and add preconditions to intercept NPE(#24086)

Browse Source
This commit is contained in:
Siyang Tang
2023-09-13 14:34:12 +08:00
committed by GitHub
parent 335064f897
commit d87b852e18
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fe/fe-core/src/main/java/org/apache/doris/load/DeleteHandler.java
View File

@ -500,14 +500,20 @@ public class DeleteHandler implements Writable {
TransactionStatus status = null;
try {
unprotectedCommitJob(job, db, table, timeoutMs);
status = Env.getCurrentGlobalTransactionMgr()
.getTransactionState(db.getId(), job.getTransactionId()).getTransactionStatus();
GlobalTransactionMgr transactionMgr = Env.getCurrentGlobalTransactionMgr();
long dbId = db.getId();
long transactionId = job.getTransactionId();
TransactionState transactionState = transactionMgr.getTransactionState(dbId, transactionId);
Preconditions.checkNotNull(transactionState,
"got null txn state with: dbId=%s, txnId=%s", dbId, transactionId);
status = transactionState.getTransactionStatus();
} catch (UserException e) {
if (cancelJob(job, CancelType.COMMIT_FAIL, e.getMessage())) {
throw new DdlException(e.getMessage(), e);
}
}
Preconditions.checkNotNull(status, "got null txn status, jobId=%s", job.getId());
StringBuilder sb = new StringBuilder();
sb.append("{'label':'").append(job.getLabel()).append("', 'status':'").append(status.name());
sb.append("', 'txnId':'").append(job.getTransactionId()).append("'");