diff --git a/src/rootserver/ob_ddl_service.cpp b/src/rootserver/ob_ddl_service.cpp index b3f573f5e5..27006807c6 100644 --- a/src/rootserver/ob_ddl_service.cpp +++ b/src/rootserver/ob_ddl_service.cpp @@ -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))) { diff --git a/src/share/ob_debug_sync_point.h b/src/share/ob_debug_sync_point.h index e255c8201c..7dc5ad3cb1 100644 --- a/src/share/ob_debug_sync_point.h +++ b/src/share/ob_debug_sync_point.h @@ -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);