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

fix do row_gt_and return 4016 when reach tenant memory limit

Browse Source
This commit is contained in:
Larry955
2023-06-25 10:18:30 +00:00
committed by ob-robot
parent 71111f0cbf
commit ed7676803a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/rewrite/ob_query_range.cpp
View File

@ -4418,6 +4418,7 @@ int ObQueryRange::do_row_gt_and(ObKeyPart *l_gt, ObKeyPart *r_gt, ObKeyPart *&r
LOG_WARN("Light copy key part and items failed", K(ret)); LOG_WARN("Light copy key part and items failed", K(ret));
} else if (is_reach_mem_limit_) { } else if (is_reach_mem_limit_) {
res_gt = new_l_cur; res_gt = new_l_cur;
always_true = true;
} else if(OB_FAIL(deep_copy_key_part_and_items(r_cur, new_r_cur))) { } else if(OB_FAIL(deep_copy_key_part_and_items(r_cur, new_r_cur))) {
LOG_WARN("Right copy key part and items failed", K(ret)); LOG_WARN("Right copy key part and items failed", K(ret));
} else if (OB_ISNULL(new_l_cur) || OB_ISNULL(new_r_cur)) { } else if (OB_ISNULL(new_l_cur) || OB_ISNULL(new_r_cur)) {
@ -4425,6 +4426,7 @@ int ObQueryRange::do_row_gt_and(ObKeyPart *l_gt, ObKeyPart *r_gt, ObKeyPart *&r
LOG_WARN("get unexpected null", K(ret), K(new_l_cur), K(new_r_cur)); LOG_WARN("get unexpected null", K(ret), K(new_l_cur), K(new_r_cur));
} else if (is_reach_mem_limit_) { } else if (is_reach_mem_limit_) {
res_gt = new_r_cur; res_gt = new_r_cur;
always_true = true;
} else if (new_l_cur->is_like_key()) { } else if (new_l_cur->is_like_key()) {
result = new_r_cur; result = new_r_cur;
} else if (new_r_cur->is_like_key()) { } else if (new_r_cur->is_like_key()) {
@ -4469,7 +4471,7 @@ int ObQueryRange::do_row_gt_and(ObKeyPart *l_gt, ObKeyPart *r_gt, ObKeyPart *&r
} }
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret) && !is_reach_mem_limit_) {
result->link_gt(rest); result->link_gt(rest);
// link to the or_next_ list // link to the or_next_ list
if (NULL != tail) { if (NULL != tail) {