diff --git a/src/sql/engine/px/exchange/ob_px_receive.cpp b/src/sql/engine/px/exchange/ob_px_receive.cpp
index 5cac69041..d95dc08bb 100644
--- a/src/sql/engine/px/exchange/ob_px_receive.cpp
+++ b/src/sql/engine/px/exchange/ob_px_receive.cpp
@@ -533,9 +533,6 @@ int ObPxFifoReceive::get_one_row_from_channels(
       }
     }
   }
-  if (OB_SUCC(ret) && !got_row) {
-    ret = OB_EAGAIN;
-  }
   return ret;
 }
 
diff --git a/src/sql/executor/ob_multiscan_task_spliter.cpp b/src/sql/executor/ob_multiscan_task_spliter.cpp
index 4841c8d47..20cc36efc 100644
--- a/src/sql/executor/ob_multiscan_task_spliter.cpp
+++ b/src/sql/executor/ob_multiscan_task_spliter.cpp
@@ -451,10 +451,7 @@ int ObDistributedTaskSpliter::init_table_locations(ObPhyOperator* root_op)
       if (PHY_MV_TABLE_SCAN == scan_op->get_type()) {
         const ObMVTableScan* mv_scan_op = static_cast<const ObMVTableScan*>(scan_op);
         table_loc = NULL;
-        if (OB_ISNULL(mv_scan_op)) {
-          ret = OB_ERR_UNEXPECTED;
-          LOG_ERROR("mv scan op is NULL", K(ret), K(scan_op), K(mv_scan_op));
-        } else if (OB_FAIL(ObTaskExecutorCtxUtil::get_phy_table_location(*exec_ctx_,
+        if (OB_FAIL(ObTaskExecutorCtxUtil::get_phy_table_location(*exec_ctx_,
                        mv_scan_op->get_right_table_location_key(),
                        mv_scan_op->get_right_table_location_key(),
                        table_loc))) {