提交 11bb2672 编写于 作者: M maowei.ymw 提交者: von gosling

Make tag type use 0 as subVersion

上级 3530b76e
...@@ -47,6 +47,7 @@ import org.apache.rocketmq.common.MixAll; ...@@ -47,6 +47,7 @@ import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.ServiceState; import org.apache.rocketmq.common.ServiceState;
import org.apache.rocketmq.common.UtilAll; import org.apache.rocketmq.common.UtilAll;
import org.apache.rocketmq.common.consumer.ConsumeFromWhere; import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
import org.apache.rocketmq.common.filter.ExpressionType;
import org.apache.rocketmq.common.filter.FilterAPI; import org.apache.rocketmq.common.filter.FilterAPI;
import org.apache.rocketmq.common.help.FAQUrl; import org.apache.rocketmq.common.help.FAQUrl;
import org.apache.rocketmq.logging.InternalLogger; import org.apache.rocketmq.logging.InternalLogger;
...@@ -227,11 +228,12 @@ public class DefaultMQPullConsumerImpl implements MQConsumerInner { ...@@ -227,11 +228,12 @@ public class DefaultMQPullConsumerImpl implements MQConsumerInner {
long timeoutMillis = block ? this.defaultMQPullConsumer.getConsumerTimeoutMillisWhenSuspend() : timeout; long timeoutMillis = block ? this.defaultMQPullConsumer.getConsumerTimeoutMillisWhenSuspend() : timeout;
boolean isTagType = ExpressionType.isTagType(subscriptionData.getExpressionType());
PullResult pullResult = this.pullAPIWrapper.pullKernelImpl( PullResult pullResult = this.pullAPIWrapper.pullKernelImpl(
mq, mq,
subscriptionData.getSubString(), subscriptionData.getSubString(),
subscriptionData.getExpressionType(), subscriptionData.getExpressionType(),
subscriptionData.getSubVersion(), isTagType ? 0L : subscriptionData.getSubVersion(),
offset, offset,
maxNums, maxNums,
sysFlag, sysFlag,
...@@ -455,11 +457,12 @@ public class DefaultMQPullConsumerImpl implements MQConsumerInner { ...@@ -455,11 +457,12 @@ public class DefaultMQPullConsumerImpl implements MQConsumerInner {
long timeoutMillis = block ? this.defaultMQPullConsumer.getConsumerTimeoutMillisWhenSuspend() : timeout; long timeoutMillis = block ? this.defaultMQPullConsumer.getConsumerTimeoutMillisWhenSuspend() : timeout;
boolean isTagType = ExpressionType.isTagType(subscriptionData.getExpressionType());
this.pullAPIWrapper.pullKernelImpl( this.pullAPIWrapper.pullKernelImpl(
mq, mq,
subscriptionData.getSubString(), subscriptionData.getSubString(),
subscriptionData.getExpressionType(), subscriptionData.getExpressionType(),
subscriptionData.getSubVersion(), isTagType ? 0L : subscriptionData.getSubVersion(),
offset, offset,
maxNums, maxNums,
sysFlag, sysFlag,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册