This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 5521a253925 [enhance](insertoverwrite)insert overwrite not fallback
(#41799)
5521a253925 is described below
commit 5521a253925d34f026f240376ae6ab0c76232008
Author: zhangdong <[email protected]>
AuthorDate: Thu Oct 17 12:14:17 2024 +0800
[enhance](insertoverwrite)insert overwrite not fallback (#41799)
- Insert overwrite on NEREIDS can automatically clean up garbage
temporary partitions after restart, which is not available on old
optimizers
- When insert fails, no longer throw nereids exceptions
---
.../insert/InsertOverwriteTableCommand.java | 7 ++-
.../insert_overwrite_not_fallback.groovy | 50 ++++++++++++++++++++++
2 files changed, 55 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertOverwriteTableCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertOverwriteTableCommand.java
index d2dc409d2f0..b0faa6ba508 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertOverwriteTableCommand.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertOverwriteTableCommand.java
@@ -44,6 +44,7 @@ import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.PlanType;
import org.apache.doris.nereids.trees.plans.commands.Command;
import org.apache.doris.nereids.trees.plans.commands.ForwardWithSync;
+import org.apache.doris.nereids.trees.plans.commands.NotAllowFallback;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
import org.apache.doris.nereids.trees.plans.logical.UnboundLogicalSink;
import org.apache.doris.nereids.trees.plans.physical.PhysicalOlapTableSink;
@@ -77,7 +78,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
* InsertIntoTableCommand(Query())
* ExplainCommand(Query())
*/
-public class InsertOverwriteTableCommand extends Command implements
ForwardWithSync, Explainable {
+public class InsertOverwriteTableCommand extends Command implements
ForwardWithSync, Explainable, NotAllowFallback {
private static final Logger LOG =
LogManager.getLogger(InsertOverwriteTableCommand.class);
@@ -227,7 +228,9 @@ public class InsertOverwriteTableCommand extends Command
implements ForwardWithS
} else {
insertOverwriteManager.taskFail(taskId);
}
- throw e;
+ if (ctx.getState().getStateType() != MysqlStateType.ERR) {
+ throw e;
+ }
} finally {
ConnectContext.get().setSkipAuth(false);
insertOverwriteManager
diff --git
a/regression-test/suites/insert_overwrite_p0/insert_overwrite_not_fallback.groovy
b/regression-test/suites/insert_overwrite_p0/insert_overwrite_not_fallback.groovy
new file mode 100644
index 00000000000..d93e0da27c4
--- /dev/null
+++
b/regression-test/suites/insert_overwrite_p0/insert_overwrite_not_fallback.groovy
@@ -0,0 +1,50 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("insert_overwrite_not_fallback","p0") {
+ String suiteName = "insert_overwrite_not_fallback"
+ String tableName = "${suiteName}_table"
+ sql """drop table if exists `${tableName}`"""
+ sql """
+ CREATE TABLE `${tableName}`
+ (
+ k2 TINYINT,
+ k3 INT not null
+ )
+ COMMENT "my first table"
+ PARTITION BY LIST(`k3`)
+ (
+ PARTITION `p1` VALUES IN ('1'),
+ PARTITION `p2` VALUES IN ('2'),
+ PARTITION `p3` VALUES IN ('3')
+ )
+ DISTRIBUTED BY HASH(k2) BUCKETS 2
+ PROPERTIES (
+ "replication_num" = "1"
+ );
+ """
+ // nereids err msg: ERROR 1105 (HY000): errCode = 2, detailMessage =
Insert has filtered data in strict mode. url:
+ // old planner err msg: ERROR 5025 (HY000): Insert has filtered data in
strict mode, tracking_url=
+ test {
+ sql """
+ insert overwrite table ${tableName} values(4,4);
+ """
+ exception "errCode = 2, detailMessage = Insert has filtered data in
strict mode. url:"
+ }
+ sql """drop table if exists `${tableName}`"""
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
