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

fix the upgrade compatibility issues caused by is_normal_cgs_at_the_end_

Browse Source
This commit is contained in:
HoniiTro19
2024-11-26 21:46:14 +00:00
committed by ob-robot
parent 364a24f416
commit ab03cebf7c
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/share/schema/ob_table_param.cpp
View File

@ -629,9 +629,9 @@ ObTableParam::ObTableParam(ObIAllocator &allocator)
is_fts_index_(false), is_fts_index_(false),
is_multivalue_index_(false), is_multivalue_index_(false),
is_column_replica_table_(false), is_column_replica_table_(false),
is_normal_cgs_at_the_end_(false),
is_vec_index_(false), is_vec_index_(false),
is_partition_table_(false) is_partition_table_(false),
is_normal_cgs_at_the_end_(false)
{ {
reset(); reset();
} }
@ -661,9 +661,9 @@ void ObTableParam::reset()
is_fts_index_ = false; is_fts_index_ = false;
is_multivalue_index_ = false; is_multivalue_index_ = false;
is_column_replica_table_ = false; is_column_replica_table_ = false;
is_normal_cgs_at_the_end_ = false;
is_vec_index_ = false; is_vec_index_ = false;
is_partition_table_ = false; is_partition_table_ = false;
is_normal_cgs_at_the_end_ = false;
} }
OB_DEF_SERIALIZE(ObTableParam) OB_DEF_SERIALIZE(ObTableParam)
@ -705,15 +705,15 @@ OB_DEF_SERIALIZE(ObTableParam)
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
OB_UNIS_ENCODE(is_column_replica_table_); OB_UNIS_ENCODE(is_column_replica_table_);
} }
if (OB_SUCC(ret)) {
OB_UNIS_ENCODE(is_normal_cgs_at_the_end_);
}
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
OB_UNIS_ENCODE(is_vec_index_); OB_UNIS_ENCODE(is_vec_index_);
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
OB_UNIS_ENCODE(is_partition_table_); OB_UNIS_ENCODE(is_partition_table_);
} }
if (OB_SUCC(ret)) {
OB_UNIS_ENCODE(is_normal_cgs_at_the_end_);
}
return ret; return ret;
} }
@ -802,10 +802,6 @@ OB_DEF_DESERIALIZE(ObTableParam)
LST_DO_CODE(OB_UNIS_DECODE, LST_DO_CODE(OB_UNIS_DECODE,
is_column_replica_table_); is_column_replica_table_);
} }
if (OB_SUCC(ret)) {
LST_DO_CODE(OB_UNIS_DECODE,
is_normal_cgs_at_the_end_);
}
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
LST_DO_CODE(OB_UNIS_DECODE, LST_DO_CODE(OB_UNIS_DECODE,
is_vec_index_); is_vec_index_);
@ -814,6 +810,10 @@ OB_DEF_DESERIALIZE(ObTableParam)
LST_DO_CODE(OB_UNIS_DECODE, LST_DO_CODE(OB_UNIS_DECODE,
is_partition_table_); is_partition_table_);
} }
if (OB_SUCC(ret)) {
LST_DO_CODE(OB_UNIS_DECODE,
is_normal_cgs_at_the_end_);
}
return ret; return ret;
} }
@ -858,10 +858,6 @@ OB_DEF_SERIALIZE_SIZE(ObTableParam)
LST_DO_CODE(OB_UNIS_ADD_LEN, LST_DO_CODE(OB_UNIS_ADD_LEN,
is_column_replica_table_); is_column_replica_table_);
} }
if (OB_SUCC(ret)) {
LST_DO_CODE(OB_UNIS_ADD_LEN,
is_normal_cgs_at_the_end_);
}
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
LST_DO_CODE(OB_UNIS_ADD_LEN, LST_DO_CODE(OB_UNIS_ADD_LEN,
is_vec_index_); is_vec_index_);
@ -871,6 +867,10 @@ OB_DEF_SERIALIZE_SIZE(ObTableParam)
LST_DO_CODE(OB_UNIS_ADD_LEN, LST_DO_CODE(OB_UNIS_ADD_LEN,
is_partition_table_); is_partition_table_);
} }
if (OB_SUCC(ret)) {
LST_DO_CODE(OB_UNIS_ADD_LEN,
is_normal_cgs_at_the_end_);
}
return len; return len;
} }

3
src/share/schema/ob_table_param.h
View File

@ -413,9 +413,10 @@ private:
bool is_fts_index_; bool is_fts_index_;
bool is_multivalue_index_; bool is_multivalue_index_;
bool is_column_replica_table_; bool is_column_replica_table_;
bool is_normal_cgs_at_the_end_;
bool is_vec_index_; bool is_vec_index_;
bool is_partition_table_; bool is_partition_table_;
// column storage tables created after v435 will place the rowkey/all cg at the start of the table schema column group array
bool is_normal_cgs_at_the_end_;
}; };
} //namespace schema } //namespace schema
} //namespace share } //namespace share