This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 8039dc368eb [fix](case) fix txn_insert_inject_case (#42001) (#42141)
8039dc368eb is described below
commit 8039dc368eb02c8cef2050963ebe979a66630fd9
Author: meiyi <[email protected]>
AuthorDate: Mon Oct 21 20:53:23 2024 +0800
[fix](case) fix txn_insert_inject_case (#42001) (#42141)
pick https://github.com/apache/doris/pull/42001
---
.../main/java/org/apache/doris/qe/ConnectProcessor.java | 14 +++++++-------
.../main/java/org/apache/doris/qe/MasterOpExecutor.java | 2 +-
.../org/apache/doris/transaction/TransactionEntry.java | 14 ++++++++------
.../insert_p0/transaction/txn_insert_inject_case.groovy | 2 ++
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
index 6e495217c29..02aef153e37 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
@@ -723,17 +723,17 @@ public abstract class ConnectProcessor {
result.setStatus(ctx.getState().toString());
if (ctx.getState().getStateType() == MysqlStateType.OK) {
result.setStatusCode(0);
- if (request.isSetTxnLoadInfo()) {
- TransactionEntry transactionEntry =
ConnectContext.get().getTxnEntry();
- // null if this is a commit or rollback command
- if (transactionEntry != null) {
-
result.setTxnLoadInfo(transactionEntry.getTxnInfoInMaster());
- }
- }
} else {
result.setStatusCode(ctx.getState().getErrorCode().getCode());
result.setErrMessage(ctx.getState().getErrorMessage());
}
+ if (request.isSetTxnLoadInfo()) {
+ TransactionEntry transactionEntry =
ConnectContext.get().getTxnEntry();
+ // null if this is a commit or rollback command
+ if (transactionEntry != null) {
+ result.setTxnLoadInfo(transactionEntry.getTxnInfoInMaster());
+ }
+ }
if (executor != null) {
if (executor.getProxyShowResultSet() != null) {
result.setResultSet(executor.getProxyShowResultSet().tothrift());
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
index b83838cdd07..1f7d87bdfe3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
@@ -87,7 +87,7 @@ public class MasterOpExecutor {
public void execute() throws Exception {
result = forward(buildStmtForwardParams());
- if (result.getStatusCode() == 0 && ctx.isTxnModel()) {
+ if (ctx.isTxnModel()) {
if (result.isSetTxnLoadInfo()) {
ctx.getTxnEntry().setTxnLoadInfoInObserver(result.getTxnLoadInfo());
} else {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionEntry.java
b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionEntry.java
index 4a2beea2d0b..c9e2ff522ff 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionEntry.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionEntry.java
@@ -503,12 +503,14 @@ public class TransactionEntry {
this.transactionId = txnLoadInfo.getTxnId();
this.timeoutTimestamp = txnLoadInfo.getTimeoutTimestamp();
this.allSubTxnNum = txnLoadInfo.getAllSubTxnNum();
- for (TSubTxnInfo subTxnInfo : txnLoadInfo.getSubTxnInfos()) {
- TableIf table =
database.getTableOrDdlException(subTxnInfo.getTableId());
- subTransactionStates.add(
- new SubTransactionState(subTxnInfo.getSubTxnId(), (Table)
table,
- subTxnInfo.getTabletCommitInfos(),
-
SubTransactionState.getSubTransactionType(subTxnInfo.getSubTxnType())));
+ if (txnLoadInfo.isSetSubTxnInfos()) {
+ for (TSubTxnInfo subTxnInfo : txnLoadInfo.getSubTxnInfos()) {
+ TableIf table =
database.getTableOrDdlException(subTxnInfo.getTableId());
+ subTransactionStates.add(
+ new SubTransactionState(subTxnInfo.getSubTxnId(),
(Table) table,
+ subTxnInfo.getTabletCommitInfos(),
+
SubTransactionState.getSubTransactionType(subTxnInfo.getSubTxnType())));
+ }
}
}
diff --git
a/regression-test/suites/insert_p0/transaction/txn_insert_inject_case.groovy
b/regression-test/suites/insert_p0/transaction/txn_insert_inject_case.groovy
index 4e33d8a03ce..347f99c2004 100644
--- a/regression-test/suites/insert_p0/transaction/txn_insert_inject_case.groovy
+++ b/regression-test/suites/insert_p0/transaction/txn_insert_inject_case.groovy
@@ -96,6 +96,8 @@ suite("txn_insert_inject_case", "nonConcurrent") {
} catch (Exception e) {
logger.error("failed", e)
} finally {
+ sql """ rollback """
+ disableDebugPoint()
GetDebugPoint().disableDebugPointForAllBEs("FlushToken.submit_flush_error")
}
sql "sync"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]