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

master占位

Browse Source
This commit is contained in:
Charles0429
2024-04-11 13:45:04 +00:00
committed by ob-robot
parent 76cb9ba4a4
commit 3520d602e9
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deps/oblib/src/lib/mysqlclient/ob_mysql_proxy.h vendored
View File

@ -54,6 +54,8 @@ public:
bool is_mview_complete_refresh() const { return is_mview_complete_refresh_; } bool is_mview_complete_refresh() const { return is_mview_complete_refresh_; }
void set_refreshing_mview(const bool flag) { is_refreshing_mview_ = flag; } void set_refreshing_mview(const bool flag) { is_refreshing_mview_ = flag; }
bool is_refreshing_mview() const { return is_refreshing_mview_; } bool is_refreshing_mview() const { return is_refreshing_mview_; }
void set_retryable_ddl(const bool flag) { is_retryable_ddl_ = flag; }
bool is_retryable_ddl() const { return is_retryable_ddl_; }
TO_STRING_KV(K_(ddl_info)); TO_STRING_KV(K_(ddl_info));
OB_UNIS_VERSION(1); OB_UNIS_VERSION(1);
public: public:
@ -63,7 +65,8 @@ public:
static const int64_t IS_DDL_CHECK_DEFAULT_VALUE_BIT = 1; static const int64_t IS_DDL_CHECK_DEFAULT_VALUE_BIT = 1;
static const int64_t IS_MVIEW_COMPLETE_REFRESH_BIT = 1; static const int64_t IS_MVIEW_COMPLETE_REFRESH_BIT = 1;
static const int64_t IS_REFRESHING_MVIEW_BIT = 1; static const int64_t IS_REFRESHING_MVIEW_BIT = 1;
static const int64_t RESERVED_BIT = 64 - IS_DDL_BIT - 2 * IS_TABLE_HIDDEN_BIT - IS_HEAP_TABLE_DDL_BIT - IS_DDL_CHECK_DEFAULT_VALUE_BIT - IS_MVIEW_COMPLETE_REFRESH_BIT - IS_REFRESHING_MVIEW_BIT; static const int64_t IS_RETRYABLE_DDL_BIT = 1;
static const int64_t RESERVED_BIT = 64 - IS_DDL_BIT - 2 * IS_TABLE_HIDDEN_BIT - IS_HEAP_TABLE_DDL_BIT - IS_DDL_CHECK_DEFAULT_VALUE_BIT - IS_MVIEW_COMPLETE_REFRESH_BIT - IS_REFRESHING_MVIEW_BIT - IS_RETRYABLE_DDL_BIT;
union { union {
uint64_t ddl_info_; uint64_t ddl_info_;
struct { struct {
@ -74,6 +77,7 @@ public:
uint64_t is_ddl_check_default_value_bit_ : IS_DDL_CHECK_DEFAULT_VALUE_BIT; uint64_t is_ddl_check_default_value_bit_ : IS_DDL_CHECK_DEFAULT_VALUE_BIT;
uint64_t is_mview_complete_refresh_: IS_MVIEW_COMPLETE_REFRESH_BIT; uint64_t is_mview_complete_refresh_: IS_MVIEW_COMPLETE_REFRESH_BIT;
uint64_t is_refreshing_mview_: IS_REFRESHING_MVIEW_BIT; uint64_t is_refreshing_mview_: IS_REFRESHING_MVIEW_BIT;
uint64_t is_retryable_ddl_: IS_RETRYABLE_DDL_BIT;
uint64_t reserved_bit : RESERVED_BIT; uint64_t reserved_bit : RESERVED_BIT;
}; };
}; };

1
src/share/ob_ddl_common.h
View File

@ -100,6 +100,7 @@ enum ObDDLType
DDL_MVIEW_COMPLETE_REFRESH = 1014, DDL_MVIEW_COMPLETE_REFRESH = 1014,
DDL_CREATE_MVIEW = 1015, DDL_CREATE_MVIEW = 1015,
DDL_ALTER_COLUMN_GROUP = 1016, // alter table add/drop column group DDL_ALTER_COLUMN_GROUP = 1016, // alter table add/drop column group
DDL_MODIFY_AUTO_INCREMENT_WITH_REDEFINITION = 1017,
// @note new normal ddl type to be defined here !!! // @note new normal ddl type to be defined here !!!
DDL_NORMAL_TYPE = 10001, DDL_NORMAL_TYPE = 10001,

