hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[auto split] fix pre-split part name conflict

Browse Source
This commit is contained in:
JLY2015
2024-10-16 03:44:12 +00:00
committed by ob-robot
parent 2a1ebec632
commit 61dd7f389d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/ob_partition_pre_split.cpp
View File

@ -793,7 +793,7 @@ int ObPartitionPreSplit::generate_all_partition_schema(
if (OB_FAIL(tmp_part.assign(*ori_part))) { if (OB_FAIL(tmp_part.assign(*ori_part))) {
LOG_WARN("[PRE_SPLIT] fail to assign original part", K(ret), K(cur_part_idx)); LOG_WARN("[PRE_SPLIT] fail to assign original part", K(ret), K(cur_part_idx));
} else if (FALSE_IT(tmp_part.set_part_idx(cur_part_idx))){ } else if (FALSE_IT(tmp_part.set_part_idx(cur_part_idx))){
} else if (FALSE_IT(tmp_part.set_is_empty_partition_name(true))) { // generate new name for not split part } else if (FALSE_IT(tmp_part.set_is_empty_partition_name(false))) { // not generate new name for not split part
} else if (OB_FAIL(all_partition_schema.add_partition(tmp_part))) { } else if (OB_FAIL(all_partition_schema.add_partition(tmp_part))) {
LOG_WARN("[PRE_SPLIT] fail to add new partition", K(ret), K(tmp_part), K(cur_part_idx)); LOG_WARN("[PRE_SPLIT] fail to add new partition", K(ret), K(tmp_part), K(cur_part_idx));
} else { } else {
@ -992,6 +992,10 @@ int ObPartitionPreSplit::modify_partition_func_type_if_need(ObTableSchema &new_t
return ret; return ret;
} }
/*
目前只有创建全局索引表，need_generate_part_name才会为true
如果是重建全局索引表，need_generate_part_name为false
*/
int ObPartitionPreSplit::build_split_tablet_partition_schema( int ObPartitionPreSplit::build_split_tablet_partition_schema(
const int64_t tenant_id, const int64_t tenant_id,
const ObTabletID &source_tablet_id, const ObTabletID &source_tablet_id,
@ -1344,6 +1348,7 @@ int ObPartitionPreSplit::build_tablet_pre_split_ranges(
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
split_ranges_.reset(); // reset range
ObSplitSampler range_builder; ObSplitSampler range_builder;
ObArray<ObNewRange> tmp_ranges; ObArray<ObNewRange> tmp_ranges;
ObArray<ObString> part_columns_name; ObArray<ObString> part_columns_name;