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

placeholder for 421 drop column instant.

Browse Source
This commit is contained in:
obdev
2023-12-15 10:12:57 +00:00
committed by ant-ob-hengtang
parent e6f28bb585
commit acdc64e98f
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/share/ob_ddl_common.h
View File

@ -94,6 +94,7 @@ enum ObDDLType
DDL_NORMAL_TYPE = 10001, DDL_NORMAL_TYPE = 10001,
DDL_ADD_COLUMN_ONLINE = 10002, // only add trailing columns DDL_ADD_COLUMN_ONLINE = 10002, // only add trailing columns
DDL_CHANGE_COLUMN_NAME = 10003, DDL_CHANGE_COLUMN_NAME = 10003,
DDL_DROP_COLUMN_INSTANT = 10004,
///< @note add new normal ddl type before this line ///< @note add new normal ddl type before this line
DDL_MAX DDL_MAX
}; };

9
src/share/ob_rpc_struct.cpp
View File

@ -2481,7 +2481,8 @@ OB_DEF_SERIALIZE(ObAlterTableArg)
is_add_to_scheduler_, is_add_to_scheduler_,
inner_sql_exec_addr_, inner_sql_exec_addr_,
local_session_var_, local_session_var_,
mview_refresh_info_); mview_refresh_info_,
alter_algorithm_);
return ret; return ret;
} }
@ -2572,7 +2573,8 @@ OB_DEF_DESERIALIZE(ObAlterTableArg)
is_add_to_scheduler_, is_add_to_scheduler_,
inner_sql_exec_addr_, inner_sql_exec_addr_,
local_session_var_, local_session_var_,
mview_refresh_info_); mview_refresh_info_,
alter_algorithm_);
return ret; return ret;
} }
@ -2616,7 +2618,8 @@ OB_DEF_SERIALIZE_SIZE(ObAlterTableArg)
is_add_to_scheduler_, is_add_to_scheduler_,
inner_sql_exec_addr_, inner_sql_exec_addr_,
local_session_var_, local_session_var_,
mview_refresh_info_); mview_refresh_info_,
alter_algorithm_);
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {

13
src/share/ob_rpc_struct.h
View File

@ -2102,6 +2102,12 @@ public:
ALTER_CONSTRAINT_STATE, ALTER_CONSTRAINT_STATE,
CONSTRAINT_NO_OPERATION = 1000 CONSTRAINT_NO_OPERATION = 1000
}; };
enum AlterAlgorithm
{
DEFAULT = 0, // empty
INSTANT = 1,
INPLACE = 2,
};
ObAlterTableArg(): ObAlterTableArg():
ObDDLArg(), ObDDLArg(),
session_id_(common::OB_INVALID_ID), session_id_(common::OB_INVALID_ID),
@ -2132,7 +2138,8 @@ public:
is_add_to_scheduler_(false), is_add_to_scheduler_(false),
inner_sql_exec_addr_(), inner_sql_exec_addr_(),
local_session_var_(&allocator_), local_session_var_(&allocator_),
mview_refresh_info_() mview_refresh_info_(),
alter_algorithm_(INPLACE)
{ {
} }
virtual ~ObAlterTableArg() virtual ~ObAlterTableArg()
@ -2199,7 +2206,8 @@ public:
K_(hidden_table_id), K_(hidden_table_id),
K_(inner_sql_exec_addr), K_(inner_sql_exec_addr),
K_(local_session_var), K_(local_session_var),
K_(mview_refresh_info)); K_(mview_refresh_info),
K_(alter_algorithm));
private: private:
int alloc_index_arg(const ObIndexArg::IndexActionType index_action_type, ObIndexArg *&index_arg); int alloc_index_arg(const ObIndexArg::IndexActionType index_action_type, ObIndexArg *&index_arg);
public: public:
@ -2233,6 +2241,7 @@ public:
common::ObAddr inner_sql_exec_addr_; common::ObAddr inner_sql_exec_addr_;
ObLocalSessionVar local_session_var_; ObLocalSessionVar local_session_var_;
ObMViewRefreshInfo mview_refresh_info_; ObMViewRefreshInfo mview_refresh_info_;
AlterAlgorithm alter_algorithm_;
int serialize_index_args(char *buf, const int64_t data_len, int64_t &pos) const; int serialize_index_args(char *buf, const int64_t data_len, int64_t &pos) const;
int deserialize_index_args(const char *buf, const int64_t data_len, int64_t &pos); int deserialize_index_args(const char *buf, const int64_t data_len, int64_t &pos);
int64_t get_index_args_serialize_size() const; int64_t get_index_args_serialize_size() const;