diff --git a/src/observer/ob_inner_sql_rpc_proxy.h b/src/observer/ob_inner_sql_rpc_proxy.h index 660bc13b0..0b1b38cf9 100644 --- a/src/observer/ob_inner_sql_rpc_proxy.h +++ b/src/observer/ob_inner_sql_rpc_proxy.h @@ -52,6 +52,7 @@ public: OPERATION_TYPE_UNLOCK_ALONE_TABLET = 18, OPERATION_TYPE_LOCK_OBJS = 19, OPERATION_TYPE_UNLOCK_OBJS = 20, + OPERATION_TYPE_REPLACE_LOCK = 21, OPERATION_TYPE_MAX = 100 }; diff --git a/src/share/ob_rpc_struct.cpp b/src/share/ob_rpc_struct.cpp index 6ebb3b17d..b50140c10 100644 --- a/src/share/ob_rpc_struct.cpp +++ b/src/share/ob_rpc_struct.cpp @@ -3427,7 +3427,8 @@ OB_SERIALIZE_MEMBER((ObCreateIndexArg, ObIndexArg), exist_all_column_group_, index_cgs_, vidx_refresh_info_, - is_rebuild_index_ + is_rebuild_index_, + is_index_scope_specified_ ); int ObCreateAuxIndexArg::assign(const ObCreateAuxIndexArg &other) diff --git a/src/storage/ddl/ob_ddl_clog.h b/src/storage/ddl/ob_ddl_clog.h index a1e8f8622..a5a115dc1 100644 --- a/src/storage/ddl/ob_ddl_clog.h +++ b/src/storage/ddl/ob_ddl_clog.h @@ -34,6 +34,9 @@ enum class ObDDLClogType : int64_t DDL_TABLET_SCHEMA_VERSION_CHANGE_LOG = 0x10, DDL_START_LOG = 0x20, DDL_COMMIT_LOG = 0x40,// rename from DDL_PREPARE_LOG + DDL_TABLET_SPLIT_START_LOG = 0x41, + DDL_TABLET_SPLIT_FINISH_LOG = 0x42, + DDL_TABLET_FREEZE_LOG = 0x43, DDL_FINISH_LOG = 0x80,// finish log, smilarity role in shared storage mode }; diff --git a/src/storage/tablelock/ob_table_lock_rpc_struct.cpp b/src/storage/tablelock/ob_table_lock_rpc_struct.cpp index 3d186f08c..0c20e4984 100644 --- a/src/storage/tablelock/ob_table_lock_rpc_struct.cpp +++ b/src/storage/tablelock/ob_table_lock_rpc_struct.cpp @@ -59,7 +59,8 @@ OB_SERIALIZE_MEMBER_INHERIT(ObLockTableRequest, ObLockRequest, detect_param_); OB_SERIALIZE_MEMBER_INHERIT(ObLockPartitionRequest, ObLockTableRequest, - part_object_id_); + part_object_id_, + is_sub_part_); OB_SERIALIZE_MEMBER_INHERIT(ObLockTabletRequest, ObLockTableRequest, tablet_id_); diff --git a/src/storage/tablelock/ob_table_lock_rpc_struct.h b/src/storage/tablelock/ob_table_lock_rpc_struct.h index 6a6dda29c..b4c4234f3 100644 --- a/src/storage/tablelock/ob_table_lock_rpc_struct.h +++ b/src/storage/tablelock/ob_table_lock_rpc_struct.h @@ -265,7 +265,7 @@ struct ObLockPartitionRequest : public ObLockTableRequest { OB_UNIS_VERSION_V(1); public: - ObLockPartitionRequest() : ObLockTableRequest(), part_object_id_(0) + ObLockPartitionRequest() : ObLockTableRequest(), part_object_id_(0), is_sub_part_(false) { type_ = ObLockMsgType::LOCK_PARTITION_REQ; } virtual ~ObLockPartitionRequest() { reset(); } virtual void reset(); @@ -273,6 +273,7 @@ public: INHERIT_TO_STRING_KV("ObLockTableRequest", ObLockTableRequest, K_(part_object_id)); public: uint64_t part_object_id_; + bool is_sub_part_; }; struct ObUnLockPartitionRequest : public ObLockPartitionRequest