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

support json type

Browse Source
This commit is contained in:
xj0
2022-02-08 14:58:13 +08:00
committed by LINxiansheng
parent 4b25bac8d0
commit e5f59ea074
241 changed files with 46116 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/engine/expr/ob_sql_expression.cpp
View File

@ -85,7 +85,7 @@ int ObSqlExpression::assign(const ObSqlExpression& other)
return ret;
}
int ObSqlExpression::add_expr_item(const ObPostExprItem& item)
int ObSqlExpression::add_expr_item(const ObPostExprItem &item, const ObRawExpr *raw_expr)
{
int ret = OB_SUCCESS;
if (!gen_infix_expr_) {
@ -96,6 +96,11 @@ int ObSqlExpression::add_expr_item(const ObPostExprItem& item)
}
} else {
ObInfixExprItem infix_item;
if (OB_NOT_NULL(raw_expr)) {
infix_item.set_is_boolean(raw_expr->is_bool_expr());
} else {
// unittest
}
*static_cast<ObPostExprItem*>(&infix_item) = item;
if (OB_FAIL(infix_expr_.add_expr_item(infix_item))) {
LOG_WARN("add infix expr item failed", K(ret));
@ -378,7 +383,7 @@ int ObAggregateExpression::calc_result_row(ObExprCtx& expr_ctx, const ObNewRow&
LOG_WARN("failed to calc result row", K(ret), K(row));
}
} else {
if (OB_FAIL(infix_expr_.calc_row(expr_ctx, row, result_row))) {
if (OB_FAIL(infix_expr_.calc_row(expr_ctx, row, get_aggr_func(), result_row))) {
LOG_WARN("failed to calc row", K(ret), K(row));
}
}