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

[BUGFIX]fix lob read 4.0 data with force inrow

Browse Source
This commit is contained in:
obdev
2023-03-17 10:10:52 +00:00
committed by ob-robot
parent e62876d1ad
commit bbd67d669d
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
deps/oblib/src/common/object/ob_object.cpp vendored
View File

@ -621,7 +621,8 @@ int ObLobLocatorV2::get_inrow_data(ObString &inrow_data) const
int64_t handle_size = disk_loc->get_handle_size(byte_size); int64_t handle_size = disk_loc->get_handle_size(byte_size);
if (byte_size + handle_size + handle_offset > size_) { if (byte_size + handle_size + handle_offset > size_) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
COMMON_LOG(WARN, "Lob: invalid inrow data", K(ret), K(byte_size), K(handle_size), K(*disk_loc), K(handle_offset)); COMMON_LOG(WARN, "Lob: invalid inrow data", K(ret), K(byte_size), K(handle_size),
K(*disk_loc), K(handle_offset), K(size_));
} else { } else {
inrow_data.assign_ptr(disk_loc_buff.ptr() + handle_size, byte_size); inrow_data.assign_ptr(disk_loc_buff.ptr() + handle_size, byte_size);
} }

32
src/storage/lob/ob_lob_locator.cpp
View File

@ -465,6 +465,15 @@ int ObLobLocatorHelper::build_lob_locatorv2(ObLobLocatorV2 &locator,
bool has_extern = (!is_simple) && (lib::is_oracle_mode() || !is_dst_inrow); bool has_extern = (!is_simple) && (lib::is_oracle_mode() || !is_dst_inrow);
ObMemLobExternFlags extern_flags(has_extern); ObMemLobExternFlags extern_flags(has_extern);
bool padding_char_size = false;
if (!lob_common->in_row_ && is_dst_inrow &&
out_payload_len == ObLobManager::LOB_WITH_OUTROW_CTX_SIZE) {
// for 4.0 lob, outrow disk lob locator do force inrow
// not have char len, should do padding
out_payload_len += sizeof(uint64_t);
padding_char_size = true;
}
if (!is_src_inrow && is_dst_inrow) { if (!is_src_inrow && is_dst_inrow) {
// read outrow lobs but output as inrow lobs, need to calc the output payload lens // read outrow lobs but output as inrow lobs, need to calc the output payload lens
// get byte size of out row lob, and calc total disk lob handle size if it is inrow // get byte size of out row lob, and calc total disk lob handle size if it is inrow
@ -533,16 +542,24 @@ int ObLobLocatorHelper::build_lob_locatorv2(ObLobLocatorV2 &locator,
} }
} else if ((!is_src_inrow) && is_dst_inrow) { //src outrow, load to inrow result } else if ((!is_src_inrow) && is_dst_inrow) { //src outrow, load to inrow result
OB_ASSERT(payload.length() >= sizeof(ObLobCommon)); OB_ASSERT(payload.length() >= sizeof(ObLobCommon));
storage::ObLobManager* lob_mngr = MTL(storage::ObLobManager*);
ObString disk_loc_str; ObString disk_loc_str;
if (OB_FAIL(locator.get_disk_locator(disk_loc_str))) { if (OB_FAIL(locator.get_disk_locator(disk_loc_str))) {
STORAGE_LOG(WARN, "Lob: get disk locator failed", K(ret), K(column_id)); STORAGE_LOG(WARN, "Lob: get disk locator failed", K(ret), K(column_id));
} else if (OB_ISNULL(lob_mngr)) {
ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "Lob: get ObLobManager null", K(ret));
} else { } else {
char *buffer = disk_loc_str.ptr(); char *buffer = disk_loc_str.ptr();
MEMCPY(buffer, lob_common, payload.length()); MEMCPY(buffer, lob_common, payload.length());
int64_t offset = payload.length(); int64_t offset = payload.length();
uint64_t *char_len_ptr = nullptr;
if (padding_char_size) {
char_len_ptr = reinterpret_cast<uint64_t*>(buffer + offset);
offset += sizeof(uint64_t);
}
// read full data to new locator // read full data to new locator
storage::ObLobManager* lob_mngr = MTL(storage::ObLobManager*);
ObLobAccessParam param; ObLobAccessParam param;
param.tx_desc_ = NULL; param.tx_desc_ = NULL;
param.snapshot_.core_.tx_id_ = tx_id_; param.snapshot_.core_.tx_id_ = tx_id_;
@ -568,11 +585,18 @@ int ObLobLocatorHelper::build_lob_locatorv2(ObLobLocatorV2 &locator,
output_data.assign_buffer(buffer + offset, param.len_); output_data.assign_buffer(buffer + offset, param.len_);
if (OB_FAIL(lob_mngr->query(param, output_data))) { if (OB_FAIL(lob_mngr->query(param, output_data))) {
COMMON_LOG(WARN,"Lob: falied to query lob tablets.", K(ret), K(param)); COMMON_LOG(WARN,"Lob: falied to query lob tablets.", K(ret), K(param));
} else { // Debug only } else if (padding_char_size) {
ObString data_str; ObString data_str;
locator.get_inrow_data(data_str); if (OB_FAIL(locator.get_inrow_data(data_str))) {
STORAGE_LOG(DEBUG, "Lob: read lob data", STORAGE_LOG(WARN, "Lob: read lob data failed",
K(ret), K(column_id), K(data_str), K(data_str.length()), K(full_loc_size), K(payload)); K(ret), K(column_id), K(data_str), K(data_str.length()), K(full_loc_size), K(payload));
} else if (OB_ISNULL(char_len_ptr)) {
ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "Lob: get null char len ptr when need padding char len",
K(ret), K(column_id), K(data_str), K(data_str.length()), K(full_loc_size), K(payload));
} else {
*char_len_ptr = ObCharset::strlen_char(param.coll_type_, data_str.ptr(), data_str.length());
}
} }
} }
} else if (is_src_inrow && (!is_dst_inrow)){ } else if (is_src_inrow && (!is_dst_inrow)){