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

[CP] fix generate conflict detector core

Browse Source
This commit is contained in:
zzg19950727 2024-05-21 10:22:37 +00:00 committed by ob-robot
parent 9476c37f88
commit 0c1f26fa12
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/optimizer/ob_conflict_detector.cpp
View File

@ -788,11 +788,11 @@ int ObConflictDetectorGenerator::generate_outer_join_detectors(const ObDMLStmt *
ObSEArray<ObConflictDetector*, 4> detectors;
if (OB_FAIL(flatten_inner_join(table_item, table_filter, table_items))) {
LOG_WARN("failed to flatten inner join", K(ret));
} else if (OB_FAIL(generate_inner_join_detectors(stmt,
} else if (OB_FAIL(SMART_CALL(generate_inner_join_detectors(stmt,
table_items,
table_filter,
baserels,
detectors))) {
detectors)))) {
LOG_WARN("failed to generate inner join detectors", K(ret));
} else if (OB_FAIL(append(outer_join_detectors, detectors))) {
LOG_WARN("failed to append detectors", K(ret));
@ -907,20 +907,20 @@ int ObConflictDetectorGenerator::inner_generate_outer_join_detectors(const ObDML
join_quals))) {
LOG_WARN("failed to pushdown on conditions", K(ret));
//3. generate left child detectors
} else if (OB_FAIL(generate_outer_join_detectors(stmt,
} else if (OB_FAIL(SMART_CALL(generate_outer_join_detectors(stmt,
joined_table->left_table_,
left_quals,
baserels,
left_detectors))) {
left_detectors)))) {
LOG_WARN("failed to generate outer join detectors", K(ret));
} else if (OB_FAIL(append(outer_join_detectors, left_detectors))) {
LOG_WARN("failed to append detectors", K(ret));
//4. generate right child detectors
} else if (OB_FAIL(generate_outer_join_detectors(stmt,
} else if (OB_FAIL(SMART_CALL(generate_outer_join_detectors(stmt,
joined_table->right_table_,
right_quals,
baserels,
right_detectors))) {
right_detectors)))) {
LOG_WARN("failed to generate outer join detectors", K(ret));
} else if (OB_FAIL(append(outer_join_detectors, right_detectors))) {
LOG_WARN("failed to append detectors", K(ret));

2
src/sql/resolver/dml/ob_dml_resolver.cpp
View File

@ -4689,7 +4689,7 @@ int ObDMLResolver::resolve_joined_table_item(const ParseNode &parse_node, Joined
table_node = parse_node.children_[i];
// nested join case or normal join case
if (T_JOINED_TABLE == table_node->type_) {
if (OB_FAIL(resolve_joined_table(*table_node, child_table))) {
if (OB_FAIL(SMART_CALL(resolve_joined_table(*table_node, child_table)))) {
LOG_WARN("resolve child joined table failed", K(ret));
} else if (1 == i) {
cur_table->left_table_ = child_table;