Finish the basic create,produce,consume of the static topic

client/src/main/java/org/apache/rocketmq/client/consumer/PullResult.java

@@ -26,6 +26,7 @@ public class PullResult {
     private final long maxOffset;
     private List<MessageExt> msgFoundList;
 
+
     public PullResult(PullStatus pullStatus, long nextBeginOffset, long minOffset, long maxOffset,
         List<MessageExt> msgFoundList) {
         super();

client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java

@@ -973,7 +973,7 @@ public class MQClientAPIImpl {
             (PullMessageResponseHeader) response.decodeCommandCustomHeader(PullMessageResponseHeader.class);
 
         return new PullResultExt(pullStatus, responseHeader.getNextBeginOffset(), responseHeader.getMinOffset(),
-            responseHeader.getMaxOffset(), null, responseHeader.getSuggestWhichBrokerId(), response.getBody());
+            responseHeader.getMaxOffset(), null, responseHeader.getSuggestWhichBrokerId(), response.getBody(), responseHeader.getOffsetDelta());
     }
 
     private PopResult processPopResponse(final String brokerName, final RemotingCommand response, String topic,

client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java

@@ -107,6 +107,10 @@ public class PullAPIWrapper {
                 MessageAccessor.putProperty(msg, MessageConst.PROPERTY_MAX_OFFSET,
                     Long.toString(pullResult.getMaxOffset()));
                 msg.setBrokerName(mq.getBrokerName());
+                msg.setQueueId(mq.getQueueId());
+                if (pullResultExt.getOffsetDelta() != null) {
+                    msg.setQueueOffset(pullResultExt.getOffsetDelta() + msg.getQueueOffset());
+                }
             }
 
             pullResultExt.setMsgFoundList(msgListFilterAgain);

client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullResultExt.java

@@ -25,11 +25,23 @@ public class PullResultExt extends PullResult {
     private final long suggestWhichBrokerId;
     private byte[] messageBinary;
 
+    private final Long offsetDelta;
+
     public PullResultExt(PullStatus pullStatus, long nextBeginOffset, long minOffset, long maxOffset,
         List<MessageExt> msgFoundList, final long suggestWhichBrokerId, final byte[] messageBinary) {
+        this(pullStatus, nextBeginOffset, minOffset, maxOffset, msgFoundList, suggestWhichBrokerId, messageBinary, 0L);
+    }
+
+    public PullResultExt(PullStatus pullStatus, long nextBeginOffset, long minOffset, long maxOffset,
+                         List<MessageExt> msgFoundList, final long suggestWhichBrokerId, final byte[] messageBinary, final Long offsetDelta) {
         super(pullStatus, nextBeginOffset, minOffset, maxOffset, msgFoundList);
         this.suggestWhichBrokerId = suggestWhichBrokerId;
         this.messageBinary = messageBinary;
+        this.offsetDelta = offsetDelta;
+    }
+
+    public Long getOffsetDelta() {
+        return offsetDelta;
     }
 
     public byte[] getMessageBinary() {

test/src/test/java/org/apache/rocketmq/test/smoke/StaticTopicIT.java

@@ -2,6 +2,9 @@ package org.apache.rocketmq.test.smoke;
 
 import org.apache.log4j.Logger;
 import org.apache.rocketmq.common.MixAll;
+import org.apache.rocketmq.common.message.MessageClientExt;
+import org.apache.rocketmq.common.message.MessageConst;
+import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.common.protocol.body.ClusterInfo;
 import org.apache.rocketmq.common.rpc.ClientMetadata;
@@ -9,8 +12,11 @@ import org.apache.rocketmq.common.statictopic.TopicConfigAndQueueMapping;
 import org.apache.rocketmq.common.statictopic.TopicQueueMappingOne;
 import org.apache.rocketmq.common.statictopic.TopicQueueMappingUtils;
 import org.apache.rocketmq.test.base.BaseConf;
+import org.apache.rocketmq.test.client.rmq.RMQNormalConsumer;
 import org.apache.rocketmq.test.client.rmq.RMQNormalProducer;
+import org.apache.rocketmq.test.listener.rmq.concurrent.RMQNormalListener;
 import org.apache.rocketmq.test.util.MQRandomUtils;
+import org.apache.rocketmq.test.util.VerifyUtils;
 import org.apache.rocketmq.tools.admin.DefaultMQAdminExt;
 import org.junit.After;
 import org.junit.Assert;
@@ -19,11 +25,15 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.apache.rocketmq.common.statictopic.TopicQueueMappingUtils.getMappingDetailFromConfig;
 
 @FixMethodOrder
@@ -63,11 +73,16 @@ public class StaticTopicIT extends BaseConf {
     }
 
     @Test
-    public void testCreateAndRemappingStaticTopic() throws Exception {
+    public void testCreateProduceConsumeStaticTopic() throws Exception {
         String topic = "static" + MQRandomUtils.getRandomTopic();
         RMQNormalProducer producer = getProducer(nsAddr, topic);
+        RMQNormalConsumer consumer = getConsumer(nsAddr, topic, "*", new RMQNormalListener());
+
         int queueNum = 10;
+        int msgEachQueue = 100;
+        //create static topic
         Map<String, TopicConfigAndQueueMapping> localBrokerConfigMap = createStaticTopic(topic, queueNum, getBrokers());
+        //check the static topic config
         {
             Map<String, TopicConfigAndQueueMapping> remoteBrokerConfigMap = defaultMQAdminExt.examineTopicConfigAll(clientMetadata, topic);
             Assert.assertEquals(2, remoteBrokerConfigMap.size());
@@ -82,6 +97,7 @@ public class StaticTopicIT extends BaseConf {
             Map<Integer, TopicQueueMappingOne>  globalIdMap = TopicQueueMappingUtils.checkAndBuildMappingItems(new ArrayList<>(getMappingDetailFromConfig(remoteBrokerConfigMap.values())), false, true);
             Assert.assertEquals(queueNum, globalIdMap.size());
         }
+        //check the route data
         List<MessageQueue> messageQueueList = producer.getMessageQueue();
         Assert.assertEquals(queueNum, messageQueueList.size());
         producer.setDebug(true);
@@ -91,23 +107,45 @@ public class StaticTopicIT extends BaseConf {
             Assert.assertEquals(i, messageQueue.getQueueId());
             Assert.assertEquals(MixAll.LOGICAL_QUEUE_MOCK_BROKER_NAME, messageQueue.getBrokerName());
         }
+        //send and consume the msg
         for(MessageQueue messageQueue: messageQueueList) {
-            producer.send(100, messageQueue);
+            producer.send(msgEachQueue, messageQueue);
         }
         //leave the time to build the cq
         Thread.sleep(500);
         for(MessageQueue messageQueue: messageQueueList) {
             Assert.assertEquals(0, defaultMQAdminExt.minOffset(messageQueue));
-            Assert.assertEquals(100, defaultMQAdminExt.maxOffset(messageQueue));
+            Assert.assertEquals(msgEachQueue, defaultMQAdminExt.maxOffset(messageQueue));
         }
-        Assert.assertEquals(100 * queueNum, producer.getAllOriginMsg().size());
+        Assert.assertEquals(msgEachQueue * queueNum, producer.getAllOriginMsg().size());
         Assert.assertEquals(0, producer.getSendErrorMsg().size());
-        /*{
-            Set<String> targetBrokers = Collections.singleton(broker1Name);
-            Map<String, TopicConfigAndQueueMapping> brokerConfigMapFromRemote = defaultMQAdminExt.examineTopicConfigAll(clientMetadata, topic);
-            TopicRemappingDetailWrapper wrapper = TopicQueueMappingUtils.remappingStaticTopic(topic, brokerConfigMapFromRemote, targetBrokers);
 
-        }*/
+        consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime);
+        assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(),
+                consumer.getListener().getAllMsgBody()))
+                .containsExactlyElementsIn(producer.getAllMsgBody());
+        Map<Integer, List<MessageExt>> messagesByQueue = new HashMap<>();
+        for (Object object : consumer.getListener().getAllOriginMsg()) {
+            MessageExt messageExt = (MessageExt) object;
+            if (!messagesByQueue.containsKey(messageExt.getQueueId())) {
+                messagesByQueue.put(messageExt.getQueueId(), new ArrayList<>());
+            }
+            messagesByQueue.get(messageExt.getQueueId()).add(messageExt);
+        }
+        Assert.assertEquals(queueNum, messagesByQueue.size());
+        for (int i = 0; i < queueNum; i++) {
+            List<MessageExt> messageExts = messagesByQueue.get(i);
+            Assert.assertEquals(msgEachQueue, messageExts.size());
+            Collections.sort(messageExts, new Comparator<MessageExt>() {
+                @Override
+                public int compare(MessageExt o1, MessageExt o2) {
+                    return (int) (o1.getQueueOffset() - o2.getQueueOffset());
+                }
+            });
+            for (int j = 0; j < msgEachQueue; j++) {
+                Assert.assertEquals(j, messageExts.get(j).getQueueOffset());
+            }
+        }
     }