3
src/share/ob_rpc_struct.cpp
View File

@ -7082,6 +7082,7 @@ void ObAlterTableRes::reset()
ddl_type_ = ObDDLType::DDL_INVALID; ddl_type_ = ObDDLType::DDL_INVALID;
task_id_ = 0; task_id_ = 0;
ddl_res_array_.reset(); ddl_res_array_.reset();
ddl_need_retry_at_executor_ = false;
} }
void ObDropDatabaseRes::reset() void ObDropDatabaseRes::reset()
@ -7104,7 +7105,7 @@ int ObDropDatabaseRes::assign(const ObDropDatabaseRes &other)
OB_SERIALIZE_MEMBER(ObDropDatabaseRes, ddl_res_, affected_row_); OB_SERIALIZE_MEMBER(ObDropDatabaseRes, ddl_res_, affected_row_);
OB_SERIALIZE_MEMBER(ObAlterTableResArg, schema_type_, schema_id_, schema_version_, part_object_id_); OB_SERIALIZE_MEMBER(ObAlterTableResArg, schema_type_, schema_id_, schema_version_, part_object_id_);
OB_SERIALIZE_MEMBER(ObAlterTableRes, index_table_id_, constriant_id_, schema_version_, OB_SERIALIZE_MEMBER(ObAlterTableRes, index_table_id_, constriant_id_, schema_version_,
res_arg_array_, ddl_type_, task_id_, ddl_res_array_); res_arg_array_, ddl_type_, task_id_, ddl_res_array_, ddl_need_retry_at_executor_);
OB_SERIALIZE_MEMBER(ObGetTenantSchemaVersionArg, tenant_id_); OB_SERIALIZE_MEMBER(ObGetTenantSchemaVersionArg, tenant_id_);
OB_SERIALIZE_MEMBER(ObGetTenantSchemaVersionResult, schema_version_); OB_SERIALIZE_MEMBER(ObGetTenantSchemaVersionResult, schema_version_);
OB_SERIALIZE_MEMBER(ObTenantMemoryArg, tenant_id_, memory_size_, refresh_interval_); OB_SERIALIZE_MEMBER(ObTenantMemoryArg, tenant_id_, memory_size_, refresh_interval_);

7
src/share/ob_rpc_struct.h
View File

@ -8639,7 +8639,8 @@ public:
res_arg_array_(), res_arg_array_(),
ddl_type_(share::DDL_INVALID), ddl_type_(share::DDL_INVALID),
task_id_(0), task_id_(0),
ddl_res_array_() ddl_res_array_(),
ddl_need_retry_at_executor_(false)
{} {}
void reset(); void reset();
int assign(const ObAlterTableRes &other) { int assign(const ObAlterTableRes &other) {
@ -8654,12 +8655,13 @@ public:
} else { } else {
ddl_type_ = other.ddl_type_; ddl_type_ = other.ddl_type_;
task_id_ = other.task_id_; task_id_ = other.task_id_;
ddl_need_retry_at_executor_ = other.ddl_need_retry_at_executor_;
} }
return ret; return ret;
} }
public: public:
TO_STRING_KV(K_(index_table_id), K_(constriant_id), K_(schema_version), TO_STRING_KV(K_(index_table_id), K_(constriant_id), K_(schema_version),
K_(res_arg_array), K_(ddl_type), K_(task_id)); K_(res_arg_array), K_(ddl_type), K_(task_id), K_(ddl_need_retry_at_executor));
uint64_t index_table_id_; uint64_t index_table_id_;
uint64_t constriant_id_; uint64_t constriant_id_;
int64_t schema_version_; int64_t schema_version_;
@ -8667,6 +8669,7 @@ public:
share::ObDDLType ddl_type_; share::ObDDLType ddl_type_;
int64_t task_id_; int64_t task_id_;
common::ObSArray<ObDDLRes> ddl_res_array_; common::ObSArray<ObDDLRes> ddl_res_array_;
bool ddl_need_retry_at_executor_;
}; };
struct ObDropDatabaseRes final struct ObDropDatabaseRes final