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

[to #46859072] fix serval complex type bugs

Browse Source
This commit is contained in:
obdev
2022-12-22 10:07:48 +00:00
committed by ob-robot
parent 6c25f369ba
commit 2ee6c3352f
4 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/ob_spi.cpp
View File

@ -4091,8 +4091,13 @@ int ObSPIService::spi_extend_collection(pl::ObPLExecCtx *ctx,
ObObj *data = reinterpret_cast<ObObj*>(table->get_data());
if (i > 0 && i <= org_elem_cnt) {
ObObj &ith_elem = data[i - 1];
for (int64_t j = coll_cnt - n; j < coll_cnt; ++j) {
new (&(data[j]))ObObj(ith_elem);
for (int64_t j = coll_cnt - n; OB_SUCC(ret) && j < coll_cnt; ++j) {
if (ith_elem.is_pl_extend()) {
CK (OB_NOT_NULL(table->get_allocator()));
OZ (ObUserDefinedType::deep_copy_obj(*(table->get_allocator()), ith_elem, data[j]));
} else {
new (&(data[j]))ObObj(ith_elem);
}
}
} else {
ret = OB_ERR_SUBSCRIPT_BEYOND_COUNT;
@ -5124,7 +5129,7 @@ int ObSPIService::inner_fetch_with_retry(ObPLExecCtx *ctx,
ObObj *values = NULL; \
CK (OB_NOT_NULL(record)); \
CK (OB_NOT_NULL(values = record->get_element())); \
for (int64_t i = 0; OB_SUCC(ret) && i < type_count; ++i) { \
for (int64_t i = 0; OB_SUCC(ret) && i < record->get_count(); ++i) { \
ObObj deep_copy; \
/*may element of record also complex value*/ \
if (values[i].is_pl_extend()) { \
@ -5910,6 +5915,7 @@ int ObSPIService::store_datums(ObObj &dest_addr, const ObIArray<ObObj> &obj_arra
} else {
ObPLRecord *record = static_cast<ObPLRecord*>(composite);
current_datum = reinterpret_cast<int64_t>(record) + ObRecordType::get_data_offset(record->get_count());
record->set_is_null(false);
}
}
} else { //must be a single Obj