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

38
src/sql/engine/expr/ob_expr_json_merge_patch.cpp
View File

@ -103,12 +103,14 @@ int ObExprJsonMergePatch::calc_resultN(ObObj &result, const ObObj *objs, int64_t
j_obj = new (buf) ObJsonObject(allocator);
}
}
if (OB_FAIL(j_obj->merge_patch(allocator, static_cast<ObJsonObject*>(j_patch_node)))) {
LOG_WARN("error, json merge patch failed", K(ret));
} else {
j_base = j_obj;
has_null = false;
if (OB_SUCC(ret)) {
if (OB_FAIL(j_obj->merge_patch(allocator, static_cast<ObJsonObject*>(j_patch_node)))) {
LOG_WARN("error, json merge patch failed", K(ret));
} else {
j_base = j_obj;
has_null = false;
}
}
}
}
@ -120,16 +122,8 @@ int ObExprJsonMergePatch::calc_resultN(ObObj &result, const ObObj *objs, int64_t
} else if (OB_FAIL(j_base->get_raw_binary(raw_bin, allocator))) {
LOG_WARN("fail to get json raw binary", K(ret));
} else {
uint64_t length = raw_bin.length();
char *buf = reinterpret_cast<char *>(allocator->alloc(length));
if (OB_ISNULL(buf)) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to alloc memory for json insert result", K(ret), K(length));
} else {
MEMCPY(buf, raw_bin.ptr(), length);
result.set_collation_type(CS_TYPE_UTF8MB4_BIN);
result.set_string(ObJsonType, buf, length);
}
result.set_collation_type(CS_TYPE_UTF8MB4_BIN);
result.set_string(ObJsonType, raw_bin.ptr(), raw_bin.length());
}
}
@ -178,11 +172,13 @@ int ObExprJsonMergePatch::eval_json_merge_patch(const ObExpr &expr, ObEvalCtx &c
}
}
if (OB_FAIL(j_obj->merge_patch(&temp_allocator, static_cast<ObJsonObject*>(j_patch_node)))) {
LOG_WARN("error, json merge patch failed", K(ret));
} else {
j_base = j_obj;
has_null = false;
if (OB_SUCC(ret)) {
if (OB_FAIL(j_obj->merge_patch(&temp_allocator, static_cast<ObJsonObject*>(j_patch_node)))) {
LOG_WARN("error, json merge patch failed", K(ret));
} else {
j_base = j_obj;
has_null = false;
}
}
}
}