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

fix:48956906

Browse Source
This commit is contained in:
obdev
2023-04-13 07:53:51 +00:00
committed by ob-robot
parent eaa04a83eb
commit b7bc53891b
2 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,10 +111,6 @@ const static int32_t JSN_EXIST_DEFAULT = 3;
} \ } \
} }
ObJsonNull* ObJsonTableOp::js_null_ = nullptr;
ObJsonArray* ObJsonTableOp::js_arr_ = nullptr;
ObJsonObject* ObJsonTableOp::js_obj_ = nullptr;
int JtFuncHelpler::cast_to_int(ObIJsonBase *j_base, ObObjType dst_type, int64_t &val) int JtFuncHelpler::cast_to_int(ObIJsonBase *j_base, ObObjType dst_type, int64_t &val)
{ {
INIT_SUCC(ret); INIT_SUCC(ret);
@ -1023,11 +1019,11 @@ int JtFuncHelpler::set_error_val(JtScanCtx* ctx, JtColNode& col_node, int& ret)
} }
} else if (col_type == COL_TYPE_QUERY) { } else if (col_type == COL_TYPE_QUERY) {
if (info.on_error_ == JSN_QUERY_EMPTY || info.on_error_ == JSN_QUERY_EMPTY_ARRAY) { if (info.on_error_ == JSN_QUERY_EMPTY || info.on_error_ == JSN_QUERY_EMPTY_ARRAY) {
col_node.curr_ = ObJsonTableOp::get_js_array(); col_node.curr_ = ctx->jt_op_->get_js_array();
col_node.is_null_result_ = false; col_node.is_null_result_ = false;
ret = ctx->is_need_end_ ? OB_ITER_END : OB_SUCCESS; ret = ctx->is_need_end_ ? OB_ITER_END : OB_SUCCESS;
} else if (info.on_error_ == JSN_QUERY_EMPTY_OBJECT) { } else if (info.on_error_ == JSN_QUERY_EMPTY_OBJECT) {
col_node.curr_ = ObJsonTableOp::get_js_object(); col_node.curr_ = ctx->jt_op_->get_js_object();
col_node.is_null_result_ = false; col_node.is_null_result_ = false;
ret = ctx->is_need_end_ ? OB_ITER_END : OB_SUCCESS; ret = ctx->is_need_end_ ? OB_ITER_END : OB_SUCCESS;
} else if (info.on_error_ == JSN_QUERY_NULL || info.on_error_ == JSN_QUERY_IMPLICIT) { } else if (info.on_error_ == JSN_QUERY_NULL || info.on_error_ == JSN_QUERY_IMPLICIT) {
@ -1350,7 +1346,7 @@ int JtColNode::check_col_res_type(JtScanCtx* ctx)
return ret; return ret;
} }
void JtColNode::proc_query_on_error(int& ret, bool& is_null) void JtColNode::proc_query_on_error(JtScanCtx* ctx, int& ret, bool& is_null)
{ {
ret = OB_SUCCESS; ret = OB_SUCCESS;
if (col_info_.on_error_ == JSN_QUERY_ERROR) { if (col_info_.on_error_ == JSN_QUERY_ERROR) {
@ -1358,10 +1354,10 @@ void JtColNode::proc_query_on_error(int& ret, bool& is_null)
iter_ = curr_ = NULL; iter_ = curr_ = NULL;
LOG_WARN("result can't be returned without array wrapper", K(ret)); LOG_WARN("result can't be returned without array wrapper", K(ret));
} else if (col_info_.on_error_ == JSN_QUERY_EMPTY || col_info_.on_error_ == JSN_QUERY_EMPTY_ARRAY) { } else if (col_info_.on_error_ == JSN_QUERY_EMPTY || col_info_.on_error_ == JSN_QUERY_EMPTY_ARRAY) {
iter_ = curr_ = ObJsonTableOp::get_js_array(); iter_ = curr_ = ctx->jt_op_->get_js_array();
is_null = false; is_null = false;
} else if (col_info_.on_error_ == JSN_QUERY_EMPTY_OBJECT) { } else if (col_info_.on_error_ == JSN_QUERY_EMPTY_OBJECT) {
iter_ = curr_ = ObJsonTableOp::get_js_object(); iter_ = curr_ = ctx->jt_op_->get_js_object();
is_null = false; is_null = false;
} else if (col_info_.on_error_ == JSN_QUERY_NULL || col_info_.on_error_ == JSN_QUERY_IMPLICIT) { } else if (col_info_.on_error_ == JSN_QUERY_NULL || col_info_.on_error_ == JSN_QUERY_IMPLICIT) {
iter_ = curr_ = NULL; iter_ = curr_ = NULL;
@ -1391,7 +1387,7 @@ int JtColNode::set_val_on_empty(JtScanCtx* ctx, bool& need_cast_res)
ret = OB_SUCCESS; ret = OB_SUCCESS;
if (col_info_.on_empty_ == JSN_QUERY_IMPLICIT) { if (col_info_.on_empty_ == JSN_QUERY_IMPLICIT) {
proc_query_on_error(ret, is_null_result_); proc_query_on_error(ctx, ret, is_null_result_);
if (col_info_.on_error_ == JSN_QUERY_ERROR) { if (col_info_.on_error_ == JSN_QUERY_ERROR) {
ret = OB_ERR_JSON_VALUE_NO_VALUE; ret = OB_ERR_JSON_VALUE_NO_VALUE;
} }
@ -1399,17 +1395,17 @@ int JtColNode::set_val_on_empty(JtScanCtx* ctx, bool& need_cast_res)
break; break;
} }
case JSN_QUERY_EMPTY: { case JSN_QUERY_EMPTY: {
iter_ = curr_ = ObJsonTableOp::get_js_array(); iter_ = curr_ = ctx->jt_op_->get_js_array();
is_null_result_ = false; is_null_result_ = false;
break; break;
} }
case JSN_QUERY_EMPTY_ARRAY: { case JSN_QUERY_EMPTY_ARRAY: {
iter_ = curr_ = ObJsonTableOp::get_js_array(); iter_ = curr_ = ctx->jt_op_->get_js_array();
is_null_result_ = false; is_null_result_ = false;
break; break;
} }
case JSN_QUERY_EMPTY_OBJECT: { case JSN_QUERY_EMPTY_OBJECT: {
iter_ = curr_ = ObJsonTableOp::get_js_object(); iter_ = curr_ = ctx->jt_op_->get_js_object();
is_null_result_ = false; is_null_result_ = false;
break; break;
} }
@ -1608,7 +1604,7 @@ int JtColNode::get_next_row(ObIJsonBase* in, JtScanCtx* ctx, bool& is_null_value
|| col_info_.wrapper_ == JSN_QUERY_WITHOUT_ARRAY_WRAPPER || col_info_.wrapper_ == JSN_QUERY_WITHOUT_ARRAY_WRAPPER
|| col_info_.wrapper_ == JSN_QUERY_WRAPPER_IMPLICIT) { || col_info_.wrapper_ == JSN_QUERY_WRAPPER_IMPLICIT) {
if (hit.size() > 1) { if (hit.size() > 1) {
proc_query_on_error(ret, is_null_result_); proc_query_on_error(ctx, ret, is_null_result_);
if (col_info_.on_error_ == JSN_QUERY_ERROR) { if (col_info_.on_error_ == JSN_QUERY_ERROR) {
ret = OB_ERR_WITHOUT_ARR_WRAPPER; ret = OB_ERR_WITHOUT_ARR_WRAPPER;
LOG_WARN("result can't be returned without array wrapper", K(ret)); LOG_WARN("result can't be returned without array wrapper", K(ret));
@ -2624,19 +2620,7 @@ int ObJsonTableOp::init()
jt_ctx_.is_evaled_ = false; jt_ctx_.is_evaled_ = false;
jt_ctx_.is_charset_converted_ = false; jt_ctx_.is_charset_converted_ = false;
jt_ctx_.res_obj_ = nullptr; jt_ctx_.res_obj_ = nullptr;
jt_ctx_.jt_op_ = this;
js_null_ = static_cast<ObJsonNull*>(allocator_->alloc(sizeof(ObJsonNull)));
js_arr_ = static_cast<ObJsonArray*>(allocator_->alloc(sizeof(ObJsonArray)));
js_obj_ = static_cast<ObJsonObject*>(allocator_->alloc(sizeof(ObJsonObject)));
if (OB_ISNULL(js_null_) || OB_ISNULL(js_arr_) || OB_ISNULL(js_obj_)) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to allocate js node", KP(js_null_), KP(js_arr_), KP(js_obj_), K(ret));
} else {
js_null_ = new (js_null_) ObJsonNull();
js_arr_ = new (js_arr_) ObJsonArray(allocator_);
js_obj_ = new (js_obj_) ObJsonObject(allocator_);
}
} }
} }

23
src/sql/engine/basic/ob_json_table_op.h
View File

@ -28,6 +28,7 @@ namespace oceanbase
{ {
namespace sql namespace sql
{ {
struct JtScanCtx;
static const int64_t DEFAULT_STR_LENGTH = -1; static const int64_t DEFAULT_STR_LENGTH = -1;
class ObExpr; class ObExpr;
struct JtScanCtx; struct JtScanCtx;
@ -122,7 +123,7 @@ public:
virtual int get_next_row(ObIJsonBase* in, JtScanCtx* ctx, bool& is_null_value); virtual int get_next_row(ObIJsonBase* in, JtScanCtx* ctx, bool& is_null_value);
void proc_query_on_error(int& err_code, bool& is_null); void proc_query_on_error(JtScanCtx *ctx, int& err_code, bool& is_null);
// fixed member // fixed member
@ -359,6 +360,8 @@ public:
common::ObFixedArray<ObJtColInfo*, common::ObIAllocator> cols_def_; common::ObFixedArray<ObJtColInfo*, common::ObIAllocator> cols_def_;
}; };
class ObJsonTableOp;
struct JtScanCtx { struct JtScanCtx {
JtScanCtx() JtScanCtx()
: row_alloc_(), : row_alloc_(),
@ -369,6 +372,7 @@ struct JtScanCtx {
ObExecContext* exec_ctx_; ObExecContext* exec_ctx_;
common::ObArenaAllocator row_alloc_; common::ObArenaAllocator row_alloc_;
ObIAllocator *op_exec_alloc_; ObIAllocator *op_exec_alloc_;
ObJsonTableOp* jt_op_;
bool is_evaled_; bool is_evaled_;
bool is_cover_error_; bool is_cover_error_;
@ -393,7 +397,10 @@ public:
allocator_(&exec_ctx.get_allocator()), allocator_(&exec_ctx.get_allocator()),
is_inited_(false), is_inited_(false),
is_evaled_(false), is_evaled_(false),
in_(nullptr) in_(nullptr),
j_null_(),
j_arr_(allocator_),
j_obj_(allocator_)
{ {
const ObJsonTableSpec* spec_ptr = reinterpret_cast<const ObJsonTableSpec*>(&spec); const ObJsonTableSpec* spec_ptr = reinterpret_cast<const ObJsonTableSpec*>(&spec);
col_count_ = spec_ptr->column_exprs_.count(); col_count_ = spec_ptr->column_exprs_.count();
@ -406,9 +413,9 @@ public:
//virtual int inner_get_next_batch(int64_t max_row_cnt) override; //virtual int inner_get_next_batch(int64_t max_row_cnt) override;
virtual int inner_close() override; virtual int inner_close() override;
virtual void destroy() override; virtual void destroy() override;
static ObJsonNull* get_js_null() { return js_null_; } ObJsonNull* get_js_null() { return &j_null_; }
static ObJsonArray* get_js_array() { return js_arr_; } ObJsonArray* get_js_array() { return &j_arr_; }
static ObJsonObject* get_js_object() { return js_obj_; } ObJsonObject* get_js_object() { return &j_obj_; }
TO_STRING_KV(K_(is_inited), TO_STRING_KV(K_(is_inited),
K_(col_count)); K_(col_count));
@ -433,9 +440,9 @@ private:
JtScanCtx jt_ctx_; JtScanCtx jt_ctx_;
private: private:
static ObJsonNull* js_null_; ObJsonNull j_null_;
static ObJsonArray* js_arr_; ObJsonArray j_arr_;
static ObJsonObject* js_obj_; ObJsonObject j_obj_;
}; };
} // end namespace sql } // end namespace sql