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

Fix modify col not null failed when retry modify hidden table not null column state

Browse Source
This commit is contained in:
Hongqin-Li
2022-12-13 13:41:33 +00:00
committed by ob-robot
parent d10cb122d7
commit d1e99a65ab
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/rootserver/ob_ddl_service.cpp
View File

@ -15348,6 +15348,8 @@ int ObDDLService::modify_hidden_table_fk_state(obrpc::ObAlterTableArg &alter_tab
if (OB_ISNULL(col_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("column schema not found", K(ret), K(hidden_column_id));
} else if (!col_schema->is_nullable()) {
LOG_INFO("column already not null", K(alter_table_arg.hidden_table_id_), K(hidden_column_id));
} else {
ObColumnSchemaV2 new_col_schema = *col_schema;
new_col_schema.set_nullable(false);
@ -15380,6 +15382,7 @@ int ObDDLService::modify_hidden_table_fk_state(obrpc::ObAlterTableArg &alter_tab
}
}
}
DEBUG_SYNC(MODIFY_HIDDEN_TABLE_NOT_NULL_COLUMN_STATE_BEFORE_PUBLISH_SCHEMA);
int tmp_ret = OB_SUCCESS;
if (OB_FAIL(ret)) {
} else if (OB_SUCCESS != (tmp_ret = publish_schema(tenant_id))) {

1
src/share/ob_debug_sync_point.h
View File

@ -426,6 +426,7 @@ class ObString;
ACT(ALTER_LS_CHOOSE_SRC,)\
ACT(BEFORE_LOCK_SERVICE_UNLOCK,)\
ACT(DDL_CHECK_TABLET_MERGE_STATUS,)\
ACT(MODIFY_HIDDEN_TABLE_NOT_NULL_COLUMN_STATE_BEFORE_PUBLISH_SCHEMA,)\
ACT(MAX_DEBUG_SYNC_POINT,)
DECLARE_ENUM(ObDebugSyncPoint, debug_sync_point, OB_DEBUG_SYNC_POINT_DEF);