You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by mm...@apache.org on 2022/04/20 04:57:50 UTC
[geode-native] branch develop updated: GEODE-10227: Remove redundant sendRequestForChunkedResponse (#957)
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 1d9a2cc5f GEODE-10227: Remove redundant sendRequestForChunkedResponse (#957)
1d9a2cc5f is described below
commit 1d9a2cc5feb72f3c5d2caa97f3208a381c04afd6
Author: Michael Martell <mm...@pivotal.io>
AuthorDate: Tue Apr 19 21:57:44 2022 -0700
GEODE-10227: Remove redundant sendRequestForChunkedResponse (#957)
* Remove redundant sendRequestForChunkedResponse
* Remove vestigial comment
---
cppcache/src/TcrEndpoint.cpp | 53 +++++++++++++++-----------------------------
1 file changed, 18 insertions(+), 35 deletions(-)
diff --git a/cppcache/src/TcrEndpoint.cpp b/cppcache/src/TcrEndpoint.cpp
index dd79756e1..aab41b9fe 100644
--- a/cppcache/src/TcrEndpoint.cpp
+++ b/cppcache/src/TcrEndpoint.cpp
@@ -754,42 +754,25 @@ GfErrType TcrEndpoint::sendRequestConn(const TcrMessage& request,
// TcrMessage * req = const_cast<TcrMessage *>(&request);
LOGDEBUG("TcrEndpoint::sendRequestConn = %p", m_baseDM);
if (m_baseDM != nullptr) m_baseDM->beforeSendingRequest(request, conn);
- if (((type == TcrMessage::EXECUTE_FUNCTION ||
+ if (type == TcrMessage::REGISTER_INTEREST_LIST ||
+ type == TcrMessage::REGISTER_INTEREST || type == TcrMessage::QUERY ||
+ type == TcrMessage::QUERY_WITH_PARAMETERS ||
+ type == TcrMessage::GET_ALL_70 ||
+ type == TcrMessage::GET_ALL_WITH_CALLBACK || type == TcrMessage::PUTALL ||
+ type == TcrMessage::PUT_ALL_WITH_CALLBACK ||
+ type == TcrMessage::REMOVE_ALL ||
+ ((type == TcrMessage::EXECUTE_FUNCTION ||
type == TcrMessage::EXECUTE_REGION_FUNCTION) &&
- (request.hasResult() & 2))) {
- conn->sendRequestForChunkedResponse(request, request.getMsgLength(), reply,
- request.getTimeout(),
- reply.getTimeout());
- } else if (type == TcrMessage::REGISTER_INTEREST_LIST ||
- type == TcrMessage::REGISTER_INTEREST ||
- type == TcrMessage::QUERY ||
- type == TcrMessage::QUERY_WITH_PARAMETERS ||
- type == TcrMessage::GET_ALL_70 ||
- type == TcrMessage::GET_ALL_WITH_CALLBACK ||
- type == TcrMessage::PUTALL ||
- type == TcrMessage::PUT_ALL_WITH_CALLBACK ||
- type == TcrMessage::REMOVE_ALL ||
- ((type == TcrMessage::EXECUTE_FUNCTION ||
- type == TcrMessage::EXECUTE_REGION_FUNCTION) &&
- (request.hasResult() & 2)) ||
- type ==
- TcrMessage::EXECUTE_REGION_FUNCTION_SINGLE_HOP || // This is
- // kept
- // aside as
- // server
- // always
- // sends
- // chunked
- // response.
- type == TcrMessage::EXECUTECQ_MSG_TYPE ||
- type == TcrMessage::STOPCQ_MSG_TYPE ||
- type == TcrMessage::CLOSECQ_MSG_TYPE ||
- type == TcrMessage::KEY_SET ||
- type == TcrMessage::CLOSECLIENTCQS_MSG_TYPE ||
- type == TcrMessage::GETCQSTATS_MSG_TYPE ||
- type == TcrMessage::MONITORCQ_MSG_TYPE ||
- type == TcrMessage::EXECUTECQ_WITH_IR_MSG_TYPE ||
- type == TcrMessage::GETDURABLECQS_MSG_TYPE) {
+ (request.hasResult() & 2)) ||
+ type == TcrMessage::EXECUTE_REGION_FUNCTION_SINGLE_HOP ||
+ type == TcrMessage::EXECUTECQ_MSG_TYPE ||
+ type == TcrMessage::STOPCQ_MSG_TYPE ||
+ type == TcrMessage::CLOSECQ_MSG_TYPE || type == TcrMessage::KEY_SET ||
+ type == TcrMessage::CLOSECLIENTCQS_MSG_TYPE ||
+ type == TcrMessage::GETCQSTATS_MSG_TYPE ||
+ type == TcrMessage::MONITORCQ_MSG_TYPE ||
+ type == TcrMessage::EXECUTECQ_WITH_IR_MSG_TYPE ||
+ type == TcrMessage::GETDURABLECQS_MSG_TYPE) {
conn->sendRequestForChunkedResponse(request, request.getMsgLength(), reply,
request.getTimeout(),
reply.getTimeout());