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

[Json] json patch from 3.2.2 branch since 2021.12

Browse Source
This commit is contained in:
xj0
2022-02-16 17:34:14 +08:00
committed by LINxiansheng
parent 63edf11b9a
commit bb573a7cd4
47 changed files with 947 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/expr/ob_expr_json_overlaps.cpp
View File

@ -148,7 +148,7 @@ int ObExprJsonOverlaps::json_overlaps_object(ObIJsonBase *json_a,
} else {
JsonObjectIterator iter_a = json_a->object_iterator();
JsonObjectIterator iter_b = json_b->object_iterator();
while (!iter_b.empty() && OB_SUCC(ret)) {
while (!iter_b.end() && OB_SUCC(ret)) {
ObString key_b;
ObIJsonBase *a_tmp = NULL;
ObIJsonBase *b_tmp = NULL;
@ -191,7 +191,8 @@ int ObExprJsonOverlaps::json_overlaps_array(ObIJsonBase *json_a,
if (json_b->json_type() != ObJsonNodeType::J_ARRAY) {
// convert to array if needed
ObIJsonBase *jb_node = NULL;
if (ObJsonBaseFactory::transform(allocator, json_b, ObJsonInType::JSON_TREE, jb_node)) {
if (OB_FAIL(ObJsonBaseFactory::transform(allocator, json_b,
ObJsonInType::JSON_TREE, jb_node))) {
LOG_WARN("fail to transform to tree", K(ret), K(*json_b));
} else {
ObJsonNode *j_node = static_cast<ObJsonNode *>(jb_node);