[
https://issues.apache.org/jira/browse/GEODE-10227?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17521357#comment-17521357
]
ASF GitHub Bot commented on GEODE-10227:
----------------------------------------
pivotal-jbarrett commented on code in PR #957:
URL: https://github.com/apache/geode-native/pull/957#discussion_r848917389
##########
cppcache/src/TcrEndpoint.cpp:
##########
@@ -754,42 +754,36 @@ 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 ||
- 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) {
+ 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)) ||
Review Comment:
Wasn't there a PR that turned this into an enum or specialized methods
rather magic numbers?
##########
cppcache/src/TcrEndpoint.cpp:
##########
@@ -754,42 +754,36 @@ 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 ||
- 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) {
+ 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
Review Comment:
Fix this comment.
> Remove Redundant Calls to sendRequestForChunkedResponse
> -------------------------------------------------------
>
> Key: GEODE-10227
> URL: https://issues.apache.org/jira/browse/GEODE-10227
> Project: Geode
> Issue Type: Improvement
> Components: native client
> Reporter: Michael Martell
> Assignee: Michael Martell
> Priority: Minor
> Labels: pull-request-available
>
> TcrEndpoint::sendRequestConn contains redundant calls to
> TcrConnection::sendRequestForChunkedResponse which should be removed. The
> current code is illustrated by the following:
> {code:java}
> if (messageType == a || messageType == b)
> sendRequestForChunkedResponse()
> else
> sendRequestForChunkedResponse(){code}
>
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
