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

patch bug fix to open source branch

Browse Source
This commit is contained in:
obdev
2021-07-19 22:45:15 +08:00
committed by wangzelin.wzl
parent e03cb03357
commit c949c5e01f
13 changed files with 252 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/code_generator/ob_code_generator_impl.cpp
View File

@ -971,10 +971,11 @@ int ObCodeGeneratorImpl::recursive_get_column_expr(const ObColumnRefRawExpr*& co
if (OB_ISNULL(table_item)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected null", K(ret));
} else if (!table_item->is_generated_table()) {
column = inner_column;
} else if (OB_FAIL(recursive_get_column_expr(column, *table_item))) {
} else if (table_item->is_generated_table() &&
OB_FAIL(recursive_get_column_expr(inner_column, *table_item))) {
LOG_WARN("faield to recursive get column expr", K(ret));
} else {
column = inner_column;
}
}
}

7
src/sql/code_generator/ob_static_engine_cg.cpp
View File

@ -5165,10 +5165,11 @@ int ObStaticEngineCG::recursive_get_column_expr(const ObColumnRefRawExpr*& colum
if (OB_ISNULL(table_item)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected null", K(ret));
} else if (!table_item->is_generated_table()) {
column = inner_column;
} else if (OB_FAIL(recursive_get_column_expr(column, *table_item))) {
} else if (table_item->is_generated_table() &&
OB_FAIL(recursive_get_column_expr(inner_column, *table_item))) {
LOG_WARN("faield to recursive get column expr", K(ret));
} else {
column = inner_column;
}
}
}