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

[bugfix] fix text retrieval query with remote execcution and top-k pushdown 4016

Browse Source
This commit is contained in:
saltonz
2024-05-11 09:22:43 +00:00
committed by ob-robot
parent 90c5aa569d
commit 80f225ed40
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
deps/oblib/src/lib/container/ob_mask_set2.h vendored
View File

@ -58,9 +58,9 @@ public:
} else { } else {
bool hit = false; bool hit = false;
for (int64_t i = 0 ; OB_SUCCESS == ret && i < array_->count(); i++) { for (int64_t i = 0 ; OB_SUCCESS == ret && i < array_->count(); i++) {
if (array_->at(i) == key) { if (array_->at(i) == key) {
hit = true; hit = true;
if (OB_FAIL(bitset_.add_member(i))) { if (OB_FAIL(bitset_.add_member(i))) {
} }
break; break;
} }
@ -108,9 +108,9 @@ public:
if (array_->at(i) == key) { if (array_->at(i) == key) {
hit = true; hit = true;
if (bitset_.has_member(i)) { if (bitset_.has_member(i)) {
tmp_new_mask = false; tmp_new_mask = false;
} else if (OB_FAIL(bitset_.add_member(i))) { } else if (OB_FAIL(bitset_.add_member(i))) {
} else { } else {
tmp_new_mask = true; tmp_new_mask = true;
} }
break; break;

4
src/sql/engine/sort/ob_sort_op_impl.cpp
View File

@ -786,7 +786,9 @@ int ObSortOpImpl::init(
op_monitor_info_->otherstat_2_value_ = 1; op_monitor_info_->otherstat_2_value_ = 1;
ObPhysicalPlanCtx *plan_ctx = NULL; ObPhysicalPlanCtx *plan_ctx = NULL;
const ObPhysicalPlan *phy_plan = nullptr; const ObPhysicalPlan *phy_plan = nullptr;
if (OB_ISNULL(plan_ctx = GET_PHY_PLAN_CTX(*exec_ctx))) { if (!exec_ctx->get_my_session()->get_ddl_info().is_ddl()) {
// not ddl
} else if (OB_ISNULL(plan_ctx = GET_PHY_PLAN_CTX(*exec_ctx))) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("deserialized exec ctx without phy plan ctx set. Unexpected", K(ret)); LOG_WARN("deserialized exec ctx without phy plan ctx set. Unexpected", K(ret));
} else if (OB_ISNULL(phy_plan = plan_ctx->get_phy_plan())) { } else if (OB_ISNULL(phy_plan = plan_ctx->get_phy_plan())) {