From c7f7705cde6df561919cc8c08c9b8a9d9480fffe Mon Sep 17 00:00:00 2001 From: Rahim Kanji Date: Tue, 15 Oct 2024 15:35:19 +0500 Subject: [PATCH] Code cleanup --- lib/Base_Thread.cpp | 4 +--- lib/PgSQL_Connection.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Base_Thread.cpp b/lib/Base_Thread.cpp index a1e2ebcc8..66a4acdbb 100644 --- a/lib/Base_Thread.cpp +++ b/lib/Base_Thread.cpp @@ -377,9 +377,7 @@ bool Base_Thread::set_backend_to_be_skipped_if_frontend_is_slow(DS * myds, unsig // but assuming that client isn't completely blocked, we will stop checking for data // only at mysql_thread___threshold_resultset_size * 4 if constexpr (std::is_same_v) { - unsigned int buffered_data = 0; - buffered_data = myds->sess->client_myds->PSarrayOUT->len * PGSQL_RESULTSET_BUFLEN; - //buffered_data += myds->sess->client_myds->resultset->len * PGSQL_RESULTSET_BUFLEN; + const unsigned int buffered_data = myds->sess->client_myds->PSarrayOUT->len * PGSQL_RESULTSET_BUFLEN; if (buffered_data > (unsigned int)pgsql_thread___threshold_resultset_size * 4) { thr->mypolls.fds[n].events = 0; return true; diff --git a/lib/PgSQL_Connection.cpp b/lib/PgSQL_Connection.cpp index 6fefbf3ef..13b159c5c 100644 --- a/lib/PgSQL_Connection.cpp +++ b/lib/PgSQL_Connection.cpp @@ -1757,9 +1757,7 @@ handler_again: { if (myds->sess && myds->sess->client_myds && myds->sess->mirror == false /* && myds->sess->status != SHOW_WARNINGS*/) { // see issue#4072 - unsigned int buffered_data = 0; - buffered_data = myds->sess->client_myds->PSarrayOUT->len * PGSQL_RESULTSET_BUFLEN; - //buffered_data += myds->sess->client_myds->resultset->len * PGSQL_RESULTSET_BUFLEN; + const unsigned int buffered_data = myds->sess->client_myds->PSarrayOUT->len * PGSQL_RESULTSET_BUFLEN; if (buffered_data > (unsigned int)pgsql_thread___threshold_resultset_size * 8) { next_event(ASYNC_USE_RESULT_CONT); // we temporarily pause . See #1232 break;