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

[CP] Move the serialization of max_bit_count_ to the end.

Browse Source
This commit is contained in:
obdev
2023-10-07 07:09:36 +00:00
committed by ob-robot
parent 4063bc9368
commit 3c29a17408
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/engine/px/ob_px_bloom_filter.cpp
View File

@ -405,13 +405,13 @@ OB_DEF_SERIALIZE(ObPxBloomFilter)
bits_array_length_, bits_array_length_,
true_count_, true_count_,
begin_idx_, begin_idx_,
end_idx_, end_idx_);
max_bit_count_);
for (int i = begin_idx_; OB_SUCC(ret) && i <= end_idx_; ++i) { for (int i = begin_idx_; OB_SUCC(ret) && i <= end_idx_; ++i) {
if (OB_FAIL(serialization::encode(buf, buf_len, pos, bits_array_[i]))) { if (OB_FAIL(serialization::encode(buf, buf_len, pos, bits_array_[i]))) {
LOG_WARN("fail to encode bits data", K(ret), K(bits_array_[i])); LOG_WARN("fail to encode bits data", K(ret), K(bits_array_[i]));
} }
} }
OB_UNIS_ENCODE(max_bit_count_);
return ret; return ret;
} }
@ -427,8 +427,7 @@ OB_DEF_DESERIALIZE(ObPxBloomFilter)
bits_array_length_, bits_array_length_,
true_count_, true_count_,
begin_idx_, begin_idx_,
end_idx_, end_idx_);
max_bit_count_);
int64_t real_len = end_idx_ - begin_idx_ + 1; int64_t real_len = end_idx_ - begin_idx_ + 1;
bits_array_length_ = real_len; bits_array_length_ = real_len;
void *bits_array_buf = NULL; void *bits_array_buf = NULL;
@ -451,6 +450,7 @@ OB_DEF_DESERIALIZE(ObPxBloomFilter)
: &ObPxBloomFilter::might_contain_nonsimd; : &ObPxBloomFilter::might_contain_nonsimd;
} }
} }
OB_UNIS_DECODE(max_bit_count_);
return ret; return ret;
} }
@ -466,11 +466,11 @@ OB_DEF_SERIALIZE_SIZE(ObPxBloomFilter)
bits_array_length_, bits_array_length_,
true_count_, true_count_,
begin_idx_, begin_idx_,
end_idx_, end_idx_);
max_bit_count_);
for (int i = begin_idx_; i <= end_idx_; ++i) { for (int i = begin_idx_; i <= end_idx_; ++i) {
len += serialization::encoded_length(bits_array_[i]); len += serialization::encoded_length(bits_array_[i]);
} }
OB_UNIS_ADD_LEN(max_bit_count_);
return len; return len;
} }

5
src/sql/engine/px/p2p_datahub/ob_p2p_dh_rpc_proxy.cpp
View File

@ -38,6 +38,11 @@ OB_DEF_DESERIALIZE(ObPxP2PDatahubArg)
} else { } else {
OB_UNIS_DECODE(*msg_); OB_UNIS_DECODE(*msg_);
} }
if (OB_FAIL(ret) && OB_NOT_NULL(msg_)) {
// DECODE failed, must destroy msg.
msg_->destroy();
msg_ = nullptr;
}
return ret; return ret;
} }