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

Fix deadcode

Browse Source
This commit is contained in:
tj0
2021-09-14 16:38:03 +08:00
committed by wangzelin.wzl
parent 37b8f054b0
commit dbdba724ae
5 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/connect_by/ob_connect_by_utility.cpp
View File

@ -575,10 +575,7 @@ int ObConnectByPump::calc_prior_and_check_cycle(PumpNode& node, bool set_refacto
int idx = 0; int idx = 0;
DLIST_FOREACH(expr, *connect_by_prior_exprs_) DLIST_FOREACH(expr, *connect_by_prior_exprs_)
{ {
if (OB_ISNULL(expr)) { if (OB_FAIL(expr->calc(*expr_ctx_, *node.pump_row_, prior_exprs_result_row_.cells_[idx]))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr is NULL", K(ret));
} else if (OB_FAIL(expr->calc(*expr_ctx_, *node.pump_row_, prior_exprs_result_row_.cells_[idx]))) {
LOG_WARN("fail to calc prior expr", KPC(expr)); LOG_WARN("fail to calc prior expr", KPC(expr));
} else { } else {
++idx; ++idx;

5
src/sql/engine/connect_by/ob_connect_by_utility_bfs.cpp
View File

@ -491,10 +491,7 @@ int ObConnectByPumpBFS::calc_path_node(const ObNewRow& left_row, PumpNode& pump_
int idx = 0; int idx = 0;
DLIST_FOREACH(expr, *connect_by_prior_exprs_) DLIST_FOREACH(expr, *connect_by_prior_exprs_)
{ {
if (OB_ISNULL(expr)) { if (OB_FAIL(expr->calc(*expr_ctx_, left_row, row.cells_[idx]))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr is NULL", K(ret));
} else if (OB_FAIL(expr->calc(*expr_ctx_, left_row, row.cells_[idx]))) {
LOG_WARN("fail to calc prior expr", KPC(expr)); LOG_WARN("fail to calc prior expr", KPC(expr));
} else { } else {
++idx; ++idx;

5
src/sql/engine/dml/ob_table_merge.cpp
View File

@ -355,10 +355,7 @@ int ObTableMerge::calc_condition(ObExprCtx& expr_ctx, const ObNewRow& left_row,
} else { } else {
DLIST_FOREACH(p, cond_exprs) DLIST_FOREACH(p, cond_exprs)
{ {
if (OB_ISNULL(p)) { if (OB_FAIL(p->calc(expr_ctx, left_row, right_row, result))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("node is NULL", K(ret));
} else if (OB_FAIL(p->calc(expr_ctx, left_row, right_row, result))) {
LOG_WARN("failed to calc expression", K(ret), K(*p), "op_type", ob_phy_operator_type_str(get_type())); LOG_WARN("failed to calc expression", K(ret), K(*p), "op_type", ob_phy_operator_type_str(get_type()));
} else if (OB_FAIL(ObObjEvaluator::is_true(result, is_true))) { } else if (OB_FAIL(ObObjEvaluator::is_true(result, is_true))) {
LOG_WARN("failed to call is true", K(ret)); LOG_WARN("failed to call is true", K(ret));

5
src/sql/engine/dml/ob_table_replace.cpp
View File

@ -612,10 +612,7 @@ int ObTableReplace::scan_row(ObExecContext& ctx, const ObPartitionKey& part_key,
DLIST_FOREACH(node, virtual_column_exprs_) DLIST_FOREACH(node, virtual_column_exprs_)
{ {
const ObColumnExpression* expr = static_cast<const ObColumnExpression*>(node); const ObColumnExpression* expr = static_cast<const ObColumnExpression*>(node);
if (OB_ISNULL(expr)) { if (OB_FAIL(scan_param.virtual_column_exprs_.push_back(expr))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("node or node expr is NULL", K(ret));
} else if (OB_FAIL(scan_param.virtual_column_exprs_.push_back(expr))) {
LOG_WARN("fail to push back virtual column expr", K(ret)); LOG_WARN("fail to push back virtual column expr", K(ret));
} }
} }

5
src/sql/engine/dml/ob_table_update.cpp
View File

@ -320,10 +320,6 @@ int ObTableUpdate::get_next_row(ObExecContext& ctx, const ObNewRow*& row) const
const ObNewRow& new_row = update_ctx->new_row_; const ObNewRow& new_row = update_ctx->new_row_;
DLIST_FOREACH(cur_expr, new_spk_exprs_) DLIST_FOREACH(cur_expr, new_spk_exprs_)
{ {
if (OB_ISNULL(cur_expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("current new spke expr is null", K(new_spk_exprs_));
} else {
const ObColumnExpression* new_spk_expr = static_cast<const ObColumnExpression*>(cur_expr); const ObColumnExpression* new_spk_expr = static_cast<const ObColumnExpression*>(cur_expr);
int64_t result_idx = new_spk_expr->get_result_index(); int64_t result_idx = new_spk_expr->get_result_index();
if (OB_UNLIKELY(result_idx < 0) || OB_UNLIKELY(result_idx >= new_row.count_)) { if (OB_UNLIKELY(result_idx < 0) || OB_UNLIKELY(result_idx >= new_row.count_)) {
@ -332,7 +328,6 @@ int ObTableUpdate::get_next_row(ObExecContext& ctx, const ObNewRow*& row) const
LOG_WARN("calc new spk expr failed", K(ret), KPC(new_spk_expr), K(result_idx), K(new_row)); LOG_WARN("calc new spk expr failed", K(ret), KPC(new_spk_expr), K(result_idx), K(new_row));
} }
} }
}
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
LOG_DEBUG("get new row", K(update_ctx->new_row_)); LOG_DEBUG("get new row", K(update_ctx->new_row_));
row = &(update_ctx->new_row_); row = &(update_ctx->new_row_);