From 5c46b54684d55c2c9e95da02161032f9d6e0e1e5 Mon Sep 17 00:00:00 2001 From: lck0 Date: Sun, 29 Aug 2021 11:02:55 +0800 Subject: [PATCH] fix bug for gi_flag in ob_log_set --- src/sql/engine/px/ob_granule_pump.cpp | 4 ++-- src/sql/optimizer/ob_log_set.cpp | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/sql/engine/px/ob_granule_pump.cpp b/src/sql/engine/px/ob_granule_pump.cpp index 813cee5681..238e4b8ca0 100644 --- a/src/sql/engine/px/ob_granule_pump.cpp +++ b/src/sql/engine/px/ob_granule_pump.cpp @@ -261,7 +261,7 @@ int ObGranulePump::try_fetch_pwj_tasks( break; default: ret = OB_ERR_UNEXPECTED; - LOG_WARN("unexpected type", K(ret)); + LOG_WARN("unexpected type", K(ret), K(splitter_type_)); } } return ret; @@ -300,7 +300,7 @@ int ObGranulePump::fetch_granule_task( break; default: ret = OB_ERR_UNEXPECTED; - LOG_WARN("unexpected type", K(ret)); + LOG_WARN("unexpected type", K(ret), K(splitter_type_)); } } return ret; diff --git a/src/sql/optimizer/ob_log_set.cpp b/src/sql/optimizer/ob_log_set.cpp index 2adc5de40d..6cc1c91de1 100644 --- a/src/sql/optimizer/ob_log_set.cpp +++ b/src/sql/optimizer/ob_log_set.cpp @@ -1203,17 +1203,7 @@ int ObLogSet::allocate_granule_post(AllocGIContext& ctx) LOG_WARN("set granule nodes affinity failed", K(ret)); } LOG_TRACE("set right child gi to affinity"); - } else if (DIST_PULL_TO_LOCAL == set_dist_algo_) { - ObLogicalOperator* op = NULL; - if (OB_FAIL(get_child(second_child)->find_first_recursive(LOG_GRANULE_ITERATOR, op))) { - LOG_WARN("find granule iterator in right failed", K(ret)); - } else if (NULL == op) { - // granule iterator not found, do nothing - } else { - static_cast(op)->add_flag(GI_ACCESS_ALL); - } - } else { /*do nothing*/ - } + } else { /*do nothing*/ } return ret; } -- GitLab