This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.1-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.1-lts by this push:
new f85244591e [fix](truncate) it will directly return and avoid throwing
NoSuchElementException in method `selectiveCopy` when table has no partition
(#22022)
f85244591e is described below
commit f85244591eae99d10b058add04008f55300b4def
Author: htyoung <hty551...@hotmail.com>
AuthorDate: Thu Jul 20 20:26:39 2023 +0800
[fix](truncate) it will directly return and avoid throwing
NoSuchElementException in method `selectiveCopy` when table has no partition
(#22022)
Co-authored-by: tongyang.han <tongyang....@jiduauto.com>
---
.../java/org/apache/doris/catalog/Catalog.java | 5 ++
.../suites/ddl_p0/test_truncate_table1.groovy | 78 ++++++++++++++++++++++
2 files changed, 83 insertions(+)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
index 63edd31e8a..6cbfbb9571 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
@@ -6834,6 +6834,11 @@ public class Catalog {
partitionsDistributionInfo.put(partition.getId(),
partition.getDistributionInfo());
}
}
+ // if table currently has no partitions, this sql like empty
command and do nothing, should return directly
+ // at the same time, it will avoid throwing NoSuchElementException
in method `selectiveCopy`
+ if (origPartitions.isEmpty()) {
+ return;
+ }
copiedTbl = olapTable.selectiveCopy(origPartitions.keySet(),
IndexExtState.VISIBLE, false);
} finally {
olapTable.readUnlock();
diff --git a/regression-test/suites/ddl_p0/test_truncate_table1.groovy
b/regression-test/suites/ddl_p0/test_truncate_table1.groovy
new file mode 100644
index 0000000000..7f25dca5ae
--- /dev/null
+++ b/regression-test/suites/ddl_p0/test_truncate_table1.groovy
@@ -0,0 +1,78 @@
+// 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("test_truncate_table1") {
+ // test truncate partition table which has no partition
+ def testTable = "test_truncate_no_partition_table"
+ sql "DROP TABLE IF EXISTS ${testTable}"
+ sql """
+ CREATE TABLE ${testTable}
+ (
+ k1 DATE,
+ k2 DECIMAL(10, 2) DEFAULT "10.5",
+ k3 CHAR(10) COMMENT "string column",
+ k4 INT NOT NULL DEFAULT "1" COMMENT "int column"
+ )
+ PARTITION BY RANGE(k1)
+ ()
+ DISTRIBUTED BY HASH(k2) BUCKETS 1
+ PROPERTIES (
+ "replication_num" = "1"
+ );
+ """
+ List<List<Object>> result = sql "show partitions from ${testTable}"
+ logger.info("${result}")
+ assertEquals(result.size(), 0)
+
+ sql """truncate table ${testTable};"""
+ result = sql "show partitions from ${testTable}"
+ logger.info("${result}")
+ assertEquals(result.size(), 0)
+
+ sql "DROP TABLE IF EXISTS ${testTable}"
+
+
+
+ // test truncate non partition table
+ def testNonPartitionTable = "test_truncate_non_partition_table"
+ sql "DROP TABLE IF EXISTS ${testNonPartitionTable}"
+ sql """
+ CREATE TABLE ${testNonPartitionTable}
+ (
+ k1 DATE,
+ k2 DECIMAL(10, 2) DEFAULT "10.5",
+ k3 CHAR(10) COMMENT "string column",
+ k4 INT NOT NULL DEFAULT "1" COMMENT "int column"
+ )
+ DISTRIBUTED BY HASH(k2) BUCKETS 1
+ PROPERTIES (
+ "replication_num" = "1"
+ );
+ """
+ List<List<Object>> result1 = sql "show partitions from
${testNonPartitionTable}"
+ logger.info("${result1}")
+ assertEquals(result1.size(), 1)
+
+ sql """truncate table ${testNonPartitionTable};"""
+ result1 = sql "show partitions from ${testNonPartitionTable}"
+ logger.info("${result1}")
+ assertEquals(result1.size(), 1)
+
+ sql "DROP TABLE IF EXISTS ${testNonPartitionTable}"
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
