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

to issue<50813268>:fix multiset core

Browse Source
This commit is contained in:
hanr881
2023-07-17 09:42:09 +00:00
committed by ob-robot
parent b6083d27be
commit 0c1fb55a7e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/engine/expr/ob_expr_multiset.cpp
View File

@ -104,6 +104,7 @@ int ObExprMultiSet::calc_result_type2(ObExprResType &type,
CK (cnt < ca->get_actual_count()); \ CK (cnt < ca->get_actual_count()); \
if (OB_SUCC(ret)) { \ if (OB_SUCC(ret)) { \
elem = static_cast<ObObj *>(ca->get_data()) + i; \ elem = static_cast<ObObj *>(ca->get_data()) + i; \
dst[cnt + offset].set_null(); \
if (OB_NOT_NULL(elem)) { \ if (OB_NOT_NULL(elem)) { \
if (elem->is_pl_extend() && \ if (elem->is_pl_extend() && \
elem->get_meta().get_extend_type() != pl::PL_REF_CURSOR_TYPE) { \ elem->get_meta().get_extend_type() != pl::PL_REF_CURSOR_TYPE) { \
@ -250,6 +251,7 @@ int ObExprMultiSet::calc_ms_one_distinct(common::ObIAllocator *coll_allocator,
LOG_WARN("allocate result obobj array failed, size is: ", K(res_cnt)); LOG_WARN("allocate result obobj array failed, size is: ", K(res_cnt));
} else { } else {
for (int64_t i = 0; i < res_cnt; ++i) { for (int64_t i = 0; i < res_cnt; ++i) {
data_arr[i].set_null();
if (objs[i].is_pl_extend() && if (objs[i].is_pl_extend() &&
objs[i].get_meta().get_extend_type() != pl::PL_REF_CURSOR_TYPE) { objs[i].get_meta().get_extend_type() != pl::PL_REF_CURSOR_TYPE) {
if (OB_FAIL(pl::ObUserDefinedType::deep_copy_obj(*coll_allocator, objs[i], data_arr[i], true))) { if (OB_FAIL(pl::ObUserDefinedType::deep_copy_obj(*coll_allocator, objs[i], data_arr[i], true))) {
@ -343,6 +345,7 @@ int ObExprMultiSet::calc_ms_all_impl(common::ObIAllocator *coll_allocator,
#define COPY_ELEM(iscopy) \ #define COPY_ELEM(iscopy) \
do{ \ do{ \
if (iscopy) { \ if (iscopy) { \
data_arr[index].set_null(); \
if (elem->is_pl_extend() && elem->get_meta().get_extend_type() != pl::PL_REF_CURSOR_TYPE) { \ if (elem->is_pl_extend() && elem->get_meta().get_extend_type() != pl::PL_REF_CURSOR_TYPE) { \
OZ (pl::ObUserDefinedType::deep_copy_obj(*coll_allocator, *elem, data_arr[index], true)); \ OZ (pl::ObUserDefinedType::deep_copy_obj(*coll_allocator, *elem, data_arr[index], true)); \
} else { \ } else { \