diff --git a/deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h b/deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h index fd279218af..603f00fe55 100644 --- a/deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h +++ b/deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h @@ -1094,4 +1094,3 @@ PCODE_DEF(OB_CREATE_TRIGGER_WITH_RES, 0x160D) //PCODE_DEF(OB_NOTIFY_CLONE_SCHEDULER, 0x1616) //PCODE_DEF(OB_CLONE_KEY, 0x1617) //PCODE_DEF(OB_TRIM_KEY_LIST, 0x1618) -//PCODE_DEF(OB_RECYCLE_CLONE_JOB, 0x1619) diff --git a/src/objit/include/objit/common/ob_item_type.h b/src/objit/include/objit/common/ob_item_type.h index f4be2edb5b..ba49daaabc 100755 --- a/src/objit/include/objit/common/ob_item_type.h +++ b/src/objit/include/objit/common/ob_item_type.h @@ -2315,6 +2315,13 @@ typedef enum ObItemType T_COL_SKIP_INDEX_SUM, T_ALTER_SYSTEM_RESET, T_ALTER_SYSTEM_RESET_PARAMETER, + + //tenant clone + T_CREATE_TENANT_SNAPSHOT, + T_DROP_TENANT_SNAPSHOT, + T_CLONE_TENANT, + T_CANCEL_CLONE, + T_MAX //Attention: add a new type before T_MAX } ObItemType; diff --git a/src/share/ob_rpc_struct.cpp b/src/share/ob_rpc_struct.cpp index 39ef2748cd..c86b2b3f72 100755 --- a/src/share/ob_rpc_struct.cpp +++ b/src/share/ob_rpc_struct.cpp @@ -1058,7 +1058,8 @@ DEF_TO_STRING(ObDropResourcePoolArg) OB_SERIALIZE_MEMBER((ObDropResourcePoolArg, ObDDLArg), pool_name_, - if_exist_); + if_exist_, + pool_id_); OB_SERIALIZE_MEMBER(ObCmdArg, diff --git a/src/share/ob_rpc_struct.h b/src/share/ob_rpc_struct.h index 3598171b69..285b7fdf19 100755 --- a/src/share/ob_rpc_struct.h +++ b/src/share/ob_rpc_struct.h @@ -464,7 +464,8 @@ struct ObDropResourcePoolArg : public ObDDLArg public: ObDropResourcePoolArg(): ObDDLArg(), - if_exist_(false) + if_exist_(false), + pool_id_(OB_INVALID_ID) {} virtual ~ObDropResourcePoolArg() {} bool is_valid() const; @@ -474,6 +475,7 @@ public: common::ObString pool_name_; bool if_exist_; + uint64_t pool_id_; }; struct ObCmdArg diff --git a/src/sql/resolver/ob_stmt_type.h b/src/sql/resolver/ob_stmt_type.h index 860c4e1c8a..f499de1f14 100644 --- a/src/sql/resolver/ob_stmt_type.h +++ b/src/sql/resolver/ob_stmt_type.h @@ -290,7 +290,7 @@ OB_STMT_TYPE_DEF_UNKNOWN_AT(T_CANCEL_RECOVER_TABLE, get_sys_tenant_alter_system_ // OB_STMT_TYPE_DEF_UNKNOWN_AT(T_DROP_TENANT_SNAPSHOT, get_sys_tenant_alter_system_priv, 291) OB_STMT_TYPE_DEF(T_ALTER_SYSTEM_RESET_PARAMETER, get_sys_tenant_alter_system_priv, 292, ACTION_TYPE_ALTER_SYSTEM) // OB_STMT_TYPE_DEF_UNKNOWN_AT(T_CLONE_TENANT, get_sys_tenant_alter_system_priv, 293) -// OB_STMT_TYPE_DEF_UNKNOWN_AT(T_RECYCLE_CLONE_JOB, get_sys_tenant_alter_system_priv, 294) +// OB_STMT_TYPE_DEF_UNKNOWN_AT(T_CANCEL_CLONE, get_sys_tenant_alter_system_priv, 294) // OB_STMT_TYPE_DEF_UNKNOWN_AT(T_CREATE_MLOG, get_create_mlog_stmt_need_privs, 295) // OB_STMT_TYPE_DEF_UNKNOWN_AT(T_DROP_MLOG, get_drop_mlog_stmt_need_privs, 296) // OB_STMT_TYPE_DEF_UNKNOWN_AT(T_TRANSFER_PARTITION, get_sys_tenant_alter_system_priv, 297)