[CP] [4.1] fix remote plan execute timeout serval bugs

2023-06-16 07:42:18 +00:00
parent ab5a6d490b
commit 98078bdc41
15 changed files with 111 additions and 21 deletions
--- a/src/sql/ob_result_set.cpp
+++ b/src/sql/ob_result_set.cpp
@ -893,6 +893,11 @@ int ObResultSet::close()
      ret = OB_SUCCESS == ret ? tmp_ret : ret;
    }
  }
+  // notify close fail to listener
+  int err = COVER_SUCC(do_close_plan_ret);
+  if (OB_SUCCESS != err && close_fail_cb_.is_valid()) {
+    close_fail_cb_(err);
+  }
  //NG_TRACE_EXT(result_set_close, OB_ID(ret), ret, OB_ID(arg1), prev_ret,
               //OB_ID(arg2), ins_ret, OB_ID(arg3), errcode_, OB_ID(async), async);
  return ret;  // 后面所有的操作都通过callback来完成