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

fix adjust_subquery_list bug

Browse Source
This commit is contained in:
obdev
2022-12-08 08:09:04 +00:00
committed by ob-robot
parent 20da72c3ab
commit 75c6144a73
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/engine/aggregate/ob_aggregate_function.cpp
View File

@ -2832,7 +2832,6 @@ int ObAggregateFunction::get_result(ObNewRow &row, const common::ObTimeZoneInfo
}
}
}
LOG_DEBUG("get result row", K(row));
return ret;
}

19
src/sql/resolver/dml/ob_dml_stmt.cpp
View File

@ -3615,9 +3615,22 @@ int ObDMLStmt::adjust_subquery_list()
ObSEArray<ObRawExpr *, 8> relation_exprs;
if (OB_FAIL(get_relation_exprs(relation_exprs))) {
LOG_WARN("failed to get relation exprs", K(ret));
} else if (FALSE_IT(subquery_exprs_.reset())) {
} else if (OB_FAIL(ObTransformUtils::extract_query_ref_expr(relation_exprs, subquery_exprs_))) {
LOG_WARN("failed to extract query ref expr", K(ret));
} else {
subquery_exprs_.reset();
ObRawExpr *expr = NULL;
// extract query ref expr will use flag, call extract_info first
for (int64_t i = 0; OB_SUCC(ret) && i < relation_exprs.count(); ++i) {
if (OB_ISNULL(expr = relation_exprs.at(i))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected expr", K(ret));
} else if (OB_FAIL(expr->extract_info())) {
LOG_WARN("failed to extract info", K(*expr));
}
}
if (OB_SUCC(ret) && OB_FAIL(ObTransformUtils::extract_query_ref_expr(relation_exprs, subquery_exprs_))) {
LOG_WARN("failed to extract query ref expr", K(ret));
}
}
return ret;
}