未验证 提交 a83cdc5f 编写于 作者: G Git_Yang 提交者: GitHub

[format] Fix formatting errors (#3380)

Signed-off-by: Nzhangyang <Git_Yang@163.com>
上级 4dbdbf0a
...@@ -23,7 +23,6 @@ import java.io.FileNotFoundException; ...@@ -23,7 +23,6 @@ import java.io.FileNotFoundException;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import java.util.SortedMap; import java.util.SortedMap;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -210,9 +209,9 @@ public class AclUtils { ...@@ -210,9 +209,9 @@ public class AclUtils {
// expand netaddress // expand netaddress
int separatorCount = StringUtils.countMatches(netaddress, ":"); int separatorCount = StringUtils.countMatches(netaddress, ":");
int padCount = part - separatorCount; int padCount = part - separatorCount;
if(padCount > 0){ if (padCount > 0) {
StringBuilder padStr = new StringBuilder(":"); StringBuilder padStr = new StringBuilder(":");
for(int i = 0; i < padCount; i++){ for (int i = 0; i < padCount; i++) {
padStr.append(":"); padStr.append(":");
} }
netaddress = StringUtils.replace(netaddress, "::", padStr.toString()); netaddress = StringUtils.replace(netaddress, "::", padStr.toString());
...@@ -221,7 +220,7 @@ public class AclUtils { ...@@ -221,7 +220,7 @@ public class AclUtils {
// pad netaddress // pad netaddress
String[] strArray = StringUtils.splitPreserveAllTokens(netaddress, ":"); String[] strArray = StringUtils.splitPreserveAllTokens(netaddress, ":");
for (int i = 0; i < strArray.length; i++) { for (int i = 0; i < strArray.length; i++) {
if(strArray[i].length() < 4){ if (strArray[i].length() < 4) {
strArray[i] = StringUtils.leftPad(strArray[i], 4, '0'); strArray[i] = StringUtils.leftPad(strArray[i], 4, '0');
} }
} }
......
...@@ -51,25 +51,26 @@ public class PullConsumer { ...@@ -51,25 +51,26 @@ public class PullConsumer {
return new Thread(r, "PullConsumerThread"); return new Thread(r, "PullConsumerThread");
} }
}); });
for(String topic : consumer.getRegisterTopics()){ for (String topic : consumer.getRegisterTopics()) {
executors.execute(new Runnable() { executors.execute(new Runnable() {
public void doSomething(List<MessageExt> msgs){ public void doSomething(List<MessageExt> msgs) {
//do you business //do you business
System.out.println(msgs);
} }
@Override @Override
public void run() { public void run() {
while(true){ while (true) {
try { try {
Set<MessageQueue> messageQueues = consumer.fetchMessageQueuesInBalance(topic); Set<MessageQueue> messageQueues = consumer.fetchMessageQueuesInBalance(topic);
if(messageQueues == null || messageQueues.isEmpty()){ if (messageQueues == null || messageQueues.isEmpty()) {
Thread.sleep(1000); Thread.sleep(1000);
continue; continue;
} }
PullResult pullResult = null; PullResult pullResult = null;
for(MessageQueue messageQueue : messageQueues){ for (MessageQueue messageQueue : messageQueues) {
try { try {
long offset = this.consumeFromOffset(messageQueue); long offset = this.consumeFromOffset(messageQueue);
pullResult = consumer.pull(messageQueue, "*", offset, 32); pullResult = consumer.pull(messageQueue, "*", offset, 32);
...@@ -77,7 +78,7 @@ public class PullConsumer { ...@@ -77,7 +78,7 @@ public class PullConsumer {
case FOUND: case FOUND:
List<MessageExt> msgs = pullResult.getMsgFoundList(); List<MessageExt> msgs = pullResult.getMsgFoundList();
if(msgs != null && !msgs.isEmpty()){ if (msgs != null && !msgs.isEmpty()) {
this.doSomething(msgs); this.doSomething(msgs);
//update offset to broker //update offset to broker
consumer.updateConsumeOffset(messageQueue, pullResult.getNextBeginOffset()); consumer.updateConsumeOffset(messageQueue, pullResult.getNextBeginOffset());
...@@ -101,7 +102,7 @@ public class PullConsumer { ...@@ -101,7 +102,7 @@ public class PullConsumer {
e.printStackTrace(); e.printStackTrace();
} catch (MQBrokerException e) { } catch (MQBrokerException e) {
e.printStackTrace(); e.printStackTrace();
} catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
...@@ -110,29 +111,30 @@ public class PullConsumer { ...@@ -110,29 +111,30 @@ public class PullConsumer {
e.printStackTrace(); e.printStackTrace();
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
public long consumeFromOffset(MessageQueue messageQueue) throws MQClientException{ public long consumeFromOffset(MessageQueue messageQueue) throws MQClientException {
//-1 when started //-1 when started
long offset = consumer.getOffsetStore().readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY); long offset = consumer.getOffsetStore().readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY);
if(offset < 0){ if (offset < 0) {
//query from broker //query from broker
offset = consumer.getOffsetStore().readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE); offset = consumer.getOffsetStore().readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE);
} }
if (offset < 0){ if (offset < 0) {
//first time start from last offset //first time start from last offset
offset = consumer.maxOffset(messageQueue); offset = consumer.maxOffset(messageQueue);
} }
//make sure //make sure
if (offset < 0){ if (offset < 0) {
offset = 0; offset = 0;
} }
return offset; return offset;
} }
public void incPullTPS(String topic, int pullSize) { public void incPullTPS(String topic, int pullSize) {
consumer.getDefaultMQPullConsumerImpl().getRebalanceImpl().getmQClientFactory() consumer.getDefaultMQPullConsumerImpl().getRebalanceImpl().getmQClientFactory()
.getConsumerStatsManager().incPullTPS(consumer.getConsumerGroup(), topic, pullSize); .getConsumerStatsManager().incPullTPS(consumer.getConsumerGroup(), topic, pullSize);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册