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

14
src/sql/engine/expr/ob_expr_json_valid.cpp
View File

@ -83,8 +83,8 @@ int ObExprJsonValid::calc(const T &data, ObObjType type, ObCollationType cs_type
} else if (ob_is_string_type(type) && cs_type == CS_TYPE_BINARY) {
is_invalid = true;
} else {
common::ObString j_text = data.get_string();
if (OB_UNLIKELY(j_text == "")) {
common::ObString j_str = data.get_string();
if (OB_UNLIKELY(j_str == "")) {
if (type == ObJsonType) {
is_null = true;
} else {
@ -92,13 +92,13 @@ int ObExprJsonValid::calc(const T &data, ObObjType type, ObCollationType cs_type
}
} else if (type == ObJsonType) { // json bin
ObIJsonBase *j_bin = NULL;
if (ObJsonBaseFactory::get_json_base(allocator, j_text, ObJsonInType::JSON_BIN,
ObJsonInType::JSON_BIN, j_bin)) {
LOG_WARN("fail to get json base", K(ret), K(type), K(j_text));
if (OB_FAIL(ObJsonBaseFactory::get_json_base(allocator, j_str, ObJsonInType::JSON_BIN,
ObJsonInType::JSON_BIN, j_bin))) {
LOG_WARN("fail to get json base", K(ret), K(type), K(j_str));
}
} else { // json tree
if (OB_FAIL(ObJsonParser::check_json_syntax(j_text, allocator))) {
LOG_WARN("fail to check json syntax", K(ret), K(type), K(j_text));
if (OB_FAIL(ObJsonParser::check_json_syntax(j_str, allocator))) {
LOG_WARN("fail to check json syntax", K(ret), K(type), K(j_str));
}
}
}