This is an automated email from the ASF dual-hosted git repository.
liaoxin pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new c0551744836 [fix](insert) fix forget to abort txn when insert
checkStrictMode failed (#34612) (#34632)
c0551744836 is described below
commit c05517448365a65c338d4b39456d40fcf88a5081
Author: Xin Liao <[email protected]>
AuthorDate: Fri May 10 11:29:11 2024 +0800
[fix](insert) fix forget to abort txn when insert checkStrictMode failed
(#34612) (#34632)
---
.../trees/plans/commands/insert/AbstractInsertExecutor.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/AbstractInsertExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/AbstractInsertExecutor.java
index f0df240762b..541836dc1ad 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/AbstractInsertExecutor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/AbstractInsertExecutor.java
@@ -159,16 +159,14 @@ public abstract class AbstractInsertExecutor {
}
}
- private boolean checkStrictMode() {
+ private void checkStrictMode() throws Exception {
// if in strict mode, insert will fail if there are filtered rows
if (ctx.getSessionVariable().getEnableInsertStrict()) {
if (filteredRows > 0) {
- ctx.getState().setError(ErrorCode.ERR_FAILED_WHEN_INSERT,
- "Insert has filtered data in strict mode,
tracking_url=" + coordinator.getTrackingUrl());
- return false;
+ ErrorReport.reportDdlException("Insert has filtered data in
strict mode",
+ ErrorCode.ERR_FAILED_WHEN_INSERT);
}
}
- return true;
}
/**
@@ -178,9 +176,7 @@ public abstract class AbstractInsertExecutor {
beforeExec();
try {
execImpl(executor, jobId);
- if (!checkStrictMode()) {
- return;
- }
+ checkStrictMode();
onComplete();
} catch (Throwable t) {
onFail(t);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
