CrazyHZM closed pull request #612: Modified to lower camel case
URL: https://github.com/apache/rocketmq/pull/612
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/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
index 73fe43942..2e72a54de 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
@@ -19,6 +19,7 @@
import com.alibaba.fastjson.JSON;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
+
import java.io.UnsupportedEncodingException;
import java.net.UnknownHostException;
import java.util.ArrayList;
@@ -30,6 +31,7 @@
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
+
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.client.ClientChannelInfo;
import org.apache.rocketmq.broker.client.ConsumerGroupInfo;
@@ -127,7 +129,7 @@ public AdminBrokerProcessor(final BrokerController
brokerController) {
@Override
public RemotingCommand processRequest(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
switch (request.getCode()) {
case RequestCode.UPDATE_AND_CREATE_TOPIC:
return this.updateAndCreateTopic(ctx, request);
@@ -196,7 +198,7 @@ public RemotingCommand processRequest(ChannelHandlerContext
ctx,
case RequestCode.CLONE_GROUP_OFFSET:
return this.cloneGroupOffset(ctx, request);
case RequestCode.VIEW_BROKER_STATS_DATA:
- return ViewBrokerStatsData(ctx, request);
+ return viewBrokerStatsData(ctx, request);
case RequestCode.GET_BROKER_CONSUME_STATS:
return fetchAllConsumeStatsInBroker(ctx, request);
case RequestCode.QUERY_CONSUME_QUEUE:
@@ -214,10 +216,10 @@ public boolean rejectRequest() {
}
private synchronized RemotingCommand
updateAndCreateTopic(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand
request) throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
final CreateTopicRequestHeader requestHeader =
- (CreateTopicRequestHeader)
request.decodeCommandCustomHeader(CreateTopicRequestHeader.class);
+ (CreateTopicRequestHeader)
request.decodeCommandCustomHeader(CreateTopicRequestHeader.class);
log.info("updateAndCreateTopic called by {}",
RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
if
(requestHeader.getTopic().equals(this.brokerController.getBrokerConfig().getBrokerClusterName()))
{
@@ -247,22 +249,22 @@ private synchronized RemotingCommand
updateAndCreateTopic(ChannelHandlerContext
this.brokerController.getTopicConfigManager().updateTopicConfig(topicConfig);
-
this.brokerController.registerIncrementBrokerData(topicConfig,this.brokerController.getTopicConfigManager().getDataVersion());
+ this.brokerController.registerIncrementBrokerData(topicConfig,
this.brokerController.getTopicConfigManager().getDataVersion());
return null;
}
private synchronized RemotingCommand deleteTopic(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
DeleteTopicRequestHeader requestHeader =
- (DeleteTopicRequestHeader)
request.decodeCommandCustomHeader(DeleteTopicRequestHeader.class);
+ (DeleteTopicRequestHeader)
request.decodeCommandCustomHeader(DeleteTopicRequestHeader.class);
log.info("deleteTopic called by {}",
RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
this.brokerController.getTopicConfigManager().deleteTopicConfig(requestHeader.getTopic());
this.brokerController.getMessageStore()
-
.cleanUnusedTopic(this.brokerController.getTopicConfigManager().getTopicConfigTable().keySet());
+
.cleanUnusedTopic(this.brokerController.getTopicConfigManager().getTopicConfigTable().keySet());
response.setCode(ResponseCode.SUCCESS);
response.setRemark(null);
@@ -360,14 +362,14 @@ private RemotingCommand
getBrokerConfig(ChannelHandlerContext ctx, RemotingComma
}
private RemotingCommand searchOffsetByTimestamp(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(SearchOffsetResponseHeader.class);
final SearchOffsetResponseHeader responseHeader =
(SearchOffsetResponseHeader) response.readCustomHeader();
final SearchOffsetRequestHeader requestHeader =
- (SearchOffsetRequestHeader)
request.decodeCommandCustomHeader(SearchOffsetRequestHeader.class);
+ (SearchOffsetRequestHeader)
request.decodeCommandCustomHeader(SearchOffsetRequestHeader.class);
long offset =
this.brokerController.getMessageStore().getOffsetInQueueByTime(requestHeader.getTopic(),
requestHeader.getQueueId(),
- requestHeader.getTimestamp());
+ requestHeader.getTimestamp());
responseHeader.setOffset(offset);
@@ -377,11 +379,11 @@ private RemotingCommand
searchOffsetByTimestamp(ChannelHandlerContext ctx,
}
private RemotingCommand getMaxOffset(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(GetMaxOffsetResponseHeader.class);
final GetMaxOffsetResponseHeader responseHeader =
(GetMaxOffsetResponseHeader) response.readCustomHeader();
final GetMaxOffsetRequestHeader requestHeader =
- (GetMaxOffsetRequestHeader)
request.decodeCommandCustomHeader(GetMaxOffsetRequestHeader.class);
+ (GetMaxOffsetRequestHeader)
request.decodeCommandCustomHeader(GetMaxOffsetRequestHeader.class);
long offset =
this.brokerController.getMessageStore().getMaxOffsetInQueue(requestHeader.getTopic(),
requestHeader.getQueueId());
@@ -393,11 +395,11 @@ private RemotingCommand
getMaxOffset(ChannelHandlerContext ctx,
}
private RemotingCommand getMinOffset(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(GetMinOffsetResponseHeader.class);
final GetMinOffsetResponseHeader responseHeader =
(GetMinOffsetResponseHeader) response.readCustomHeader();
final GetMinOffsetRequestHeader requestHeader =
- (GetMinOffsetRequestHeader)
request.decodeCommandCustomHeader(GetMinOffsetRequestHeader.class);
+ (GetMinOffsetRequestHeader)
request.decodeCommandCustomHeader(GetMinOffsetRequestHeader.class);
long offset =
this.brokerController.getMessageStore().getMinOffsetInQueue(requestHeader.getTopic(),
requestHeader.getQueueId());
@@ -408,14 +410,14 @@ private RemotingCommand
getMinOffset(ChannelHandlerContext ctx,
}
private RemotingCommand getEarliestMsgStoretime(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(GetEarliestMsgStoretimeResponseHeader.class);
final GetEarliestMsgStoretimeResponseHeader responseHeader =
(GetEarliestMsgStoretimeResponseHeader) response.readCustomHeader();
final GetEarliestMsgStoretimeRequestHeader requestHeader =
- (GetEarliestMsgStoretimeRequestHeader)
request.decodeCommandCustomHeader(GetEarliestMsgStoretimeRequestHeader.class);
+ (GetEarliestMsgStoretimeRequestHeader)
request.decodeCommandCustomHeader(GetEarliestMsgStoretimeRequestHeader.class);
long timestamp =
-
this.brokerController.getMessageStore().getEarliestMessageTime(requestHeader.getTopic(),
requestHeader.getQueueId());
+
this.brokerController.getMessageStore().getEarliestMessageTime(requestHeader.getTopic(),
requestHeader.getQueueId());
responseHeader.setTimestamp(timestamp);
response.setCode(ResponseCode.SUCCESS);
@@ -438,14 +440,14 @@ private RemotingCommand
getBrokerRuntimeInfo(ChannelHandlerContext ctx, Remoting
}
private RemotingCommand lockBatchMQ(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
LockBatchRequestBody requestBody =
LockBatchRequestBody.decode(request.getBody(), LockBatchRequestBody.class);
Set<MessageQueue> lockOKMQSet =
this.brokerController.getRebalanceLockManager().tryLockBatch(
- requestBody.getConsumerGroup(),
- requestBody.getMqSet(),
- requestBody.getClientId());
+ requestBody.getConsumerGroup(),
+ requestBody.getMqSet(),
+ requestBody.getClientId());
LockBatchResponseBody responseBody = new LockBatchResponseBody();
responseBody.setLockOKMQSet(lockOKMQSet);
@@ -457,14 +459,14 @@ private RemotingCommand lockBatchMQ(ChannelHandlerContext
ctx,
}
private RemotingCommand unlockBatchMQ(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
UnlockBatchRequestBody requestBody =
UnlockBatchRequestBody.decode(request.getBody(), UnlockBatchRequestBody.class);
this.brokerController.getRebalanceLockManager().unlockBatch(
- requestBody.getConsumerGroup(),
- requestBody.getMqSet(),
- requestBody.getClientId());
+ requestBody.getConsumerGroup(),
+ requestBody.getMqSet(),
+ requestBody.getClientId());
response.setCode(ResponseCode.SUCCESS);
response.setRemark(null);
@@ -472,7 +474,7 @@ private RemotingCommand unlockBatchMQ(ChannelHandlerContext
ctx,
}
private RemotingCommand
updateAndCreateSubscriptionGroup(ChannelHandlerContext ctx, RemotingCommand
request)
- throws RemotingCommandException {
+ throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
log.info("updateAndCreateSubscriptionGroup called by {}",
RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
@@ -488,7 +490,7 @@ private RemotingCommand
updateAndCreateSubscriptionGroup(ChannelHandlerContext c
}
private RemotingCommand getAllSubscriptionGroup(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
String content =
this.brokerController.getSubscriptionGroupManager().encode();
if (content != null && content.length() > 0) {
@@ -515,10 +517,10 @@ private RemotingCommand
getAllSubscriptionGroup(ChannelHandlerContext ctx,
}
private RemotingCommand deleteSubscriptionGroup(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
DeleteSubscriptionGroupRequestHeader requestHeader =
- (DeleteSubscriptionGroupRequestHeader)
request.decodeCommandCustomHeader(DeleteSubscriptionGroupRequestHeader.class);
+ (DeleteSubscriptionGroupRequestHeader)
request.decodeCommandCustomHeader(DeleteSubscriptionGroupRequestHeader.class);
log.info("deleteSubscriptionGroup called by {}",
RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
@@ -530,10 +532,10 @@ private RemotingCommand
deleteSubscriptionGroup(ChannelHandlerContext ctx,
}
private RemotingCommand getTopicStatsInfo(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
final GetTopicStatsInfoRequestHeader requestHeader =
- (GetTopicStatsInfoRequestHeader)
request.decodeCommandCustomHeader(GetTopicStatsInfoRequestHeader.class);
+ (GetTopicStatsInfoRequestHeader)
request.decodeCommandCustomHeader(GetTopicStatsInfoRequestHeader.class);
final String topic = requestHeader.getTopic();
TopicConfig topicConfig =
this.brokerController.getTopicConfigManager().selectTopicConfig(topic);
@@ -579,13 +581,13 @@ private RemotingCommand
getTopicStatsInfo(ChannelHandlerContext ctx,
}
private RemotingCommand getConsumerConnectionList(ChannelHandlerContext
ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
final GetConsumerConnectionListRequestHeader requestHeader =
- (GetConsumerConnectionListRequestHeader)
request.decodeCommandCustomHeader(GetConsumerConnectionListRequestHeader.class);
+ (GetConsumerConnectionListRequestHeader)
request.decodeCommandCustomHeader(GetConsumerConnectionListRequestHeader.class);
ConsumerGroupInfo consumerGroupInfo =
-
this.brokerController.getConsumerManager().getConsumerGroupInfo(requestHeader.getConsumerGroup());
+
this.brokerController.getConsumerManager().getConsumerGroupInfo(requestHeader.getConsumerGroup());
if (consumerGroupInfo != null) {
ConsumerConnection bodydata = new ConsumerConnection();
bodydata.setConsumeFromWhere(consumerGroupInfo.getConsumeFromWhere());
@@ -619,14 +621,14 @@ private RemotingCommand
getConsumerConnectionList(ChannelHandlerContext ctx,
}
private RemotingCommand getProducerConnectionList(ChannelHandlerContext
ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
final GetProducerConnectionListRequestHeader requestHeader =
- (GetProducerConnectionListRequestHeader)
request.decodeCommandCustomHeader(GetProducerConnectionListRequestHeader.class);
+ (GetProducerConnectionListRequestHeader)
request.decodeCommandCustomHeader(GetProducerConnectionListRequestHeader.class);
ProducerConnection bodydata = new ProducerConnection();
HashMap<Channel, ClientChannelInfo> channelInfoHashMap =
-
this.brokerController.getProducerManager().getGroupChannelTable().get(requestHeader.getProducerGroup());
+
this.brokerController.getProducerManager().getGroupChannelTable().get(requestHeader.getProducerGroup());
if (channelInfoHashMap != null) {
Iterator<Map.Entry<Channel, ClientChannelInfo>> it =
channelInfoHashMap.entrySet().iterator();
while (it.hasNext()) {
@@ -653,10 +655,10 @@ private RemotingCommand
getProducerConnectionList(ChannelHandlerContext ctx,
}
private RemotingCommand getConsumeStats(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
final GetConsumeStatsRequestHeader requestHeader =
- (GetConsumeStatsRequestHeader)
request.decodeCommandCustomHeader(GetConsumeStatsRequestHeader.class);
+ (GetConsumeStatsRequestHeader)
request.decodeCommandCustomHeader(GetConsumeStatsRequestHeader.class);
ConsumeStats consumeStats = new ConsumeStats();
@@ -676,10 +678,10 @@ private RemotingCommand
getConsumeStats(ChannelHandlerContext ctx,
{
SubscriptionData findSubscriptionData =
-
this.brokerController.getConsumerManager().findSubscriptionData(requestHeader.getConsumerGroup(),
topic);
+
this.brokerController.getConsumerManager().findSubscriptionData(requestHeader.getConsumerGroup(),
topic);
if (null == findSubscriptionData
- &&
this.brokerController.getConsumerManager().findSubscriptionDataCount(requestHeader.getConsumerGroup())
> 0) {
+ &&
this.brokerController.getConsumerManager().findSubscriptionDataCount(requestHeader.getConsumerGroup())
> 0) {
log.warn("consumeStats, the consumer group[{}], topic[{}]
not exist", requestHeader.getConsumerGroup(), topic);
continue;
}
@@ -698,9 +700,9 @@ private RemotingCommand
getConsumeStats(ChannelHandlerContext ctx,
brokerOffset = 0;
long consumerOffset =
this.brokerController.getConsumerOffsetManager().queryOffset(
- requestHeader.getConsumerGroup(),
- topic,
- i);
+ requestHeader.getConsumerGroup(),
+ topic,
+ i);
if (consumerOffset < 0)
consumerOffset = 0;
@@ -793,12 +795,12 @@ private RemotingCommand
getAllDelayOffset(ChannelHandlerContext ctx, RemotingCom
}
public RemotingCommand resetOffset(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final ResetOffsetRequestHeader requestHeader =
- (ResetOffsetRequestHeader)
request.decodeCommandCustomHeader(ResetOffsetRequestHeader.class);
+ (ResetOffsetRequestHeader)
request.decodeCommandCustomHeader(ResetOffsetRequestHeader.class);
log.info("[reset-offset] reset offset started by {}. topic={},
group={}, timestamp={}, isForce={}",
- RemotingHelper.parseChannelRemoteAddr(ctx.channel()),
requestHeader.getTopic(), requestHeader.getGroup(),
- requestHeader.getTimestamp(), requestHeader.isForce());
+ RemotingHelper.parseChannelRemoteAddr(ctx.channel()),
requestHeader.getTopic(), requestHeader.getGroup(),
+ requestHeader.getTimestamp(), requestHeader.isForce());
boolean isC = false;
LanguageCode language = request.getLanguage();
switch (language) {
@@ -807,26 +809,26 @@ public RemotingCommand resetOffset(ChannelHandlerContext
ctx,
break;
}
return
this.brokerController.getBroker2Client().resetOffset(requestHeader.getTopic(),
requestHeader.getGroup(),
- requestHeader.getTimestamp(), requestHeader.isForce(), isC);
+ requestHeader.getTimestamp(), requestHeader.isForce(), isC);
}
public RemotingCommand getConsumerStatus(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final GetConsumerStatusRequestHeader requestHeader =
- (GetConsumerStatusRequestHeader)
request.decodeCommandCustomHeader(GetConsumerStatusRequestHeader.class);
+ (GetConsumerStatusRequestHeader)
request.decodeCommandCustomHeader(GetConsumerStatusRequestHeader.class);
log.info("[get-consumer-status] get consumer status by {}. topic={},
group={}",
- RemotingHelper.parseChannelRemoteAddr(ctx.channel()),
requestHeader.getTopic(), requestHeader.getGroup());
+ RemotingHelper.parseChannelRemoteAddr(ctx.channel()),
requestHeader.getTopic(), requestHeader.getGroup());
return
this.brokerController.getBroker2Client().getConsumeStatus(requestHeader.getTopic(),
requestHeader.getGroup(),
- requestHeader.getClientAddr());
+ requestHeader.getClientAddr());
}
private RemotingCommand queryTopicConsumeByWho(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
QueryTopicConsumeByWhoRequestHeader requestHeader =
- (QueryTopicConsumeByWhoRequestHeader)
request.decodeCommandCustomHeader(QueryTopicConsumeByWhoRequestHeader.class);
+ (QueryTopicConsumeByWhoRequestHeader)
request.decodeCommandCustomHeader(QueryTopicConsumeByWhoRequestHeader.class);
HashSet<String> groups =
this.brokerController.getConsumerManager().queryTopicConsumeByWho(requestHeader.getTopic());
@@ -846,11 +848,11 @@ private RemotingCommand
queryTopicConsumeByWho(ChannelHandlerContext ctx,
}
private RemotingCommand registerFilterServer(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(RegisterFilterServerResponseHeader.class);
final RegisterFilterServerResponseHeader responseHeader =
(RegisterFilterServerResponseHeader) response.readCustomHeader();
final RegisterFilterServerRequestHeader requestHeader =
- (RegisterFilterServerRequestHeader)
request.decodeCommandCustomHeader(RegisterFilterServerRequestHeader.class);
+ (RegisterFilterServerRequestHeader)
request.decodeCommandCustomHeader(RegisterFilterServerRequestHeader.class);
this.brokerController.getFilterServerManager().registerFilterServer(ctx.channel(),
requestHeader.getFilterServerAddr());
@@ -863,10 +865,10 @@ private RemotingCommand
registerFilterServer(ChannelHandlerContext ctx,
}
private RemotingCommand queryConsumeTimeSpan(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
QueryConsumeTimeSpanRequestHeader requestHeader =
- (QueryConsumeTimeSpanRequestHeader)
request.decodeCommandCustomHeader(QueryConsumeTimeSpanRequestHeader.class);
+ (QueryConsumeTimeSpanRequestHeader)
request.decodeCommandCustomHeader(QueryConsumeTimeSpanRequestHeader.class);
final String topic = requestHeader.getTopic();
TopicConfig topicConfig =
this.brokerController.getTopicConfigManager().selectTopicConfig(topic);
@@ -894,7 +896,7 @@ private RemotingCommand
queryConsumeTimeSpan(ChannelHandlerContext ctx,
long consumeTime;
long consumerOffset =
this.brokerController.getConsumerOffsetManager().queryOffset(
- requestHeader.getGroup(), topic, i);
+ requestHeader.getGroup(), topic, i);
if (consumerOffset > 0) {
consumeTime =
this.brokerController.getMessageStore().getMessageStoreTimeStamp(topic, i,
consumerOffset - 1);
} else {
@@ -919,7 +921,7 @@ private RemotingCommand
queryConsumeTimeSpan(ChannelHandlerContext ctx,
}
private RemotingCommand getSystemTopicListFromBroker(ChannelHandlerContext
ctx, RemotingCommand request)
- throws RemotingCommandException {
+ throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
Set<String> topics =
this.brokerController.getTopicConfigManager().getSystemTopic();
@@ -952,31 +954,31 @@ public RemotingCommand cleanUnusedTopic() {
}
private RemotingCommand getConsumerRunningInfo(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final GetConsumerRunningInfoRequestHeader requestHeader =
- (GetConsumerRunningInfoRequestHeader)
request.decodeCommandCustomHeader(GetConsumerRunningInfoRequestHeader.class);
+ (GetConsumerRunningInfoRequestHeader)
request.decodeCommandCustomHeader(GetConsumerRunningInfoRequestHeader.class);
return this.callConsumer(RequestCode.GET_CONSUMER_RUNNING_INFO,
request, requestHeader.getConsumerGroup(),
- requestHeader.getClientId());
+ requestHeader.getClientId());
}
private RemotingCommand queryCorrectionOffset(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
QueryCorrectionOffsetHeader requestHeader =
- (QueryCorrectionOffsetHeader)
request.decodeCommandCustomHeader(QueryCorrectionOffsetHeader.class);
+ (QueryCorrectionOffsetHeader)
request.decodeCommandCustomHeader(QueryCorrectionOffsetHeader.class);
Map<Integer, Long> correctionOffset =
this.brokerController.getConsumerOffsetManager()
- .queryMinOffsetInAllGroup(requestHeader.getTopic(),
requestHeader.getFilterGroups());
+ .queryMinOffsetInAllGroup(requestHeader.getTopic(),
requestHeader.getFilterGroups());
Map<Integer, Long> compareOffset =
-
this.brokerController.getConsumerOffsetManager().queryOffset(requestHeader.getTopic(),
requestHeader.getCompareGroup());
+
this.brokerController.getConsumerOffsetManager().queryOffset(requestHeader.getTopic(),
requestHeader.getCompareGroup());
if (compareOffset != null && !compareOffset.isEmpty()) {
for (Map.Entry<Integer, Long> entry : compareOffset.entrySet()) {
Integer queueId = entry.getKey();
correctionOffset.put(queueId,
- correctionOffset.get(queueId) > entry.getValue() ?
Long.MAX_VALUE : correctionOffset.get(queueId));
+ correctionOffset.get(queueId) > entry.getValue() ?
Long.MAX_VALUE : correctionOffset.get(queueId));
}
}
@@ -989,9 +991,9 @@ private RemotingCommand
queryCorrectionOffset(ChannelHandlerContext ctx,
}
private RemotingCommand consumeMessageDirectly(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request)
throws RemotingCommandException {
final ConsumeMessageDirectlyResultRequestHeader requestHeader =
(ConsumeMessageDirectlyResultRequestHeader) request
-
.decodeCommandCustomHeader(ConsumeMessageDirectlyResultRequestHeader.class);
+
.decodeCommandCustomHeader(ConsumeMessageDirectlyResultRequestHeader.class);
request.getExtFields().put("brokerName",
this.brokerController.getBrokerConfig().getBrokerName());
SelectMappedBufferResult selectMappedBufferResult = null;
@@ -1010,14 +1012,14 @@ private RemotingCommand
consumeMessageDirectly(ChannelHandlerContext ctx,
}
return this.callConsumer(RequestCode.CONSUME_MESSAGE_DIRECTLY,
request, requestHeader.getConsumerGroup(),
- requestHeader.getClientId());
+ requestHeader.getClientId());
}
private RemotingCommand cloneGroupOffset(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
CloneGroupOffsetRequestHeader requestHeader =
- (CloneGroupOffsetRequestHeader)
request.decodeCommandCustomHeader(CloneGroupOffsetRequestHeader.class);
+ (CloneGroupOffsetRequestHeader)
request.decodeCommandCustomHeader(CloneGroupOffsetRequestHeader.class);
Set<String> topics;
if (UtilAll.isBlank(requestHeader.getTopic())) {
@@ -1037,16 +1039,16 @@ private RemotingCommand
cloneGroupOffset(ChannelHandlerContext ctx,
if (!requestHeader.isOffline()) {
SubscriptionData findSubscriptionData =
-
this.brokerController.getConsumerManager().findSubscriptionData(requestHeader.getSrcGroup(),
topic);
+
this.brokerController.getConsumerManager().findSubscriptionData(requestHeader.getSrcGroup(),
topic);
if
(this.brokerController.getConsumerManager().findSubscriptionDataCount(requestHeader.getSrcGroup())
> 0
- && findSubscriptionData == null) {
+ && findSubscriptionData == null) {
log.warn("[cloneGroupOffset], the consumer group[{}],
topic[{}] not exist", requestHeader.getSrcGroup(), topic);
continue;
}
}
this.brokerController.getConsumerOffsetManager().cloneOffset(requestHeader.getSrcGroup(),
requestHeader.getDestGroup(),
- requestHeader.getTopic());
+ requestHeader.getTopic());
}
response.setCode(ResponseCode.SUCCESS);
@@ -1054,10 +1056,10 @@ private RemotingCommand
cloneGroupOffset(ChannelHandlerContext ctx,
return response;
}
- private RemotingCommand ViewBrokerStatsData(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ private RemotingCommand viewBrokerStatsData(ChannelHandlerContext ctx,
+ RemotingCommand request)
throws RemotingCommandException {
final ViewBrokerStatsDataRequestHeader requestHeader =
- (ViewBrokerStatsDataRequestHeader)
request.decodeCommandCustomHeader(ViewBrokerStatsDataRequestHeader.class);
+ (ViewBrokerStatsDataRequestHeader)
request.decodeCommandCustomHeader(ViewBrokerStatsDataRequestHeader.class);
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
MessageStore messageStore = this.brokerController.getMessageStore();
@@ -1104,16 +1106,16 @@ private RemotingCommand
ViewBrokerStatsData(ChannelHandlerContext ctx,
}
private RemotingCommand fetchAllConsumeStatsInBroker(ChannelHandlerContext
ctx, RemotingCommand request)
- throws RemotingCommandException {
+ throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
GetConsumeStatsInBrokerHeader requestHeader =
- (GetConsumeStatsInBrokerHeader)
request.decodeCommandCustomHeader(GetConsumeStatsInBrokerHeader.class);
+ (GetConsumeStatsInBrokerHeader)
request.decodeCommandCustomHeader(GetConsumeStatsInBrokerHeader.class);
boolean isOrder = requestHeader.isOrder();
ConcurrentMap<String, SubscriptionGroupConfig> subscriptionGroups =
-
brokerController.getSubscriptionGroupManager().getSubscriptionGroupTable();
+
brokerController.getSubscriptionGroupManager().getSubscriptionGroupTable();
List<Map<String/* subscriptionGroupName */, List<ConsumeStats>>>
brokerConsumeStatsList =
- new ArrayList<Map<String, List<ConsumeStats>>>();
+ new ArrayList<Map<String, List<ConsumeStats>>>();
long totalDiff = 0L;
@@ -1137,7 +1139,7 @@ private RemotingCommand
fetchAllConsumeStatsInBroker(ChannelHandlerContext ctx,
SubscriptionData findSubscriptionData =
this.brokerController.getConsumerManager().findSubscriptionData(group, topic);
if (null == findSubscriptionData
- &&
this.brokerController.getConsumerManager().findSubscriptionDataCount(group) >
0) {
+ &&
this.brokerController.getConsumerManager().findSubscriptionDataCount(group) >
0) {
log.warn("consumeStats, the consumer group[{}],
topic[{}] not exist", group, topic);
continue;
}
@@ -1153,9 +1155,9 @@ private RemotingCommand
fetchAllConsumeStatsInBroker(ChannelHandlerContext ctx,
if (brokerOffset < 0)
brokerOffset = 0;
long consumerOffset =
this.brokerController.getConsumerOffsetManager().queryOffset(
- group,
- topic,
- i);
+ group,
+ topic,
+ i);
if (consumerOffset < 0)
consumerOffset = 0;
@@ -1196,31 +1198,31 @@ private RemotingCommand
fetchAllConsumeStatsInBroker(ChannelHandlerContext ctx,
runtimeInfo.put("brokerVersion",
String.valueOf(MQVersion.CURRENT_VERSION));
runtimeInfo.put("msgPutTotalYesterdayMorning",
-
String.valueOf(this.brokerController.getBrokerStats().getMsgPutTotalYesterdayMorning()));
+
String.valueOf(this.brokerController.getBrokerStats().getMsgPutTotalYesterdayMorning()));
runtimeInfo.put("msgPutTotalTodayMorning",
String.valueOf(this.brokerController.getBrokerStats().getMsgPutTotalTodayMorning()));
runtimeInfo.put("msgPutTotalTodayNow",
String.valueOf(this.brokerController.getBrokerStats().getMsgPutTotalTodayNow()));
runtimeInfo.put("msgGetTotalYesterdayMorning",
-
String.valueOf(this.brokerController.getBrokerStats().getMsgGetTotalYesterdayMorning()));
+
String.valueOf(this.brokerController.getBrokerStats().getMsgGetTotalYesterdayMorning()));
runtimeInfo.put("msgGetTotalTodayMorning",
String.valueOf(this.brokerController.getBrokerStats().getMsgGetTotalTodayMorning()));
runtimeInfo.put("msgGetTotalTodayNow",
String.valueOf(this.brokerController.getBrokerStats().getMsgGetTotalTodayNow()));
runtimeInfo.put("sendThreadPoolQueueSize",
String.valueOf(this.brokerController.getSendThreadPoolQueue().size()));
runtimeInfo.put("sendThreadPoolQueueCapacity",
-
String.valueOf(this.brokerController.getBrokerConfig().getSendThreadPoolQueueCapacity()));
+
String.valueOf(this.brokerController.getBrokerConfig().getSendThreadPoolQueueCapacity()));
runtimeInfo.put("pullThreadPoolQueueSize",
String.valueOf(this.brokerController.getPullThreadPoolQueue().size()));
runtimeInfo.put("pullThreadPoolQueueCapacity",
-
String.valueOf(this.brokerController.getBrokerConfig().getPullThreadPoolQueueCapacity()));
+
String.valueOf(this.brokerController.getBrokerConfig().getPullThreadPoolQueueCapacity()));
runtimeInfo.put("queryThreadPoolQueueSize",
String.valueOf(this.brokerController.getQueryThreadPoolQueue().size()));
runtimeInfo.put("queryThreadPoolQueueCapacity",
-
String.valueOf(this.brokerController.getBrokerConfig().getQueryThreadPoolQueueCapacity()));
+
String.valueOf(this.brokerController.getBrokerConfig().getQueryThreadPoolQueueCapacity()));
runtimeInfo.put("EndTransactionQueueSize",
String.valueOf(this.brokerController.getEndTransactionThreadPoolQueue().size()));
runtimeInfo.put("EndTransactionThreadPoolQueueCapacity",
-
String.valueOf(this.brokerController.getBrokerConfig().getEndTransactionPoolQueueCapacity()));
+
String.valueOf(this.brokerController.getBrokerConfig().getEndTransactionPoolQueueCapacity()));
runtimeInfo.put("dispatchBehindBytes",
String.valueOf(this.brokerController.getMessageStore().dispatchBehindBytes()));
runtimeInfo.put("pageCacheLockTimeMills",
String.valueOf(this.brokerController.getMessageStore().lockTimeMills()));
@@ -1249,10 +1251,10 @@ private RemotingCommand
fetchAllConsumeStatsInBroker(ChannelHandlerContext ctx,
}
private RemotingCommand callConsumer(
- final int requestCode,
- final RemotingCommand request,
- final String consumerGroup,
- final String clientId) throws RemotingCommandException {
+ final int requestCode,
+ final RemotingCommand request,
+ final String consumerGroup,
+ final String clientId) throws RemotingCommandException {
final RemotingCommand response =
RemotingCommand.createResponseCommand(null);
ClientChannelInfo clientChannelInfo =
this.brokerController.getConsumerManager().findChannel(consumerGroup, clientId);
@@ -1265,8 +1267,8 @@ private RemotingCommand callConsumer(
if (clientChannelInfo.getVersion() <
MQVersion.Version.V3_1_8_SNAPSHOT.ordinal()) {
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark(String.format("The Consumer <%s> Version <%s>
too low to finish, please upgrade it to V3_1_8_SNAPSHOT",
- clientId,
- MQVersion.getVersionDesc(clientChannelInfo.getVersion())));
+ clientId,
+ MQVersion.getVersionDesc(clientChannelInfo.getVersion())));
return response;
}
@@ -1279,25 +1281,25 @@ private RemotingCommand callConsumer(
} catch (RemotingTimeoutException e) {
response.setCode(ResponseCode.CONSUME_MSG_TIMEOUT);
response
- .setRemark(String.format("consumer <%s> <%s> Timeout: %s",
consumerGroup, clientId, RemotingHelper.exceptionSimpleDesc(e)));
+ .setRemark(String.format("consumer <%s> <%s> Timeout: %s",
consumerGroup, clientId, RemotingHelper.exceptionSimpleDesc(e)));
return response;
} catch (Exception e) {
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark(
- String.format("invoke consumer <%s> <%s> Exception: %s",
consumerGroup, clientId, RemotingHelper.exceptionSimpleDesc(e)));
+ String.format("invoke consumer <%s> <%s> Exception: %s",
consumerGroup, clientId, RemotingHelper.exceptionSimpleDesc(e)));
return response;
}
}
private RemotingCommand queryConsumeQueue(ChannelHandlerContext ctx,
- RemotingCommand request) throws RemotingCommandException {
+ RemotingCommand request) throws
RemotingCommandException {
QueryConsumeQueueRequestHeader requestHeader =
- (QueryConsumeQueueRequestHeader)
request.decodeCommandCustomHeader(QueryConsumeQueueRequestHeader.class);
+ (QueryConsumeQueueRequestHeader)
request.decodeCommandCustomHeader(QueryConsumeQueueRequestHeader.class);
RemotingCommand response = RemotingCommand.createResponseCommand(null);
ConsumeQueue consumeQueue =
this.brokerController.getMessageStore().getConsumeQueue(requestHeader.getTopic(),
- requestHeader.getQueueId());
+ requestHeader.getQueueId());
if (consumeQueue == null) {
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark(String.format("%d@%s is not exist!",
requestHeader.getQueueId(), requestHeader.getTopic()));
@@ -1314,18 +1316,18 @@ private RemotingCommand
queryConsumeQueue(ChannelHandlerContext ctx,
MessageFilter messageFilter = null;
if (requestHeader.getConsumerGroup() != null) {
SubscriptionData subscriptionData =
this.brokerController.getConsumerManager().findSubscriptionData(
- requestHeader.getConsumerGroup(), requestHeader.getTopic()
+ requestHeader.getConsumerGroup(), requestHeader.getTopic()
);
body.setSubscriptionData(subscriptionData);
if (subscriptionData == null) {
body.setFilterData(String.format("%s@%s is not online!",
requestHeader.getConsumerGroup(), requestHeader.getTopic()));
} else {
ConsumerFilterData filterData =
this.brokerController.getConsumerFilterManager()
- .get(requestHeader.getTopic(),
requestHeader.getConsumerGroup());
+ .get(requestHeader.getTopic(),
requestHeader.getConsumerGroup());
body.setFilterData(JSON.toJSONString(filterData, true));
messageFilter = new ExpressionMessageFilter(subscriptionData,
filterData,
- this.brokerController.getConsumerFilterManager());
+ this.brokerController.getConsumerFilterManager());
}
}
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
index 15e5c84ff..050185e47 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
@@ -82,10 +82,10 @@ private boolean needDiscard(MessageExt msgExt, int
transactionCheckMax) {
private boolean needSkip(MessageExt msgExt) {
long valueOfCurrentMinusBorn = System.currentTimeMillis() -
msgExt.getBornTimestamp();
if (valueOfCurrentMinusBorn
- >
transactionalMessageBridge.getBrokerController().getMessageStoreConfig().getFileReservedTime()
- * 3600L * 1000) {
+ >
transactionalMessageBridge.getBrokerController().getMessageStoreConfig().getFileReservedTime()
+ * 3600L * 1000) {
log.info("Half message exceed file reserved time ,so skip
it.messageId {},bornTime {}",
- msgExt.getMsgId(), msgExt.getBornTimestamp());
+ msgExt.getMsgId(), msgExt.getBornTimestamp());
return true;
}
return false;
@@ -94,32 +94,32 @@ private boolean needSkip(MessageExt msgExt) {
private boolean putBackHalfMsgQueue(MessageExt msgExt, long offset) {
PutMessageResult putMessageResult =
putBackToHalfQueueReturnResult(msgExt);
if (putMessageResult != null
- && putMessageResult.getPutMessageStatus() ==
PutMessageStatus.PUT_OK) {
+ && putMessageResult.getPutMessageStatus() ==
PutMessageStatus.PUT_OK) {
msgExt.setQueueOffset(
- putMessageResult.getAppendMessageResult().getLogicsOffset());
+
putMessageResult.getAppendMessageResult().getLogicsOffset());
msgExt.setCommitLogOffset(
- putMessageResult.getAppendMessageResult().getWroteOffset());
+
putMessageResult.getAppendMessageResult().getWroteOffset());
msgExt.setMsgId(putMessageResult.getAppendMessageResult().getMsgId());
log.info(
- "Send check message, the offset={} restored in queueOffset={} "
- + "commitLogOffset={} "
- + "newMsgId={} realMsgId={} topic={}",
- offset, msgExt.getQueueOffset(), msgExt.getCommitLogOffset(),
msgExt.getMsgId(),
-
msgExt.getUserProperty(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX),
- msgExt.getTopic());
+ "Send check message, the offset={} restored in
queueOffset={} "
+ + "commitLogOffset={} "
+ + "newMsgId={} realMsgId={} topic={}",
+ offset, msgExt.getQueueOffset(),
msgExt.getCommitLogOffset(), msgExt.getMsgId(),
+
msgExt.getUserProperty(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX),
+ msgExt.getTopic());
return true;
} else {
log.error(
- "PutBackToHalfQueueReturnResult write failed, topic: {},
queueId: {}, "
- + "msgId: {}",
- msgExt.getTopic(), msgExt.getQueueId(), msgExt.getMsgId());
+ "PutBackToHalfQueueReturnResult write failed, topic: {},
queueId: {}, "
+ + "msgId: {}",
+ msgExt.getTopic(), msgExt.getQueueId(), msgExt.getMsgId());
return false;
}
}
@Override
public void check(long transactionTimeout, int transactionCheckMax,
- AbstractTransactionalMessageCheckListener listener) {
+ AbstractTransactionalMessageCheckListener listener) {
try {
String topic = MixAll.RMQ_SYS_TRANS_HALF_TOPIC;
Set<MessageQueue> msgQueues =
transactionalMessageBridge.fetchMessageQueues(topic);
@@ -136,7 +136,7 @@ public void check(long transactionTimeout, int
transactionCheckMax,
log.info("Before check, the queue={} msgOffset={}
opOffset={}", messageQueue, halfOffset, opOffset);
if (halfOffset < 0 || opOffset < 0) {
log.error("MessageQueue: {} illegal offset read: {}, op
offset: {},skip this queue", messageQueue,
- halfOffset, opOffset);
+ halfOffset, opOffset);
continue;
}
@@ -145,7 +145,7 @@ public void check(long transactionTimeout, int
transactionCheckMax,
PullResult pullResult = fillOpRemoveMap(removeMap, opQueue,
opOffset, halfOffset, doneOpOffset);
if (null == pullResult) {
log.error("The queue={} check msgOffset={} with
opOffset={} failed, pullResult is null",
- messageQueue, halfOffset, opOffset);
+ messageQueue, halfOffset, opOffset);
continue;
}
// single thread
@@ -169,11 +169,11 @@ public void check(long transactionTimeout, int
transactionCheckMax,
}
if (getResult.getPullResult().getPullStatus() ==
PullStatus.NO_NEW_MSG) {
log.info("No new msg, the miss offset={}
in={}, continue check={}, pull result={}", i,
- messageQueue, getMessageNullCount,
getResult.getPullResult());
+ messageQueue, getMessageNullCount,
getResult.getPullResult());
break;
} else {
log.info("Illegal offset, the miss offset={}
in={}, continue check={}, pull result={}",
- i, messageQueue, getMessageNullCount,
getResult.getPullResult());
+ i, messageQueue, getMessageNullCount,
getResult.getPullResult());
i =
getResult.getPullResult().getNextBeginOffset();
newOffset = i;
continue;
@@ -188,7 +188,7 @@ public void check(long transactionTimeout, int
transactionCheckMax,
}
if (msgExt.getStoreTimestamp() >= startTime) {
log.info("Fresh stored. the miss offset={}, check
it later, store={}", i,
- new Date(msgExt.getStoreTimestamp()));
+ new Date(msgExt.getStoreTimestamp()));
break;
}
@@ -207,14 +207,14 @@ public void check(long transactionTimeout, int
transactionCheckMax,
} else {
if ((0 <= valueOfCurrentMinusBorn) &&
(valueOfCurrentMinusBorn < checkImmunityTime)) {
log.info("New arrived, the miss offset={},
check it later checkImmunity={}, born={}", i,
- checkImmunityTime, new
Date(msgExt.getBornTimestamp()));
+ checkImmunityTime, new
Date(msgExt.getBornTimestamp()));
break;
}
}
List<MessageExt> opMsg = pullResult.getMsgFoundList();
boolean isNeedCheck = (opMsg == null &&
valueOfCurrentMinusBorn > checkImmunityTime)
- || (opMsg != null && (opMsg.get(opMsg.size() -
1).getBornTimestamp() - startTime > transactionTimeout))
- || (valueOfCurrentMinusBorn <= -1);
+ || (opMsg != null && (opMsg.get(opMsg.size() -
1).getBornTimestamp() - startTime > transactionTimeout))
+ || (valueOfCurrentMinusBorn <= -1);
if (isNeedCheck) {
if (!putBackHalfMsgQueue(msgExt, i)) {
@@ -224,7 +224,7 @@ public void check(long transactionTimeout, int
transactionCheckMax,
} else {
pullResult = fillOpRemoveMap(removeMap, opQueue,
pullResult.getNextBeginOffset(), halfOffset, doneOpOffset);
log.info("The miss offset:{} in messageQueue:{}
need to get more opMsg, result is:{}", i,
- messageQueue, pullResult);
+ messageQueue, pullResult);
continue;
}
}
@@ -261,28 +261,28 @@ private long getImmunityTime(String checkImmunityTimeStr,
long transactionTimeou
/**
* Read op message, parse op message, and fill removeMap
*
- * @param removeMap Half message to be remove, key:halfOffset, value:
opOffset.
- * @param opQueue Op message queue.
+ * @param removeMap Half message to be remove, key:halfOffset, value:
opOffset.
+ * @param opQueue Op message queue.
* @param pullOffsetOfOp The begin offset of op message queue.
- * @param miniOffset The current minimum offset of half message queue.
- * @param doneOpOffset Stored op messages that have been processed.
+ * @param miniOffset The current minimum offset of half message queue.
+ * @param doneOpOffset Stored op messages that have been processed.
* @return Op message result.
*/
private PullResult fillOpRemoveMap(HashMap<Long, Long> removeMap,
- MessageQueue opQueue, long pullOffsetOfOp, long miniOffset, List<Long>
doneOpOffset) {
+ MessageQueue opQueue, long
pullOffsetOfOp, long miniOffset, List<Long> doneOpOffset) {
PullResult pullResult = pullOpMsg(opQueue, pullOffsetOfOp, 32);
if (null == pullResult) {
return null;
}
if (pullResult.getPullStatus() == PullStatus.OFFSET_ILLEGAL
- || pullResult.getPullStatus() == PullStatus.NO_MATCHED_MSG) {
+ || pullResult.getPullStatus() == PullStatus.NO_MATCHED_MSG) {
log.warn("The miss op offset={} in queue={} is illegal,
pullResult={}", pullOffsetOfOp, opQueue,
- pullResult);
+ pullResult);
transactionalMessageBridge.updateConsumeOffset(opQueue,
pullResult.getNextBeginOffset());
return pullResult;
} else if (pullResult.getPullStatus() == PullStatus.NO_NEW_MSG) {
log.warn("The miss op offset={} in queue={} is NO_NEW_MSG,
pullResult={}", pullOffsetOfOp, opQueue,
- pullResult);
+ pullResult);
return pullResult;
}
List<MessageExt> opMsg = pullResult.getMsgFoundList();
@@ -293,7 +293,7 @@ private PullResult fillOpRemoveMap(HashMap<Long, Long>
removeMap,
for (MessageExt opMessageExt : opMsg) {
Long queueOffset = getLong(new String(opMessageExt.getBody(),
TransactionalMessageUtil.charset));
log.info("Topic: {} tags: {}, OpOffset: {}, HalfOffset: {}",
opMessageExt.getTopic(),
- opMessageExt.getTags(), opMessageExt.getQueueOffset(),
queueOffset);
+ opMessageExt.getTags(), opMessageExt.getQueueOffset(),
queueOffset);
if
(TransactionalMessageUtil.REMOVETAG.equals(opMessageExt.getTags())) {
if (queueOffset < miniOffset) {
doneOpOffset.add(opMessageExt.getQueueOffset());
@@ -305,21 +305,21 @@ private PullResult fillOpRemoveMap(HashMap<Long, Long>
removeMap,
}
}
log.debug("Remove map: {}", removeMap);
- log.debug("Done op list: {}", doneOpOffset);
+ log.debug("done op list: {}", doneOpOffset);
return pullResult;
}
/**
* If return true, skip this msg
*
- * @param removeMap Op message map to determine whether a half message was
responded by producer.
- * @param doneOpOffset Op Message which has been checked.
- * @param msgExt Half message
+ * @param removeMap Op message map to determine whether a half
message was responded by producer.
+ * @param doneOpOffset Op Message which has been checked.
+ * @param msgExt Half message
* @param checkImmunityTime User defined time to avoid being detected
early.
* @return Return true if put success, otherwise return false.
*/
private boolean checkPrepareQueueOffset(HashMap<Long, Long> removeMap,
List<Long> doneOpOffset, MessageExt msgExt,
- long checkImmunityTime) {
+ long checkImmunityTime) {
if (System.currentTimeMillis() - msgExt.getBornTimestamp() <
checkImmunityTime) {
String prepareQueueOffsetStr =
msgExt.getUserProperty(MessageConst.PROPERTY_TRANSACTION_PREPARED_QUEUE_OFFSET);
if (null == prepareQueueOffsetStr) {
@@ -370,9 +370,9 @@ private boolean putImmunityMsgBackToHalfQueue(MessageExt
messageExt) {
/**
* Read half message from Half Topic
*
- * @param mq Target message queue, in this method, it means the half
message queue.
+ * @param mq Target message queue, in this method, it means the half
message queue.
* @param offset Offset in the message queue.
- * @param nums Pull message number.
+ * @param nums Pull message number.
* @return Messages pulled from half message queue.
*/
private PullResult pullHalfMsg(MessageQueue mq, long offset, int nums) {
@@ -382,9 +382,9 @@ private PullResult pullHalfMsg(MessageQueue mq, long
offset, int nums) {
/**
* Read op message from Op Topic
*
- * @param mq Target Message Queue
+ * @param mq Target Message Queue
* @param offset Offset in the message queue
- * @param nums Pull message number
+ * @param nums Pull message number
* @return Messages pulled from operate message queue.
*/
private PullResult pullOpMsg(MessageQueue mq, long offset, int nums) {
@@ -431,7 +431,7 @@ private MessageQueue getOpQueue(MessageQueue messageQueue) {
MessageQueue opQueue = opQueueMap.get(messageQueue);
if (opQueue == null) {
opQueue = new
MessageQueue(TransactionalMessageUtil.buildOpTopic(),
messageQueue.getBrokerName(),
- messageQueue.getQueueId());
+ messageQueue.getQueueId());
opQueueMap.put(messageQueue, opQueue);
}
return opQueue;
diff --git
a/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java
b/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java
index 06014cbcb..0a7e888e9 100644
--- a/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java
+++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java
@@ -44,8 +44,8 @@
* "expectedTokenSequences", and "TOKEN_IMAGE" set.
*/
public ParseException(Token currentTokenVal,
- int[][] expectedTokenSequencesVal,
- String[] tokenImageVal
+ int[][] expectedTokenSequencesVal,
+ String[] tokenImageVal
) {
super(initialise(currentTokenVal, expectedTokenSequencesVal,
tokenImageVal));
currentToken = currentTokenVal;
@@ -103,8 +103,8 @@ public ParseException(String message) {
* gets displayed.
*/
private static String initialise(Token currentToken,
- int[][] expectedTokenSequences,
- String[] tokenImage) {
+ int[][] expectedTokenSequences,
+ String[] tokenImage) {
String eol = System.getProperty("line.separator", "\n");
StringBuffer expected = new StringBuffer();
int maxSize = 0;
@@ -131,7 +131,7 @@ private static String initialise(Token currentToken,
}
retval += " " + tokenImage[tok.kind];
retval += " \"";
- retval += add_escapes(tok.image);
+ retval += addEscapes(tok.image);
retval += " \"";
tok = tok.next;
}
@@ -156,7 +156,7 @@ private static String initialise(Token currentToken,
* when these raw version cannot be used as part of an ASCII
* string literal.
*/
- static String add_escapes(String str) {
+ static String addEscapes(String str) {
StringBuffer retval = new StringBuffer();
char ch;
for (int i = 0; i < str.length(); i++) {
diff --git
a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java
b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java
index 198aacf83..48e92a847 100644
--- a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java
+++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java
@@ -90,7 +90,7 @@ protected SelectorParser(String sql) {
protected BooleanExpression parse() throws MQFilterException {
try {
- return this.JmsSelector();
+ return this.jmsSelector();
} catch (Throwable e) {
throw new MQFilterException("Invalid MessageSelector. ", e);
}
@@ -109,7 +109,7 @@ private BooleanExpression asBooleanExpression(Expression
value) throws ParseExce
//
----------------------------------------------------------------------------
// Grammer
//
----------------------------------------------------------------------------
- final public BooleanExpression JmsSelector() throws ParseException {
+ final public BooleanExpression jmsSelector() throws ParseException {
Expression left = null;
left = orExpression();
{
@@ -996,13 +996,13 @@ private boolean jj_3R_8() {
}
private static void jj_la1_init_0() {
- jjLa10 = new int[] {
- 0x400, 0x200, 0xc10000, 0xc00000, 0x10000, 0xf001900, 0x20000000,
0x20000000, 0xf000800,
- 0x1000, 0x1036e100, 0x1036e000, 0x16e000};
+ jjLa10 = new int[]{
+ 0x400, 0x200, 0xc10000, 0xc00000, 0x10000, 0xf001900,
0x20000000, 0x20000000, 0xf000800,
+ 0x1000, 0x1036e100, 0x1036e000, 0x16e000};
}
private static void jj_la1_init_1() {
- jjLa11 = new int[] {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x1, 0x0, 0x0};
+ jjLa11 = new int[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x1, 0x0, 0x0};
}
final private JJCalls[] jj2Rtns = new JJCalls[4];
@@ -1047,7 +1047,7 @@ public void ReInit(java.io.InputStream stream) {
*/
public void ReInit(java.io.InputStream stream, String encoding) {
try {
- jjInputStream.ReInit(stream, encoding, 1, 1);
+ jjInputStream.reInit(stream, encoding, 1, 1);
} catch (java.io.UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
@@ -1080,7 +1080,7 @@ public SelectorParser(java.io.Reader stream) {
* Reinitialise.
*/
public void ReInit(java.io.Reader stream) {
- jjInputStream.ReInit(stream, 1, 1);
+ jjInputStream.reInit(stream, 1, 1);
tokenSource.ReInit(jjInputStream);
token = new Token();
jjNtk = -1;
diff --git
a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java
b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java
index b5bac9824..1830e5e8b 100644
---
a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java
+++
b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java
@@ -363,10 +363,10 @@ private int jjMoveStringLiteralDfa6_0(long old0, long
active0) {
}
static final long[] JJ_BIT_VEC_0 = {
- 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL,
0xffffffffffffffffL
+ 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL,
0xffffffffffffffffL
};
static final long[] JJ_BIT_VEC_2 = {
- 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
+ 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
};
private int jjMoveNfa_0(int startState, int curPos) {
@@ -702,8 +702,8 @@ else if (curChar == 45)
}
static final int[] JJ_NEXT_STATES = {
- 30, 31, 36, 37, 24, 25, 26, 1, 2, 4, 8, 9, 11, 20, 21, 34,
- 35, 38, 39,
+ 30, 31, 36, 37, 24, 25, 26, 1, 2, 4, 8, 9, 11, 20, 21, 34,
+ 35, 38, 39,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long
l1, long l2) {
@@ -721,24 +721,24 @@ private static final boolean jjCanMove_0(int hiByte, int
i1, int i2, long l1, lo
* Token literal values.
*/
public static final String[] JJ_STR_LITERAL_IMAGES = {
- "", null, null, null, null, null, null, null, null, null, null, null,
null,
- null, null, null, null, null, null, null, null, null, "\75", "\74\76",
"\76",
- "\76\75", "\74", "\74\75", "\50", "\54", "\51", "\53", "\55"};
+ "", null, null, null, null, null, null, null, null, null, null,
null, null,
+ null, null, null, null, null, null, null, null, null, "\75",
"\74\76", "\76",
+ "\76\75", "\74", "\74\75", "\50", "\54", "\51", "\53", "\55"};
/**
* Lexer state names.
*/
public static final String[] LEX_STATE_NAMES = {
- "DEFAULT",
+ "DEFAULT",
};
static final long[] JJ_TO_TOKEN = {
- 0x1fff7ff01L,
+ 0x1fff7ff01L,
};
static final long[] JJ_TO_SKIP = {
- 0xfeL,
+ 0xfeL,
};
static final long[] JJ_TO_SPECIAL = {
- 0x3eL,
+ 0x3eL,
};
protected SimpleCharStream inputStream;
private final int[] jjrounds = new int[40];
@@ -793,7 +793,7 @@ public void ReInit(SimpleCharStream stream, int lexState) {
public void SwitchTo(int lexState) {
if (lexState >= 1 || lexState < 0)
throw new TokenMgrError("Error: Ignoring invalid lexical state : "
+ lexState + ". State unchanged.",
- TokenMgrError.INVALID_LEXICAL_STATE);
+ TokenMgrError.INVALID_LEXICAL_STATE);
else
curLexState = lexState;
}
@@ -806,7 +806,7 @@ protected Token jjFillToken() {
final int beginColumn;
final int endColumn;
String im = JJ_STR_LITERAL_IMAGES[jjmatchedKind];
- curTokenImage = (im == null) ? inputStream.GetImage() : im;
+ curTokenImage = (im == null) ? inputStream.getImage() : im;
beginLine = inputStream.getBeginLine();
beginColumn = inputStream.getBeginColumn();
endLine = inputStream.getEndLine();
@@ -839,7 +839,7 @@ public Token getNextToken() {
EOFLoop:
for (; ; ) {
try {
- curChar = inputStream.BeginToken();
+ curChar = inputStream.beginToken();
} catch (java.io.IOException e) {
jjmatchedKind = 0;
matchedToken = jjFillToken();
@@ -879,7 +879,7 @@ public Token getNextToken() {
inputStream.backup(1);
} catch (java.io.IOException e1) {
eofSeen = true;
- errorAfter = curPos <= 1 ? "" : inputStream.GetImage();
+ errorAfter = curPos <= 1 ? "" : inputStream.getImage();
if (curChar == '\n' || curChar == '\r') {
errorLine++;
errorColumn = 0;
@@ -888,10 +888,10 @@ public Token getNextToken() {
}
if (!eofSeen) {
inputStream.backup(1);
- errorAfter = curPos <= 1 ? "" : inputStream.GetImage();
+ errorAfter = curPos <= 1 ? "" : inputStream.getImage();
}
throw new TokenMgrError(eofSeen, curLexState, errorLine,
errorColumn, errorAfter, curChar,
- TokenMgrError.LEXICAL_ERROR);
+ TokenMgrError.LEXICAL_ERROR);
}
}
diff --git
a/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java
b/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java
index 53f7e1c29..0de119519 100644
---
a/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java
+++
b/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java
@@ -60,7 +60,7 @@ protected int getTabSize(int i) {
return tabSize;
}
- protected void ExpandBuff(boolean wrapAround) {
+ protected void expandBuff(boolean wrapAround) {
char[] newbuffer = new char[bufsize + 2048];
int newbufline[] = new int[bufsize + 2048];
int newbufcolumn[] = new int[bufsize + 2048];
@@ -101,7 +101,7 @@ protected void ExpandBuff(boolean wrapAround) {
tokenBegin = 0;
}
- protected void FillBuff() throws java.io.IOException {
+ protected void fillBuff() throws java.io.IOException {
if (maxNextCharInd == available) {
if (available == bufsize) {
if (tokenBegin > 2048) {
@@ -110,11 +110,11 @@ protected void FillBuff() throws java.io.IOException {
} else if (tokenBegin < 0)
bufpos = maxNextCharInd = 0;
else
- ExpandBuff(false);
+ expandBuff(false);
} else if (available > tokenBegin)
available = bufsize;
else if ((tokenBegin - available) < 2048)
- ExpandBuff(true);
+ expandBuff(true);
else
available = tokenBegin;
}
@@ -139,7 +139,7 @@ else if ((tokenBegin - available) < 2048)
/**
* Start.
*/
- public char BeginToken() throws java.io.IOException {
+ public char beginToken() throws java.io.IOException {
tokenBegin = -1;
char c = readChar();
tokenBegin = bufpos;
@@ -147,7 +147,7 @@ public char BeginToken() throws java.io.IOException {
return c;
}
- protected void UpdateLineColumn(char c) {
+ protected void updateLineColumn(char c) {
column++;
if (prevCharIsLF) {
@@ -194,11 +194,11 @@ public char readChar() throws java.io.IOException {
}
if (++bufpos >= maxNextCharInd)
- FillBuff();
+ fillBuff();
char c = buffer[bufpos];
- UpdateLineColumn(c);
+ updateLineColumn(c);
return c;
}
@@ -264,7 +264,7 @@ public void backup(int amount) {
* Constructor.
*/
public SimpleCharStream(java.io.Reader dstream, int startline,
- int startcolumn, int buffersize) {
+ int startcolumn, int buffersize) {
inputStream = dstream;
line = startline;
column = startcolumn - 1;
@@ -279,7 +279,7 @@ public SimpleCharStream(java.io.Reader dstream, int
startline,
* Constructor.
*/
public SimpleCharStream(java.io.Reader dstream, int startline,
- int startcolumn) {
+ int startcolumn) {
this(dstream, startline, startcolumn, 4096);
}
@@ -293,8 +293,8 @@ public SimpleCharStream(java.io.Reader dstream) {
/**
* Reinitialise.
*/
- public void ReInit(java.io.Reader dstream, int startline,
- int startcolumn, int buffersize) {
+ public void reInit(java.io.Reader dstream, int startline,
+ int startcolumn, int buffersize) {
inputStream = dstream;
line = startline;
column = startcolumn - 1;
@@ -313,33 +313,33 @@ public void ReInit(java.io.Reader dstream, int startline,
/**
* Reinitialise.
*/
- public void ReInit(java.io.Reader dstream, int startline,
- int startcolumn) {
- ReInit(dstream, startline, startcolumn, 4096);
+ public void reInit(java.io.Reader dstream, int startline,
+ int startcolumn) {
+ reInit(dstream, startline, startcolumn, 4096);
}
/**
* Reinitialise.
*/
- public void ReInit(java.io.Reader dstream) {
- ReInit(dstream, 1, 1, 4096);
+ public void reInit(java.io.Reader dstream) {
+ reInit(dstream, 1, 1, 4096);
}
/**
* Constructor.
*/
public SimpleCharStream(java.io.InputStream dstream, String encoding, int
startline,
- int startcolumn, int buffersize) throws
java.io.UnsupportedEncodingException {
+ int startcolumn, int buffersize) throws
java.io.UnsupportedEncodingException {
this(encoding == null ?
- new java.io.InputStreamReader(dstream) :
- new java.io.InputStreamReader(dstream, encoding), startline,
startcolumn, buffersize);
+ new java.io.InputStreamReader(dstream) :
+ new java.io.InputStreamReader(dstream, encoding), startline,
startcolumn, buffersize);
}
/**
* Constructor.
*/
public SimpleCharStream(java.io.InputStream dstream, int startline,
- int startcolumn, int buffersize) {
+ int startcolumn, int buffersize) {
this(new java.io.InputStreamReader(dstream), startline, startcolumn,
buffersize);
}
@@ -347,7 +347,7 @@ public SimpleCharStream(java.io.InputStream dstream, int
startline,
* Constructor.
*/
public SimpleCharStream(java.io.InputStream dstream, String encoding, int
startline,
- int startcolumn) throws java.io.UnsupportedEncodingException {
+ int startcolumn) throws
java.io.UnsupportedEncodingException {
this(dstream, encoding, startline, startcolumn, 4096);
}
@@ -355,7 +355,7 @@ public SimpleCharStream(java.io.InputStream dstream, String
encoding, int startl
* Constructor.
*/
public SimpleCharStream(java.io.InputStream dstream, int startline,
- int startcolumn) {
+ int startcolumn) {
this(dstream, startline, startcolumn, 4096);
}
@@ -376,73 +376,73 @@ public SimpleCharStream(java.io.InputStream dstream) {
/**
* Reinitialise.
*/
- public void ReInit(java.io.InputStream dstream, String encoding, int
startline,
- int startcolumn, int buffersize) throws
java.io.UnsupportedEncodingException {
- ReInit(encoding == null ?
- new java.io.InputStreamReader(dstream) :
- new java.io.InputStreamReader(dstream, encoding), startline,
startcolumn, buffersize);
+ public void reInit(java.io.InputStream dstream, String encoding, int
startline,
+ int startcolumn, int buffersize) throws
java.io.UnsupportedEncodingException {
+ reInit(encoding == null ?
+ new java.io.InputStreamReader(dstream) :
+ new java.io.InputStreamReader(dstream, encoding), startline,
startcolumn, buffersize);
}
/**
* Reinitialise.
*/
- public void ReInit(java.io.InputStream dstream, int startline,
- int startcolumn, int buffersize) {
- ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn,
buffersize);
+ public void reInit(java.io.InputStream dstream, int startline,
+ int startcolumn, int buffersize) {
+ reInit(new java.io.InputStreamReader(dstream), startline, startcolumn,
buffersize);
}
/**
* Reinitialise.
*/
- public void ReInit(java.io.InputStream dstream, String encoding) throws
java.io.UnsupportedEncodingException {
- ReInit(dstream, encoding, 1, 1, 4096);
+ public void reInit(java.io.InputStream dstream, String encoding) throws
java.io.UnsupportedEncodingException {
+ reInit(dstream, encoding, 1, 1, 4096);
}
/**
* Reinitialise.
*/
- public void ReInit(java.io.InputStream dstream) {
- ReInit(dstream, 1, 1, 4096);
+ public void reInit(java.io.InputStream dstream) {
+ reInit(dstream, 1, 1, 4096);
}
/**
* Reinitialise.
*/
- public void ReInit(java.io.InputStream dstream, String encoding, int
startline,
- int startcolumn) throws java.io.UnsupportedEncodingException {
- ReInit(dstream, encoding, startline, startcolumn, 4096);
+ public void reInit(java.io.InputStream dstream, String encoding, int
startline,
+ int startcolumn) throws
java.io.UnsupportedEncodingException {
+ reInit(dstream, encoding, startline, startcolumn, 4096);
}
/**
* Reinitialise.
*/
- public void ReInit(java.io.InputStream dstream, int startline,
- int startcolumn) {
- ReInit(dstream, startline, startcolumn, 4096);
+ public void reInit(java.io.InputStream dstream, int startline,
+ int startcolumn) {
+ reInit(dstream, startline, startcolumn, 4096);
}
/**
* Get token literal value.
*/
- public String GetImage() {
+ public String getImage() {
if (bufpos >= tokenBegin)
return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
else
return new String(buffer, tokenBegin, bufsize - tokenBegin) +
- new String(buffer, 0, bufpos + 1);
+ new String(buffer, 0, bufpos + 1);
}
/**
* Get the suffix.
*/
- public char[] GetSuffix(int len) {
+ public char[] getSuffix(int len) {
char[] ret = new char[len];
if ((bufpos + 1) >= len)
System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
else {
System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
- len - bufpos - 1);
+ len - bufpos - 1);
System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
}
@@ -452,7 +452,7 @@ public String GetImage() {
/**
* Reset buffer when finished.
*/
- public void Done() {
+ public void done() {
buffer = null;
bufline = null;
bufcolumn = null;
diff --git
a/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java
b/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java
index e8132df5a..a2bb5f67b 100644
--- a/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java
+++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java
@@ -31,9 +31,9 @@
*/
private static final long serialVersionUID = 1L;
- /*
- * Ordinals for various reasons why an Error of this type can be thrown.
- */
+ /*
+ * Ordinals for various reasons why an Error of this type can be thrown.
+ */
/**
* Lexical error occurred.
@@ -121,15 +121,15 @@ protected static final String addEscapes(String str) {
* curchar : the offending character
* Note: You can customize the lexical error message by modifying this
method.
*/
- protected static String LexicalError(boolean eofSeen, int lexState, int
errorLine, int errorColumn,
- String errorAfter, char curChar) {
+ protected static String lexicalError(boolean eofSeen, int lexState, int
errorLine, int errorColumn,
+ String errorAfter, char curChar) {
return "Lexical error at line " +
- errorLine + ", column " +
- errorColumn + ". Encountered: " +
- (eofSeen ?
- "<EOF> " :
- ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" +
(int) curChar + "), ") +
- "after : \"" + addEscapes(errorAfter) + "\"";
+ errorLine + ", column " +
+ errorColumn + ". Encountered: " +
+ (eofSeen ?
+ "<EOF> " :
+ ("\"" + addEscapes(String.valueOf(curChar)) + "\"") +
" (" + (int) curChar + "), ") +
+ "after : \"" + addEscapes(errorAfter) + "\"";
}
/**
@@ -145,9 +145,9 @@ public String getMessage() {
return super.getMessage();
}
- /*
- * Constructors of various flavors follow.
- */
+ /*
+ * Constructors of various flavors follow.
+ */
/**
* No arg constructor.
@@ -167,8 +167,8 @@ public TokenMgrError(String message, int reason) {
* Full Constructor.
*/
public TokenMgrError(boolean eofSeen, int lexState, int errorLine, int
errorColumn, String errorAfter, char curChar,
- int reason) {
- this(LexicalError(eofSeen, lexState, errorLine, errorColumn,
errorAfter, curChar), reason);
+ int reason) {
+ this(lexicalError(eofSeen, lexState, errorLine, errorColumn,
errorAfter, curChar), reason);
}
}
/* JavaCC - OriginalChecksum=e960778c8dcd73e167ed5bfddd59f288 (do not edit
this line) */
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
