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

fix rb_iterate unstable test cases

Browse Source
This commit is contained in:
qijiax 2024-11-06 06:44:11 +00:00 committed by ob-robot
parent 799420c5a7
commit 8308c30def
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/oblib/src/lib/roaringbitmap/ob_roaringbitmap.cpp vendored
View File

@ -567,6 +567,9 @@ int ObRoaringBitmap::deserialize(const ObString &rb_bin, bool need_validate)
break;
}
} // end switch
if (OB_FAIL(ret)) {
set_empty();
}
}
return ret;
}

14
src/sql/engine/basic/ob_json_table_op.cpp
View File

@ -28,7 +28,7 @@
#include "lib/xml/ob_binary_aggregate.h"
#include "lib/xml/ob_xpath.h"
#include "sql/engine/expr/ob_expr_rb_func_helper.h"
#include "lib/roaringbitmap/ob_rb_utils.h"
namespace oceanbase
{
@ -995,7 +995,11 @@ int RbIterateTableFunc::eval_input(ObJsonTableOp &jt, JtScanCtx &ctx, ObEvalCtx
} else if (OB_FAIL(ObRbExprHelper::get_input_roaringbitmap(eval_ctx, ctx.row_alloc_, value_expr, rb, is_null))) {
LOG_WARN("fail to get roaringbitmap from expr", K(ret), K(i));
}
if (OB_SUCC(ret)) {
if (OB_FAIL(ret)) {
for (int64_t j = 0; j < i; ++j) {
ObRbUtils::rb_destroy(rbs[j]);
}
} else {
rbs[i] = rb;
is_all_null &= is_null;
}
@ -1055,7 +1059,11 @@ int RbIterateTableFunc::reset_path_iter(ObRegCol &scan_node, void* in, JtScanCtx
is_null_value = false;
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(ret)) {
for (int64_t i = 0; i < col_num; ++i) {
ObRbUtils::rb_destroy(rbs[i]);
}
} else {
scan_node.iter_ = rb_iters;
}
return ret;