You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by GitBox <gi...@apache.org> on 2017/12/13 12:10:03 UTC
[GitHub] dongeforever closed pull request #60: [ROCKETMQ-96]Rename some temp variable and field
dongeforever closed pull request #60: [ROCKETMQ-96]Rename some temp variable and field
URL: https://github.com/apache/rocketmq/pull/60
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
index 38b80738..280b6a32 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
@@ -46,7 +46,10 @@
private final TreeMap<Long, MessageExt> msgTreeMap = new TreeMap<Long, MessageExt>();
private final AtomicLong msgCount = new AtomicLong();
private final Lock lockConsume = new ReentrantLock();
- private final TreeMap<Long, MessageExt> msgTreeMapTemp = new TreeMap<Long, MessageExt>();
+ /**
+ * A subset of msgTreeMap, will only be used when orderly consume
+ */
+ private final TreeMap<Long, MessageExt> consumingMsgOrderlyTreeMap = new TreeMap<Long, MessageExt>();
private final AtomicLong tryUnlockTimes = new AtomicLong(0);
private volatile long queueOffsetMax = 0L;
private volatile boolean dropped = false;
@@ -235,8 +238,8 @@ public void rollback() {
try {
this.lockTreeMap.writeLock().lockInterruptibly();
try {
- this.msgTreeMap.putAll(this.msgTreeMapTemp);
- this.msgTreeMapTemp.clear();
+ this.msgTreeMap.putAll(this.consumingMsgOrderlyTreeMap);
+ this.consumingMsgOrderlyTreeMap.clear();
} finally {
this.lockTreeMap.writeLock().unlock();
}
@@ -249,9 +252,9 @@ public long commit() {
try {
this.lockTreeMap.writeLock().lockInterruptibly();
try {
- Long offset = this.msgTreeMapTemp.lastKey();
- msgCount.addAndGet(this.msgTreeMapTemp.size() * (-1));
- this.msgTreeMapTemp.clear();
+ Long offset = this.consumingMsgOrderlyTreeMap.lastKey();
+ msgCount.addAndGet(this.consumingMsgOrderlyTreeMap.size() * (-1));
+ this.consumingMsgOrderlyTreeMap.clear();
if (offset != null) {
return offset + 1;
}
@@ -270,7 +273,7 @@ public void makeMessageToCosumeAgain(List<MessageExt> msgs) {
this.lockTreeMap.writeLock().lockInterruptibly();
try {
for (MessageExt msg : msgs) {
- this.msgTreeMapTemp.remove(msg.getQueueOffset());
+ this.consumingMsgOrderlyTreeMap.remove(msg.getQueueOffset());
this.msgTreeMap.put(msg.getQueueOffset(), msg);
}
} finally {
@@ -293,7 +296,7 @@ public void makeMessageToCosumeAgain(List<MessageExt> msgs) {
Map.Entry<Long, MessageExt> entry = this.msgTreeMap.pollFirstEntry();
if (entry != null) {
result.add(entry.getValue());
- msgTreeMapTemp.put(entry.getKey(), entry.getValue());
+ consumingMsgOrderlyTreeMap.put(entry.getKey(), entry.getValue());
} else {
break;
}
@@ -332,7 +335,7 @@ public void clear() {
this.lockTreeMap.writeLock().lockInterruptibly();
try {
this.msgTreeMap.clear();
- this.msgTreeMapTemp.clear();
+ this.consumingMsgOrderlyTreeMap.clear();
this.msgCount.set(0);
this.queueOffsetMax = 0L;
} finally {
@@ -389,10 +392,10 @@ public void fillProcessQueueInfo(final ProcessQueueInfo info) {
info.setCachedMsgCount(this.msgTreeMap.size());
}
- if (!this.msgTreeMapTemp.isEmpty()) {
- info.setTransactionMsgMinOffset(this.msgTreeMapTemp.firstKey());
- info.setTransactionMsgMaxOffset(this.msgTreeMapTemp.lastKey());
- info.setTransactionMsgCount(this.msgTreeMapTemp.size());
+ if (!this.consumingMsgOrderlyTreeMap.isEmpty()) {
+ info.setTransactionMsgMinOffset(this.consumingMsgOrderlyTreeMap.firstKey());
+ info.setTransactionMsgMaxOffset(this.consumingMsgOrderlyTreeMap.lastKey());
+ info.setTransactionMsgCount(this.consumingMsgOrderlyTreeMap.size());
}
info.setLocked(this.locked);
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 d828875d..345c3fc3 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
@@ -450,9 +450,9 @@ private SendResult sendDefaultImpl(//
String[] brokersSent = new String[timesTotal];
for (; times < timesTotal; times++) {
String lastBrokerName = null == mq ? null : mq.getBrokerName();
- MessageQueue tmpmq = this.selectOneMessageQueue(topicPublishInfo, lastBrokerName);
- if (tmpmq != null) {
- mq = tmpmq;
+ MessageQueue mqSelected = this.selectOneMessageQueue(topicPublishInfo, lastBrokerName);
+ if (mqSelected != null) {
+ mq = mqSelected;
brokersSent[times] = mq.getBrokerName();
try {
beginTimestampPrev = System.currentTimeMillis();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services