Skip to content

[fix](dynamic partition) fix create dynamic partition with overlap not throw exception #37924 #37964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 6 commits into from
Jul 17, 2024
Merged

[fix](dynamic partition) fix create dynamic partition with overlap not throw exception #37924 #37964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79a7fe2
create dynamic partition with overlap not throw exception
yujun777 Jul 16, 2024
ca86b40
add test
yujun777 Jul 16, 2024
e575aa4
update
yujun777 Jul 16, 2024
d7fa47a
update
yujun777 Jul 16, 2024
eb442b4
update
yujun777 Jul 16, 2024
e04ede2
update
yujun777 Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,11 @@ private ArrayList<AddPartitionClause> getAddPartitionClause(Database db, OlapTab
// IllegalArgumentException: lb is greater than ub
LOG.warn("Error in gen addPartitionKeyRange. db: {}, table: {}, partition idx: {}",
db.getFullName(), olapTable.getName(), idx, e);
recordCreatePartitionFailedMsg(db.getFullName(), olapTable.getName(),
e.getMessage(), olapTable.getId());
throw new DdlException(e.getMessage());
if (executeFirstTime) {
throw new DdlException("maybe dynamic_partition.start is too small, error: "
+ e.getMessage());
}
continue;
}
for (PartitionItem partitionItem : rangePartitionInfo.getIdToItem(false).values()) {
// only support single column partition now
Expand All @@ -299,7 +301,6 @@ private ArrayList<AddPartitionClause> getAddPartitionClause(Database db, OlapTab
addPartitionKeyRange, db.getFullName(), olapTable.getName(), idx, e);
recordCreatePartitionFailedMsg(db.getFullName(), olapTable.getName(),
e.getMessage(), olapTable.getId());
throw new DdlException(e.getMessage());
}
break;
}
Expand Down
23 changes: 23 additions & 0 deletions regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_failed.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ suite('test_dynamic_partition_failed', 'nonConcurrent') {
PROPERTIES
(
"replication_num" = "1",
"dynamic_partition.replication_num" = "1",
"dynamic_partition.enable" = "true",
"dynamic_partition.end" = "3",
"dynamic_partition.time_unit" = "day",
Expand All @@ -46,6 +47,26 @@ suite('test_dynamic_partition_failed', 'nonConcurrent') {

setFeConfig('max_dynamic_partition_num', Integer.MAX_VALUE)

sql 'DROP TABLE IF EXISTS test_dynamic_partition_failed_ok2 FORCE'
sql '''CREATE TABLE test_dynamic_partition_failed_ok2
( `k1` date NULL )
PARTITION BY RANGE(k1) (
PARTITION `phistory` VALUES less than ('2020-01-01')
)
DISTRIBUTED BY HASH(`k1`) BUCKETS 1
PROPERTIES
(
"replication_num" = "1",
"dynamic_partition.replication_num" = "1",
"dynamic_partition.enable" = "true",
"dynamic_partition.end" = "3",
"dynamic_partition.time_unit" = "YEAR",
"dynamic_partition.prefix" = "p",
"dynamic_partition.buckets" = "1",
"dynamic_partition.start" = "-10",
"dynamic_partition.create_history_partition" = "true"
)'''

sql 'DROP TABLE IF EXISTS test_dynamic_partition_failed_2'
test {
sql '''CREATE TABLE test_dynamic_partition_failed_2
Expand All @@ -55,6 +76,7 @@ suite('test_dynamic_partition_failed', 'nonConcurrent') {
PROPERTIES
(
"replication_num" = "1",
"dynamic_partition.replication_num" = "1",
"dynamic_partition.enable" = "true",
"dynamic_partition.end" = "3",
"dynamic_partition.time_unit" = "day",
Expand All @@ -74,6 +96,7 @@ suite('test_dynamic_partition_failed', 'nonConcurrent') {
} finally {
setFeConfig('max_dynamic_partition_num', old_max_dynamic_partition_num)
sql 'DROP TABLE IF EXISTS test_dynamic_partition_failed_ok1 FORCE'
sql 'DROP TABLE IF EXISTS test_dynamic_partition_failed_ok2 FORCE'
sql 'DROP TABLE IF EXISTS test_dynamic_partition_failed_2'
}
}