This commit is contained in:
hnwyllmm
2022-11-30 10:05:50 +00:00
committed by ob-robot
parent 47b0a3a4de
commit 59e975f9d7
14 changed files with 33 additions and 33 deletions

View File

@ -1837,7 +1837,7 @@ OB_INLINE int ObSql::handle_text_query(const ObString &stmt, ObSqlCtx &context,
ret = OB_ERR_EMPTY_QUERY;
LOG_WARN("query is empty", K(ret));
LOG_USER_ERROR(OB_ERR_EMPTY_QUERY);
// 空请求,可以归类到paser的已知错误,不需要断连接
// 空请求,可以归类到parser的已知错误,不需要断连接
result.get_exec_context().set_need_disconnect(false);
//FIXME qianfu NG_TRACE_EXT(set_need_disconnect, OB_ID(need_disconnect), false);
}
@ -1891,7 +1891,7 @@ OB_INLINE int ObSql::handle_text_query(const ObString &stmt, ObSqlCtx &context,
ret = OB_BATCHED_MULTI_STMT_ROLLBACK;
LOG_WARN("batched multi_stmt needs rollback");
}
// 如果是begin/commit语句,不再从plan cahce中获取plan
// 如果是begin/commit语句,不再从plan cache中获取plan
} else if (!is_begin_commit_stmt
&& OB_FAIL(pc_get_plan_and_fill_result(*pc_ctx, result, get_plan_err,
ectx.get_need_disconnect_for_update()))) {
@ -2080,7 +2080,7 @@ int ObSql::generate_stmt(ParseResult &parse_result,
if (OB_FAIL(ret)) {
} else if (stmt::T_ANONYMOUS_BLOCK == context.stmt_type_ && context.is_prepare_protocol_ && !context.is_prepare_stage_) {
//anonymous + ps在execute阶段不会做parser, 因此不应该检查paser_result
//anonymous + ps在execute阶段不会做parser, 因此不应该检查parser_result
//do nothing...
} else if (OB_ISNULL(parse_result.result_tree_)
|| OB_ISNULL(parse_result.result_tree_->children_)
@ -4057,7 +4057,7 @@ int ObSql::calc_pre_calculable_exprs(const ObDMLStmt &stmt,
} else if (OB_FAIL(ObPlanCacheObject::pre_calculation(is_ignore_stmt,
*pre_calc_frame, exec_ctx,
calc_types))) {
LOG_WARN("failde to pre calculate exprs", K(ret));
LOG_WARN("failed to pre calculate exprs", K(ret));
} else if (OB_UNLIKELY(PRE_CALC_DEFAULT == calc_types &&
!phy_plan.get_pre_calc_frames().add_last(pre_calc_frame))) {
ret = OB_ERR_UNEXPECTED;