diff --git a/src/rootserver/ddl_task/ob_ddl_task.cpp b/src/rootserver/ddl_task/ob_ddl_task.cpp index 1d976f8416..b727500d8a 100644 --- a/src/rootserver/ddl_task/ob_ddl_task.cpp +++ b/src/rootserver/ddl_task/ob_ddl_task.cpp @@ -802,6 +802,18 @@ int ObDDLTask::get_ddl_type_str(const int64_t ddl_type, const char *&ddl_type_st case DDL_DROP_MLOG: ddl_type_str = "drop materialized view log"; break; + case DDL_AUTO_SPLIT_BY_RANGE: + ddl_type_str = "auto split by range"; + break; + case DDL_AUTO_SPLIT_NON_RANGE: + ddl_type_str = "auto split non range"; + break; + case DDL_MANUAL_SPLIT_BY_RANGE: + ddl_type_str = "manual split by range"; + break; + case DDL_MANUAL_SPLIT_NON_RANGE: + ddl_type_str = "manual split non range"; + break; default: ret = OB_ERR_UNEXPECTED; } diff --git a/src/rootserver/ob_ddl_service.cpp b/src/rootserver/ob_ddl_service.cpp index 6f9f96d91b..cfc2b439e1 100755 --- a/src/rootserver/ob_ddl_service.cpp +++ b/src/rootserver/ob_ddl_service.cpp @@ -11267,6 +11267,14 @@ const char* ObDDLService::ddl_type_str(const ObDDLType ddl_type) str = "create materialized view log"; } else if (DDL_DROP_MLOG == ddl_type) { str = "drop materialized view log"; + } else if (DDL_AUTO_SPLIT_BY_RANGE == ddl_type) { + str = "auto split by range"; + } else if (DDL_AUTO_SPLIT_NON_RANGE == ddl_type) { + str = "auto split by non range"; + } else if (DDL_MANUAL_SPLIT_BY_RANGE == ddl_type) { + str = "manual split by range"; + } else if (DDL_MANUAL_SPLIT_NON_RANGE == ddl_type) { + str = "manual split non range"; } return str; diff --git a/src/share/ob_ddl_common.h b/src/share/ob_ddl_common.h index db5aeef6bf..0820019abe 100644 --- a/src/share/ob_ddl_common.h +++ b/src/share/ob_ddl_common.h @@ -64,6 +64,11 @@ enum ObDDLType DDL_DROP_MLOG = 9, DDL_CREATE_PARTITIONED_LOCAL_INDEX = 10, DDL_DROP_LOB = 11, + ///< @note tablet split. + DDL_AUTO_SPLIT_BY_RANGE = 100, + DDL_AUTO_SPLIT_NON_RANGE = 101, + DDL_MANUAL_SPLIT_BY_RANGE = 102, + DDL_MANUAL_SPLIT_NON_RANGE = 103, ///< @note Drop schema, and refuse concurrent trans. DDL_DROP_SCHEMA_AVOID_CONCURRENT_TRANS = 500, DDL_DROP_DATABASE = 501, @@ -143,6 +148,11 @@ enum ObDDLTaskStatus { WAIT_CHILD_TASK_FINISH = 16, REPENDING = 17, START_REFRESH_MVIEW_TASK = 18, + WAIT_FROZE_END = 19, + WAIT_COMPACTION_END = 20, + WAIT_DATA_TABLE_SPLIT_END = 21, + WAIT_LOCAL_INDEX_SPLIT_END = 22, + WAIT_LOB_TABLE_SPLIT_END = 23, FAIL = 99, SUCCESS = 100 }; @@ -217,6 +227,21 @@ static const char* ddl_task_status_to_str(const ObDDLTaskStatus &task_status) { case ObDDLTaskStatus::START_REFRESH_MVIEW_TASK: str = "START_REFRESH_MVIEW_TASK"; break; + case ObDDLTaskStatus::WAIT_FROZE_END: + str = "WAIT_FROZE_END"; + break; + case ObDDLTaskStatus::WAIT_COMPACTION_END: + str = "WAIT_COMPACTION_END"; + break; + case ObDDLTaskStatus::WAIT_DATA_TABLE_SPLIT_END: + str = "WAIT_DATA_TABLE_SPLIT_END"; + break; + case ObDDLTaskStatus::WAIT_LOCAL_INDEX_SPLIT_END: + str = "WAIT_LOCAL_INDEX_SPLIT_END"; + break; + case ObDDLTaskStatus::WAIT_LOB_TABLE_SPLIT_END: + str = "WAIT_LOB_TABLE_SPLIT_END"; + break; case ObDDLTaskStatus::FAIL: str = "FAIL"; break; diff --git a/src/share/ob_debug_sync_point.h b/src/share/ob_debug_sync_point.h index b9ef358be6..8bee2a0ccc 100755 --- a/src/share/ob_debug_sync_point.h +++ b/src/share/ob_debug_sync_point.h @@ -338,6 +338,11 @@ class ObString; ACT(COLUMN_REDEFINITION_COPY_TABLE_CONSTRAINTS,)\ ACT(COLUMN_REDEFINITION_COPY_TABLE_FOREIGN_KEYS,)\ ACT(COLUMN_REDEFINITION_TAKE_EFFECT,)\ + ACT(PARTITION_SPLIT_WAIT_FREEZE_END,)\ + ACT(PARTITION_SPLIT_WAIT_COMPACTION_END,)\ + ACT(PARTITION_SPLIT_WAIT_DATA_TABLET_SPLIT_END,)\ + ACT(PARTITION_SPLIT_WAIT_LOCAL_INDEX_SPLIT_END,)\ + ACT(PARTITION_SPLIT_WAIT_LOB_TABLET_SPLIT_END,)\ ACT(CREATE_INDEX_WAIT_TRANS_END,)\ ACT(CREATE_INDEX_REPLICA_BUILD,)\ ACT(CREATE_INDEX_VERIFY_CHECKSUM,)\