This is an automated email from the ASF dual-hosted git repository. zhouxzhan pushed a commit to branch feature/bname in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 5ba8926974870e46ad631cc6c8eee59a1f04b9f6 Author: zhouxiang <[email protected]> AuthorDate: Mon Oct 17 15:21:41 2022 +0800 [ISSUE #3905] Remove unused header fields * including `CheckTransactionStateRequestHeader`, `EndTransactionRequestHeader`, `ReplyMessageRequestHeader` --- .../rocketmq/broker/processor/ReplyMessageProcessor.java | 1 - .../rocketmq/client/impl/producer/DefaultMQProducerImpl.java | 2 -- .../protocol/header/CheckTransactionStateRequestHeader.java | 9 --------- .../common/protocol/header/EndTransactionRequestHeader.java | 11 ----------- .../common/protocol/header/ReplyMessageRequestHeader.java | 4 ++-- 5 files changed, 2 insertions(+), 25 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessor.java index 42b2edb6c..133165b9f 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessor.java @@ -173,7 +173,6 @@ public class ReplyMessageProcessor extends AbstractSendMessageProcessor { replyMessageRequestHeader.setProperties(requestHeader.getProperties()); replyMessageRequestHeader.setReconsumeTimes(requestHeader.getReconsumeTimes()); replyMessageRequestHeader.setUnitMode(requestHeader.isUnitMode()); - replyMessageRequestHeader.setBname(requestHeader.getBname()); RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.PUSH_REPLY_MESSAGE_TO_CLIENT, replyMessageRequestHeader); request.setBody(msg.getBody()); diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java index deb49e755..6f3c59753 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java @@ -351,7 +351,6 @@ public class DefaultMQProducerImpl implements MQProducerInner { thisHeader.setTranStateTableOffset(checkRequestHeader.getTranStateTableOffset()); thisHeader.setFromTransactionCheck(true); thisHeader.setBname(checkRequestHeader.getBname()); - thisHeader.setQueueId(checkRequestHeader.getQueueId()); String uniqueKey = message.getProperties().get(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX); if (uniqueKey == null) { @@ -1327,7 +1326,6 @@ public class DefaultMQProducerImpl implements MQProducerInner { requestHeader.setTransactionId(transactionId); requestHeader.setCommitLogOffset(id.getOffset()); requestHeader.setBname(sendResult.getMessageQueue().getBrokerName()); - requestHeader.setQueueId(sendResult.getMessageQueue().getQueueId()); switch (localTransactionState) { case COMMIT_MESSAGE: requestHeader.setCommitOrRollback(MessageSysFlag.TRANSACTION_COMMIT_TYPE); diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java index 8c4b87c4a..d53091e65 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java @@ -32,7 +32,6 @@ public class CheckTransactionStateRequestHeader extends RpcRequestHeader { private String msgId; private String transactionId; private String offsetMsgId; - private int queueId; @Override public void checkFields() throws RemotingCommandException { @@ -77,12 +76,4 @@ public class CheckTransactionStateRequestHeader extends RpcRequestHeader { public void setOffsetMsgId(String offsetMsgId) { this.offsetMsgId = offsetMsgId; } - - public int getQueueId() { - return queueId; - } - - public void setQueueId(int queueId) { - this.queueId = queueId; - } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/EndTransactionRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/EndTransactionRequestHeader.java index 42a09e8e5..bd2f4ac54 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/EndTransactionRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/EndTransactionRequestHeader.java @@ -43,8 +43,6 @@ public class EndTransactionRequestHeader extends RpcRequestHeader { private String transactionId; - private int queueId; - @Override public void checkFields() throws RemotingCommandException { if (MessageSysFlag.TRANSACTION_NOT_TYPE == this.commitOrRollback) { @@ -128,16 +126,7 @@ public class EndTransactionRequestHeader extends RpcRequestHeader { ", fromTransactionCheck=" + fromTransactionCheck + ", msgId='" + msgId + '\'' + ", transactionId='" + transactionId + '\'' + - ", queueId=" + queueId + ", bname='" + bname + '\'' + '}'; } - - public int getQueueId() { - return queueId; - } - - public void setQueueId(int queueId) { - this.queueId = queueId; - } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/ReplyMessageRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/ReplyMessageRequestHeader.java index aa747e9f4..3bb09073f 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/ReplyMessageRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/ReplyMessageRequestHeader.java @@ -17,12 +17,12 @@ package org.apache.rocketmq.common.protocol.header; -import org.apache.rocketmq.common.rpc.RpcRequestHeader; +import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; import org.apache.rocketmq.remoting.exception.RemotingCommandException; -public class ReplyMessageRequestHeader extends RpcRequestHeader { +public class ReplyMessageRequestHeader implements CommandCustomHeader { @CFNotNull private String producerGroup; @CFNotNull
