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

cp bug fix to open source branch

Browse Source
This commit is contained in:
obdev
2021-07-20 17:06:14 +08:00
committed by wangzelin.wzl
parent 91bb0da2ae
commit f45d2cdbe2
37 changed files with 766 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sql/rewrite/ob_transform_view_merge.cpp
View File

@ -371,15 +371,12 @@ int ObTransformViewMerge::check_can_be_unnested(
}
if (OB_FAIL(ret) || !can_be) {
/*do nothing*/
} else if (helper.need_check_null_propagate) {
ObSEArray<ObRawExpr*, 4> columns;
ObRelIds rel_ids;
} else if (helper.need_check_null_propagate){
ObSEArray<ObRawExpr *, 4> columns;
ObSqlBitSet<> from_tables;
ObSEArray<ObRawExpr*, 4> column_exprs;
if (OB_FAIL(ObTransformUtils::get_from_tables(*child_stmt, rel_ids))) {
if (OB_FAIL(child_stmt->get_from_tables(from_tables))) {
LOG_WARN("failed to get from tables", K(ret));
} else if (OB_FAIL(from_tables.add_members2(rel_ids))) {
LOG_WARN("failed to add members", K(ret));
} else if (OB_FAIL(child_stmt->get_column_exprs(columns))) {
LOG_WARN("failed to get column exprs", K(ret));
} else if (OB_FAIL(ObTransformUtils::extract_table_exprs(*child_stmt, columns, from_tables, column_exprs))) {
@ -781,14 +778,11 @@ int ObTransformViewMerge::wrap_case_when_if_necessary(
ObSelectStmt& child_stmt, ViewMergeHelper& helper, ObIArray<ObRawExpr*>& exprs)
{
int ret = OB_SUCCESS;
ObSEArray<ObRawExpr*, 4> columns;
ObRelIds rel_ids;
ObSEArray<ObRawExpr *, 4> columns;
ObSqlBitSet<> from_tables;
ObSEArray<ObRawExpr*, 4> column_exprs;
if (OB_FAIL(ObTransformUtils::get_from_tables(child_stmt, rel_ids))) {
if (OB_FAIL(child_stmt.get_from_tables(from_tables))) {
LOG_WARN("failed to get from tables", K(ret));
} else if (OB_FAIL(from_tables.add_members2(rel_ids))) {
LOG_WARN("failed to add members", K(ret));
} else if (OB_FAIL(child_stmt.get_column_exprs(columns))) {
LOG_WARN("failed to get column exprs", K(ret));
} else if (OB_FAIL(ObTransformUtils::extract_table_exprs(child_stmt, columns, from_tables, column_exprs))) {