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

[BUGFIX] fix lob bugs

Browse Source
This commit is contained in:
obdev
2023-02-08 11:40:29 +08:00
committed by ob-robot
parent 23754ccc92
commit 0d922329d4
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pl/sys_package/ob_dbms_xplan.h
View File

@ -62,7 +62,8 @@ private:
PlanText &plan_text, PlanText &plan_text,
common::ObObj &result); common::ObObj &result);
static int set_display_result_for_mysql(PlanText &plan_text, static int set_display_result_for_mysql(sql::ObExecContext &ctx,
PlanText &plan_text,
common::ObObj &result); common::ObObj &result);
static int get_plan_format(const ObString &format, static int get_plan_format(const ObString &format,

15
src/sql/engine/expr/ob_expr_lob_utils.cpp
View File

@ -138,13 +138,14 @@ int ob_adjust_lob_datum(const ObObj &origin_obj,
out_datum.set_string(full_data); out_datum.set_string(full_data);
} }
} else { // origin obj does not have lob header, but meta has, build temp lob header } else { // origin obj does not have lob header, but meta has, build temp lob header
OB_ASSERT(0); // should not come here? ret = OB_ERR_UNEXPECTED;
ObObj out_obj(origin_obj); LOG_WARN("unexpect for input obj, input obj should has lob header", K(ret), K(origin_obj), K(obj_meta));
if (OB_FAIL(ObTextStringResult::ob_convert_obj_temporay_lob(out_obj, allocator))) { // ObObj out_obj(origin_obj);
LOG_WARN("Lob: failed to convert plain lob data to temp lob", K(ret)); // if (OB_FAIL(ObTextStringResult::ob_convert_obj_temporay_lob(out_obj, allocator))) {
} else if (OB_FAIL(out_datum.from_obj(out_obj, obj_datum_map_))) { // LOG_WARN("Lob: failed to convert plain lob data to temp lob", K(ret));
LOG_WARN("convert lob obj to datum failed", K(ret), K(out_obj)); // } else if (OB_FAIL(out_datum.from_obj(out_obj, obj_datum_map_))) {
} // LOG_WARN("convert lob obj to datum failed", K(ret), K(out_obj));
// }
} }
} }
return ret; return ret;

12
src/storage/lob/ob_lob_seq.cpp
View File

@ -164,10 +164,20 @@ int ObLobSeqId::get_next_seq_id(ObString& seq_id, ObLobSeqId &end)
seq_id.assign_ptr(buf_, len_); seq_id.assign_ptr(buf_, len_);
} }
} else { } else {
bool need_expend = false;
uint64_t cur = digits_[dig_len_ - 1]; uint64_t cur = digits_[dig_len_ - 1];
// TODO @luohongdi.lhd. try smaller step rather than add digits // TODO @luohongdi.lhd. try smaller step rather than add digits
cur += LOB_SEQ_STEP_LEN; cur += LOB_SEQ_STEP_LEN;
if (cur > LOB_SEQ_STEP_MAX || compare(end) != -1) { if (cur > LOB_SEQ_STEP_MAX) {
need_expend = true;
} else {
digits_[dig_len_ - 1] = cur;
if (compare(end) != -1) {
need_expend = true;
}
digits_[dig_len_ - 1] = (cur - LOB_SEQ_STEP_LEN);
}
if (need_expend) {
if (OB_FAIL(add_digits(LOB_SEQ_ID_MIN)) || OB_FAIL(append_seq_buf(LOB_SEQ_ID_MIN))) { if (OB_FAIL(add_digits(LOB_SEQ_ID_MIN)) || OB_FAIL(append_seq_buf(LOB_SEQ_ID_MIN))) {
LOG_WARN("failed add seq node.", K(ret), K(len_), K(cap_), K(dig_len_), K(dig_cap_)); LOG_WARN("failed add seq node.", K(ret), K(len_), K(cap_), K(dig_len_), K(dig_cap_));
} else { } else {