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

[BUGFIX]fix rename/drop table hashset full

Browse Source
This commit is contained in:
obdev
2024-02-07 00:55:07 +00:00
committed by ob-robot
parent 99f684b537
commit 343d4f1a39
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rootserver/ob_ddl_service.cpp
View File

@ -13518,12 +13518,16 @@ int ObDDLService::rename_table(const obrpc::ObRenameTableArg &rename_table_arg)
} else { } else {
//todo use array to replace hashmap and hashset @hualong //todo use array to replace hashmap and hashset @hualong
//record table already be renamed in the schema mgr //record table already be renamed in the schema mgr
common::hash::ObPlacementHashSet<ObTableItem, 32> delete_table_set; common::hash::ObHashSet<ObTableItem> delete_table_set;
//record new table name set //record new table name set
//table_item -> table_id //table_item -> table_id
common::hash::ObHashMap<ObTableItem, uint64_t> new_table_map; common::hash::ObHashMap<ObTableItem, uint64_t> new_table_map;
ObArray<std::pair<uint64_t, share::schema::ObObjectType>> all_dep_objs; ObArray<std::pair<uint64_t, share::schema::ObObjectType>> all_dep_objs;
if (OB_FAIL(new_table_map.create(32, ObModIds::OB_HASH_BUCKET_RENAME_TABLE_MAP))) { const int64_t rename_items_count = rename_table_arg.rename_table_items_.size();
if (OB_FAIL(delete_table_set.create(rename_items_count))) {
LOG_WARN("failed to add create ObHashSet", KR(ret));
} else if (OB_FAIL(new_table_map.create(rename_items_count, ObModIds::OB_HASH_BUCKET_RENAME_TABLE_MAP))) {
LOG_WARN("failed to add create ObHashMap", K(ret)); LOG_WARN("failed to add create ObHashMap", K(ret));
} else { } else {
for (int64_t i = 0; OB_SUCC(ret) && i < rename_table_arg.rename_table_items_.size(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < rename_table_arg.rename_table_items_.size(); ++i) {
@ -19496,7 +19500,7 @@ int ObDDLService::drop_table_in_trans(
if (foreign_key_info.is_parent_table_mock_) { if (foreign_key_info.is_parent_table_mock_) {
// TODO:@xiaofeng.lby, delete this restriction, // TODO:@xiaofeng.lby, delete this restriction,
if (OB_NOT_NULL(drop_table_set)) { if (OB_NOT_NULL(drop_table_set)) {
if (drop_table_set->count() > 1) { if (drop_table_set->size() > 1) {
ret = OB_NOT_SUPPORTED; ret = OB_NOT_SUPPORTED;
LOG_WARN("drop multi tables with mock fks in one sql is not supported ", K(ret)); LOG_WARN("drop multi tables with mock fks in one sql is not supported ", K(ret));
} }
@ -21170,7 +21174,10 @@ int ObDDLService::drop_table(const ObDropTableArg &drop_table_arg, const obrpc::
int64_t refreshed_schema_version = 0; int64_t refreshed_schema_version = 0;
ObDDLSQLTransaction trans(schema_service_); ObDDLSQLTransaction trans(schema_service_);
DropTableIdHashSet drop_table_set; DropTableIdHashSet drop_table_set;
if (TMP_TABLE == drop_table_arg.table_type_ const int64_t drop_table_count = drop_table_arg.tables_.count();
if (OB_FAIL(drop_table_set.create(drop_table_count))) {
LOG_WARN("fail to add create ObHashSet", KR(ret));
} else if (TMP_TABLE == drop_table_arg.table_type_
|| TMP_TABLE_ORA_TRX == drop_table_arg.table_type_ || TMP_TABLE_ORA_TRX == drop_table_arg.table_type_
|| TMP_TABLE_ORA_SESS == drop_table_arg.table_type_ || TMP_TABLE_ORA_SESS == drop_table_arg.table_type_
|| TMP_TABLE_ALL == drop_table_arg.table_type_) { || TMP_TABLE_ALL == drop_table_arg.table_type_) {

2
src/share/schema/ob_schema_struct.h
View File

@ -6114,7 +6114,7 @@ inline bool ObRecycleObject::is_valid() const
return INVALID != type_ && !object_name_.empty() && !original_name_.empty(); return INVALID != type_ && !object_name_.empty() && !original_name_.empty();
} }
typedef common::hash::ObPlacementHashSet<uint64_t, common::OB_MAX_TABLE_NUM_PER_STMT> DropTableIdHashSet; typedef common::hash::ObHashSet<uint64_t> DropTableIdHashSet;
// Used to count vertical partition columns // Used to count vertical partition columns
typedef common::hash::ObPlacementHashSet<common::ObString, common::OB_MAX_USER_DEFINED_COLUMNS_COUNT> VPColumnNameHashSet; typedef common::hash::ObPlacementHashSet<common::ObString, common::OB_MAX_USER_DEFINED_COLUMNS_COUNT> VPColumnNameHashSet;