patch 4.0

This commit is contained in:
wangzelin.wzl
2022-10-24 10:34:53 +08:00
parent 4ad6e00ec3
commit 93a1074b0c
10533 changed files with 2588271 additions and 2299373 deletions

View File

@ -10,7 +10,6 @@
* See the Mulan PubL v2 for more details.
*/
// This file is for implementation of func json_quote
#define USING_LOG_PREFIX SQL_ENG
#include "ob_expr_json_quote.h"
#include "sql/engine/expr/ob_expr_json_func_helper.h"
@ -43,7 +42,6 @@ int ObExprJsonQuote::calc_result_type1(ObExprResType &type,
type.set_type(ObLongTextType);
type.set_collation_type(CS_TYPE_UTF8MB4_BIN);
type.set_collation_level(CS_LEVEL_IMPLICIT);
type.set_length(OB_MAX_LONGTEXT_LENGTH);
if (type1.get_type() == ObNullType || type1.get_type() == ObDoubleType
|| type1.get_type() == ObIntType) {
@ -95,41 +93,11 @@ int ObExprJsonQuote::calc(const T &data, ObObjType type, ObCollationType cs_type
return ret;
}
// for old sql engine
int ObExprJsonQuote::calc_result1(common::ObObj &result, const common::ObObj &obj,
common::ObExprCtx &expr_ctx) const
{
INIT_SUCC(ret);
ObIAllocator *allocator = expr_ctx.calc_buf_;
ObJsonBuffer j_buf(allocator);
bool is_null= false;
if (OB_ISNULL(allocator)) { // check allocator
ret = OB_NOT_INIT;
LOG_WARN("allcator not init", K(ret));
} else if (OB_FAIL(calc(obj, obj.get_type(), obj.get_collation_type(), j_buf, is_null))) {
LOG_WARN("fail to calc json quote result in old engine", K(ret), K(obj.get_type()));
} else if (is_null) {
result.set_null();
} else {
char *buf = static_cast<char*>(allocator->alloc(j_buf.length()));
if (OB_ISNULL(buf)) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to alloc memory for json quote result", K(ret), K(j_buf.length()));
} else {
MEMCPY(buf, j_buf.ptr(), j_buf.length());
result.set_collation_type(result_type_.get_collation_type());
result.set_string(ObLongTextType, buf, j_buf.length());
}
}
return ret;
}
int ObExprJsonQuote::eval_json_quote(const ObExpr &expr, ObEvalCtx &ctx, ObDatum &res)
{
INIT_SUCC(ret);
common::ObArenaAllocator &temp_allocator = ctx.get_reset_tmp_alloc();
ObEvalCtx::TempAllocGuard tmp_alloc_g(ctx);
common::ObArenaAllocator &temp_allocator = tmp_alloc_g.get_allocator();
ObJsonBuffer j_buf(&temp_allocator);
ObExpr *arg = expr.args_[0];
ObObjType type = arg->datum_meta_.type_;