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

[BUGFIX] fix jdbc access vt lob col

Browse Source
This commit is contained in:
obdev
2023-03-24 11:41:47 +00:00
committed by ob-robot
parent 16721c0bd0
commit 7d436f6857
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/observer/mysql/ob_query_driver.cpp
View File

@ -542,10 +542,24 @@ int ObQueryDriver::process_lob_locator_results(ObObj& value,
value.set_has_lob_header(); // must has lob header value.set_has_lob_header(); // must has lob header
} }
} else if (!loc.has_extern()) { } else if (!loc.has_extern()) {
if (!loc.has_inrow_data()) {
// currently all temp lobs have extern field in oracle mode // currently all temp lobs have extern field in oracle mode
// or the lob locator header cannot compatable with clients for 4.0 // or the lob locator header cannot compatable with clients for 4.0
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("Lob: oracle lob locator v2 with out extern segment", K(value), K(GET_MIN_CLUSTER_VERSION())); LOG_WARN("Lob: oracle lob locator v2 with out extern segment", K(value), K(GET_MIN_CLUSTER_VERSION()));
} else if (!is_support_outrow_locator_v2) {
// convert to full extern temp lob locator
ObString inrow_data;
if (OB_FAIL(loc.get_inrow_data(inrow_data))) {
LOG_WARN("Lob: get inrow data failed", K(ret), K(loc));
} else {
value.set_string(value.get_type(), inrow_data.ptr(), inrow_data.length());
value.set_inrow();
if (OB_FAIL(ObTextStringResult::ob_convert_obj_temporay_lob(value, *allocator))) {
LOG_WARN("fail to convert temp lob locator", K(ret), K(value));
}
}
}
} else { } else {
if (!is_support_outrow_locator_v2 && !loc.has_inrow_data()) { if (!is_support_outrow_locator_v2 && !loc.has_inrow_data()) {
if (OB_FAIL(ObTextStringIter::append_outrow_lob_fulldata(value, session_info, *allocator))) { if (OB_FAIL(ObTextStringIter::append_outrow_lob_fulldata(value, session_info, *allocator))) {

14
src/sql/engine/expr/ob_expr_output_pack.cpp
View File

@ -510,9 +510,23 @@ int ObExprOutputPack::process_lob_locator_results(common::ObObj& value,
value.set_has_lob_header(); // must has lob header value.set_has_lob_header(); // must has lob header
} }
} else if (!loc.has_extern()) { // if has header but without extern header } else if (!loc.has_extern()) { // if has header but without extern header
if (!loc.has_inrow_data()) {
// mock loc v2 with extern ? currently all temp lobs have extern field in oracle mode // mock loc v2 with extern ? currently all temp lobs have extern field in oracle mode
// should not come here // should not come here
OB_ASSERT(0); OB_ASSERT(0);
} else if (!is_support_outrow_locator_v2) {
// convert to full extern temp lob locator
ObString inrow_data;
if (OB_FAIL(loc.get_inrow_data(inrow_data))) {
LOG_WARN("Lob: get inrow data failed", K(ret), K(loc));
} else {
value.set_string(value.get_type(), inrow_data.ptr(), inrow_data.length());
value.set_inrow();
if (OB_FAIL(ObTextStringResult::ob_convert_obj_temporay_lob(value, alloc))) {
LOG_WARN("fail to convert temp lob locator", K(ret), K(value));
}
}
}
} else if (!is_support_outrow_locator_v2 && !loc.has_inrow_data()) { } else if (!is_support_outrow_locator_v2 && !loc.has_inrow_data()) {
if (OB_FAIL(ObTextStringIter::append_outrow_lob_fulldata(value, &my_session, alloc))) { if (OB_FAIL(ObTextStringIter::append_outrow_lob_fulldata(value, &my_session, alloc))) {
LOG_WARN("Lob: convert lob to outrow failed", K(value), K(GET_MIN_CLUSTER_VERSION())); LOG_WARN("Lob: convert lob to outrow failed", K(value), K(GET_MIN_CLUSTER_VERSION()));