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

[CP] fix json bin get_serialize_size var_type calc

Browse Source
This commit is contained in:
shadowao
2024-04-30 13:23:53 +00:00
committed by ob-robot
parent 108e3f48fd
commit 6411ffe4a0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
deps/oblib/src/lib/json_type/ob_json_bin.cpp vendored
View File

@ -3350,16 +3350,16 @@ int ObJsonBin::rebuild_json_object_v0(ObJsonBuffer &result) const
uint64_t element_count = this->element_count(); uint64_t element_count = this->element_count();
ObJsonBin dst_bin; ObJsonBin dst_bin;
ObJsonBinMeta meta; ObJsonBinMeta meta;
uint64_t obj_size = 0; uint64_t new_obj_size = 0;
if (OB_FAIL(this->get_serialize_size(obj_size))) { if (OB_FAIL(this->get_serialize_size(new_obj_size))) {
LOG_WARN("get_serialize_size fail", K(ret), K(meta_)); LOG_WARN("get_serialize_size fail", K(ret), K(meta_));
} else { } else {
meta.set_type(get_object_vertype(), false); meta.set_type(get_object_vertype(), false);
meta.set_element_count(element_count); meta.set_element_count(element_count);
meta.set_element_count_var_type(ObJsonVar::get_var_type(element_count)); meta.set_element_count_var_type(ObJsonVar::get_var_type(element_count));
meta.set_obj_size(obj_size); meta.set_obj_size(new_obj_size);
meta.set_obj_size_var_type(ObJsonVar::get_var_type(obj_size)); meta.set_obj_size_var_type(OB_MAX(entry_var_type(), ObJsonVar::get_var_type(new_obj_size)));
meta.set_entry_var_type(meta.obj_size_var_type()); meta.set_entry_var_type(meta.obj_size_var_type());
meta.set_is_continuous(true); meta.set_is_continuous(true);
meta.calc_entry_array(); meta.calc_entry_array();
@ -3433,7 +3433,7 @@ int ObJsonBin::rebuild_json_array_v0(ObJsonBuffer &result) const
meta.set_element_count(element_count); meta.set_element_count(element_count);
meta.set_element_count_var_type(ObJsonVar::get_var_type(element_count)); meta.set_element_count_var_type(ObJsonVar::get_var_type(element_count));
meta.set_obj_size(new_obj_size); meta.set_obj_size(new_obj_size);
meta.set_obj_size_var_type(ObJsonVar::get_var_type(new_obj_size)); meta.set_obj_size_var_type(OB_MAX(entry_var_type(), ObJsonVar::get_var_type(new_obj_size)));
meta.set_entry_var_type(meta.obj_size_var_type()); meta.set_entry_var_type(meta.obj_size_var_type());
meta.set_is_continuous(true); meta.set_is_continuous(true);
meta.calc_entry_array(); meta.calc_entry_array();