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

[to #51732060]fix core outer call dblink

Browse Source
This commit is contained in:
seuwebber
2023-08-25 11:14:13 +00:00
committed by ob-robot
parent cf26b82d03
commit 6a46384c33
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/engine/cmd/ob_routine_executor.cpp
View File

@ -123,7 +123,7 @@ int ObCallProcedureExecutor::execute(ObExecContext &ctx, ObCallProcedureStmt &st
} else { } else {
param.reset(); param.reset();
param.ObObj::reset(); param.ObObj::reset();
if (OB_FAIL(ObSQLUtils::calc_sql_expression_without_row(ctx, *expr, param))) { if (OB_FAIL(calc_param(ctx, *expr, param))) {
LOG_WARN("failed to calc exec param expr", K(i), K(*expr), K(ret)); LOG_WARN("failed to calc exec param expr", K(i), K(*expr), K(ret));
} else { } else {
if (expr->get_is_pl_mock_default_expr()) { if (expr->get_is_pl_mock_default_expr()) {
@ -292,6 +292,21 @@ int ObCallProcedureExecutor::execute(ObExecContext &ctx, ObCallProcedureStmt &st
return ret; return ret;
} }
int ObCallProcedureExecutor::calc_param(ObExecContext &ctx, const ObISqlExpression &expr, ObObjParam &result)
{
int ret = OB_SUCCESS;
OZ (ObSQLUtils::calc_sql_expression_without_row(ctx, expr, result), K(expr));
if (OB_SUCC(ret) && !result.is_ext()) {
const sql::ObExpr *new_expr = expr.get_expr();
CK (OB_NOT_NULL(new_expr));
OX (result.set_length(new_expr->max_length_));
OX (result.set_precision(new_expr->datum_meta_.precision_));
OX (result.set_scale(new_expr->datum_meta_.scale_));
OX (result.set_length_semantics(new_expr->datum_meta_.length_semantics_));
}
return ret;
}
int ObDropRoutineExecutor::execute(ObExecContext &ctx, ObDropRoutineStmt &stmt) int ObDropRoutineExecutor::execute(ObExecContext &ctx, ObDropRoutineStmt &stmt)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;

2
src/sql/engine/cmd/ob_routine_executor.h
View File

@ -65,7 +65,7 @@ public:
ObCallProcedureExecutor() {} ObCallProcedureExecutor() {}
virtual ~ObCallProcedureExecutor() {} virtual ~ObCallProcedureExecutor() {}
int execute(ObExecContext &ctx, ObCallProcedureStmt &stmt); int execute(ObExecContext &ctx, ObCallProcedureStmt &stmt);
int calc_param(ObExecContext &ctx, const ObISqlExpression &expr, ObObjParam &result);
private: private:
DISALLOW_COPY_AND_ASSIGN(ObCallProcedureExecutor); DISALLOW_COPY_AND_ASSIGN(ObCallProcedureExecutor);
}; };