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

fix: fix the bug of table_id in ObForeignKeyArg not serialize

Browse Source
This commit is contained in:
obdev
2023-04-03 21:15:06 +00:00
committed by ob-robot
parent a615fb4f61
commit 2f1caa9dbb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/engine/dml/ob_dml_ctx_define.cpp
View File

@ -116,7 +116,7 @@ OB_SERIALIZE_MEMBER(ObTriggerArg, trigger_id_, trigger_events_.bit_value_, timin
OB_SERIALIZE_MEMBER(ObForeignKeyColumn, name_, idx_, name_idx_); OB_SERIALIZE_MEMBER(ObForeignKeyColumn, name_, idx_, name_idx_);
OB_SERIALIZE_MEMBER(ObForeignKeyArg, ref_action_, table_name_, columns_, database_name_, is_self_ref_); OB_SERIALIZE_MEMBER(ObForeignKeyArg, ref_action_, table_name_, columns_, database_name_, is_self_ref_, table_id_);
OB_SERIALIZE_MEMBER(ColumnContent, OB_SERIALIZE_MEMBER(ColumnContent,
projector_index_, projector_index_,

14
src/sql/engine/dml/ob_dml_ctx_define.h
View File

@ -282,35 +282,35 @@ public:
: ref_action_(share::schema::ACTION_INVALID), : ref_action_(share::schema::ACTION_INVALID),
database_name_(), database_name_(),
table_name_(), table_name_(),
table_id_(0),
columns_(), columns_(),
is_self_ref_(false) is_self_ref_(false),
table_id_(OB_INVALID_ID)
{} {}
ObForeignKeyArg(common::ObIAllocator &alloc) ObForeignKeyArg(common::ObIAllocator &alloc)
: ref_action_(share::schema::ACTION_INVALID), : ref_action_(share::schema::ACTION_INVALID),
database_name_(), database_name_(),
table_name_(), table_name_(),
table_id_(0),
columns_(alloc), columns_(alloc),
is_self_ref_(false) is_self_ref_(false),
table_id_(OB_INVALID_ID)
{} {}
inline void reset() inline void reset()
{ {
ref_action_ = share::schema::ACTION_INVALID; ref_action_ = share::schema::ACTION_INVALID;
database_name_.reset(); database_name_.reset();
table_name_.reset(); table_name_.reset();
table_id_ = 0; table_id_ = OB_INVALID_ID;
columns_.reset(); columns_.reset();
} }
TO_STRING_KV(K_(ref_action), K_(database_name), K_(table_name), K_(columns), K_(is_self_ref)); TO_STRING_KV(K_(ref_action), K_(database_name), K_(table_name), K_(columns), K_(is_self_ref), K_(table_id));
public: public:
share::schema::ObReferenceAction ref_action_; share::schema::ObReferenceAction ref_action_;
common::ObString database_name_; common::ObString database_name_;
common::ObString table_name_; common::ObString table_name_;
uint64_t table_id_;
common::ObFixedArray<ObForeignKeyColumn, common::ObIAllocator> columns_; common::ObFixedArray<ObForeignKeyColumn, common::ObIAllocator> columns_;
bool is_self_ref_; bool is_self_ref_;
uint64_t table_id_;
}; };
typedef common::ObFixedArray<ObForeignKeyArg, common::ObIAllocator> ObForeignKeyArgArray; typedef common::ObFixedArray<ObForeignKeyArg, common::ObIAllocator> ObForeignKeyArgArray;