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

remove tablet_space_usage in migration_tablet_param

Browse Source
This commit is contained in:
gaishun
2024-03-05 08:15:20 +00:00
committed by ob-robot
parent 00a96a68fa
commit f6bdfdfccf
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/tablet/ob_tablet_meta.cpp
View File

@ -1021,8 +1021,6 @@ int ObMigrationTabletParam::serialize(char *buf, const int64_t len, int64_t &pos
LOG_WARN("failed to serialize transfer info", K(ret), K(len), K(new_pos), K_(transfer_info));
} else if (new_pos - pos < length && OB_FAIL(serialization::encode_i64(buf, len, new_pos, create_schema_version_))) {
LOG_WARN("failed to serialize create schema version", K(ret), K(len), K(new_pos), K_(create_schema_version));
} else if (new_pos - pos < length && OB_FAIL(space_usage_.serialize(buf, len, new_pos))) {
LOG_WARN("failed to serialize tablet space usage", K(ret), K(len), K(new_pos), K_(space_usage));
} else if (OB_UNLIKELY(length != new_pos - pos)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("length doesn't match standard length", K(ret), K(new_pos), K(pos), K(length));
@ -1104,8 +1102,6 @@ int ObMigrationTabletParam::deserialize_v2(const char *buf, const int64_t len, i
LOG_WARN("failed to deserialize transfer info", K(ret), K(len), K(new_pos));
} else if (new_pos - pos < length && OB_FAIL(serialization::decode_i64(buf, len, new_pos, &create_schema_version_))) {
LOG_WARN("failed to deserialize create schema version", K(ret), K(len));
} else if (new_pos - pos < length && OB_FAIL(space_usage_.deserialize(buf, len, new_pos))) {
LOG_WARN("failed to serialize tablet space usage", K(ret), K(len), K(new_pos));
} else if (OB_UNLIKELY(length != new_pos - pos)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tablet's length doesn't match standard length", K(ret), K(new_pos), K(pos), K(length), KPC(this));
@ -1189,8 +1185,6 @@ int ObMigrationTabletParam::deserialize_v1(const char *buf, const int64_t len, i
LOG_WARN("failed to deserialize max sync medium snapshot", K(ret), K(len), K(new_pos));
} else if (new_pos - pos < length && OB_FAIL(ddl_commit_scn_.fixed_deserialize(buf, len, new_pos))) {
LOG_WARN("failed to deserialize ddl commit scn", K(ret), K(len), K(new_pos));
} else if (new_pos - pos < length && OB_FAIL(space_usage_.deserialize(buf, len, new_pos))) {
LOG_WARN("failed to serialize tablet space usage", K(ret), K(len), K(new_pos));
} else if (OB_UNLIKELY(length != new_pos - pos)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tablet's length doesn't match standard length", K(ret), K(new_pos), K(pos), K(length), KPC(this));
@ -1352,7 +1346,6 @@ int ObMigrationTabletParam::assign(const ObMigrationTabletParam &param)
ddl_commit_scn_ = param.ddl_commit_scn_;
mds_checkpoint_scn_ = param.mds_checkpoint_scn_;
transfer_info_ = param.transfer_info_;
space_usage_ = param.space_usage_;
if (OB_FAIL(mds_data_.assign(param.mds_data_, allocator_))) {
LOG_WARN("failed to assign mds data", K(ret), K(param));
} else if (is_empty_shell()) {

4
src/storage/tablet/ob_tablet_meta.h
View File

@ -253,8 +253,7 @@ public:
K_(mds_checkpoint_scn),
K_(mds_data),
K_(transfer_info),
K_(create_schema_version),
K_(space_usage));
K_(create_schema_version));
private:
int deserialize_v2(const char *buf, const int64_t len, int64_t &pos);
int deserialize_v1(const char *buf, const int64_t len, int64_t &pos);
@ -297,7 +296,6 @@ public:
ObTabletFullMemoryMdsData mds_data_;
ObTabletTransferInfo transfer_info_;
int64_t create_schema_version_;
ObTabletSpaceUsage space_usage_;
// Add new serialization member before this line, below members won't serialize
common::ObArenaAllocator allocator_; // for storage schema