remove removeDropedPullRequestOpaque and deleteOpaqueForDropPullRequest.

Author: ifplusor

src/MQClientAPIImpl.cpp

@@ -430,10 +430,6 @@ void MQClientAPIImpl::sendMessageAsync(const string& addr,
   }
 }
 
-void MQClientAPIImpl::deleteOpaqueForDropPullRequest(const MQMessageQueue& mq, int opaque) {
-  m_pRemotingClient->deleteOpaqueForDropPullRequest(mq, opaque);
-}
-
 PullResult* MQClientAPIImpl::pullMessage(const string& addr,
                                          PullMessageRequestHeader* pRequestHeader,
                                          int timeoutMillis,

src/MQClientAPIImpl.h

@@ -187,7 +187,6 @@ class MQClientAPIImpl {
                         int64 timeoutMilliseconds,
                         int maxRetryTimes = 1,
                         int retrySendTimes = 1);
-  void deleteOpaqueForDropPullRequest(const MQMessageQueue& mq, int opaque);
 
  private:
   SendResult sendMessageSync(const string& addr,

src/MQClientFactory.cpp

@@ -988,18 +988,6 @@ void MQClientFactory::findConsumerIds(const string& topic,
   }
 }
 
-void MQClientFactory::removeDropedPullRequestOpaque(PullRequest* pullRequest) {
-  // delete the opaque record that's ignore the response of this pullrequest when drop pullrequest
-  if (!pullRequest)
-    return;
-  MQMessageQueue mq = pullRequest->m_messageQueue;
-  int opaque = pullRequest->getLatestPullRequestOpaque();
-  if (opaque > 0) {
-    LOG_INFO("####### need delete the pullrequest for opaque:%d, mq:%s", opaque, mq.toString().data());
-    getMQClientAPIImpl()->deleteOpaqueForDropPullRequest(mq, opaque);
-  }
-}
-
 void MQClientFactory::resetOffset(const string& group,
                                   const string& topic,
                                   const map<MQMessageQueue, int64>& offsetTable) {
@@ -1014,8 +1002,6 @@ void MQClientFactory::resetOffset(const string& group,
         pullreq->setDroped(true);
         LOG_INFO("resetOffset setDroped for opaque:%d, mq:%s", pullreq->getLatestPullRequestOpaque(),
                  mq.toString().data());
-        // delete the opaque record that's ignore the response of this pullrequest when drop pullrequest
-        // removeDropedPullRequestOpaque(pullreq);
         pullreq->clearAllMsgs();
         pullreq->updateQueueMaxOffset(it->second);
       } else {

src/MQClientFactory.h

@@ -108,7 +108,6 @@ class MQClientFactory {
   void addBrokerToAddrMap(const string& brokerName, map<int, string>& brokerAddrs);
   map<string, map<int, string>> getBrokerAddrMap();
   void clearBrokerAddrMap();
-  void removeDropedPullRequestOpaque(PullRequest* pullRequest);
 
  private:
   void unregisterClient(const string& producerGroup,

src/transport/TcpRemotingClient.cpp

@@ -639,21 +639,5 @@ void TcpRemotingClient::removeAllTimerCallback() {
   m_asyncTimerTable.clear();
 }
 
-void TcpRemotingClient::deleteOpaqueForDropPullRequest(const MQMessageQueue& mq, int opaque) {
-  // delete the map record of opaque<->ResponseFuture, so the answer for the pull request will
-  // discard when receive it later
-  std::shared_ptr<ResponseFuture> pFuture(findAndDeleteAsyncResponseFuture(opaque));
-  if (!pFuture) {
-    pFuture = findAndDeleteResponseFuture(opaque);
-    if (pFuture) {
-      LOG_DEBUG("succ deleted the sync pullrequest for opaque:%d, mq:%s", opaque, mq.toString().data());
-    }
-  } else {
-    LOG_DEBUG("succ deleted the async pullrequest for opaque:%d, mq:%s", opaque, mq.toString().data());
-    // delete the timeout timer for opaque for pullrequest
-    cancelTimerCallback(opaque);
-  }
-}
-
 //<!************************************************************************
 }  // namespace rocketmq

src/transport/TcpRemotingClient.h

@@ -58,8 +58,6 @@ class TcpRemotingClient {
 
   void registerProcessor(MQRequestCode requestCode, ClientRemotingProcessor* clientRemotingProcessor);
 
-  void deleteOpaqueForDropPullRequest(const MQMessageQueue& mq, int opaque);
-
  private:
   static void static_messageReceived(void* context, const MemoryBlock& mem, const string& addr);