You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by "yiguolei (via GitHub)" <gi...@apache.org> on 2023/04/10 06:23:31 UTC
[GitHub] [doris] yiguolei commented on a diff in pull request #18503: [enhancement](exception) Column filter/replicate supports exception safety
yiguolei commented on code in PR #18503:
URL: https://github.com/apache/doris/pull/18503#discussion_r1161468279
##########
be/src/runtime/thread_context.h:
##########
@@ -312,33 +312,22 @@ class StopCheckThreadMemTrackerLimit {
tracker->transfer_to( \
size, doris::thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker_raw())
-// Consider catching other memory errors, such as memset failure, etc.
-#define RETURN_IF_CATCH_BAD_ALLOC(stmt) \
- do { \
- doris::thread_context()->thread_mem_tracker_mgr->clear_exceed_mem_limit_msg(); \
- if (doris::enable_thread_catch_bad_alloc) { \
- try { \
- { stmt; } \
- } catch (std::bad_alloc const& e) { \
- doris::thread_context()->thread_mem_tracker()->print_log_usage( \
- doris::thread_context()->thread_mem_tracker_mgr->exceed_mem_limit_msg()); \
- return Status::MemoryLimitExceeded(fmt::format( \
- "PreCatch {}, {}", e.what(), \
- doris::thread_context()->thread_mem_tracker_mgr->exceed_mem_limit_msg())); \
- } \
- } else { \
- try { \
- doris::enable_thread_catch_bad_alloc = true; \
- Defer defer {[&]() { doris::enable_thread_catch_bad_alloc = false; }}; \
- { stmt; } \
- } catch (std::bad_alloc const& e) { \
- doris::thread_context()->thread_mem_tracker()->print_log_usage( \
- doris::thread_context()->thread_mem_tracker_mgr->exceed_mem_limit_msg()); \
- return Status::MemoryLimitExceeded(fmt::format( \
- "PreCatch {}, {}", e.what(), \
- doris::thread_context()->thread_mem_tracker_mgr->exceed_mem_limit_msg())); \
- } \
- } \
+#define RETURN_IF_CATCH_EXCEPTION(stmt) \
+ do { \
+ try { \
+ doris::thread_context()->thread_mem_tracker_mgr->clear_exceed_mem_limit_msg(); \
+ enable_thread_catch_bad_alloc++; \
+ { stmt; } \
+ enable_thread_catch_bad_alloc--; \
Review Comment:
use defer to --, if returned in line 320
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org