From 64f113b615740473276842ead6a3a3b907229106 Mon Sep 17 00:00:00 2001 From: zhouyunpeng <2474138779@qq.com> Date: Sun, 5 Mar 2023 18:15:54 +0800 Subject: [PATCH 1/3] fix typos --- .../broker/schedule/ScheduleMessageService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java b/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java index bdc9c567258..3e8853bc161 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java @@ -346,7 +346,7 @@ public boolean parseDelayLevel() { return true; } - private MessageExtBrokerInner messageTimeup(MessageExt msgExt) { + private MessageExtBrokerInner messageTimeUp(MessageExt msgExt) { MessageExtBrokerInner msgInner = new MessageExtBrokerInner(); msgInner.setBody(msgExt.getBody()); msgInner.setFlag(msgExt.getFlag()); @@ -402,11 +402,11 @@ public DeliverDelayedMessageTimerTask(int delayLevel, long offset) { public void run() { try { if (isStarted()) { - this.executeOnTimeup(); + this.executeOnTimeUp(); } } catch (Exception e) { // XXX: warn and notify me - log.error("ScheduleMessageService, executeOnTimeup exception", e); + log.error("ScheduleMessageService, executeOnTimeUp exception", e); this.scheduleNextTimerTask(this.offset, DELAY_FOR_A_PERIOD); } } @@ -426,7 +426,7 @@ private long correctDeliverTimestamp(final long now, final long deliverTimestamp return result; } - public void executeOnTimeup() { + public void executeOnTimeUp() { ConsumeQueueInterface cq = ScheduleMessageService.this.brokerController.getMessageStore().getConsumeQueue(TopicValidator.RMQ_SYS_SCHEDULE_TOPIC, delayLevel2QueueId(delayLevel)); @@ -488,7 +488,7 @@ public void executeOnTimeup() { continue; } - MessageExtBrokerInner msgInner = ScheduleMessageService.this.messageTimeup(msgExt); + MessageExtBrokerInner msgInner = ScheduleMessageService.this.messageTimeUp(msgExt); if (TopicValidator.RMQ_SYS_TRANS_HALF_TOPIC.equals(msgInner.getTopic())) { log.error("[BUG] the real topic of schedule msg is {}, discard the msg. msg={}", msgInner.getTopic(), msgInner); @@ -508,7 +508,7 @@ public void executeOnTimeup() { } } } catch (Exception e) { - log.error("ScheduleMessageService, messageTimeup execute error, offset = {}", nextOffset, e); + log.error("ScheduleMessageService, messageTimeUp execute error, offset = {}", nextOffset, e); } finally { bufferCQ.release(); } @@ -808,7 +808,7 @@ public void doResend() { return; } - MessageExtBrokerInner msgInner = ScheduleMessageService.this.messageTimeup(msgExt); + MessageExtBrokerInner msgInner = ScheduleMessageService.this.messageTimeUp(msgExt); PutMessageResult result = ScheduleMessageService.this.brokerController.getEscapeBridge().putMessage(msgInner); this.handleResult(result); if (result != null && result.getPutMessageStatus() == PutMessageStatus.PUT_OK) { From 17678e6afa99815defc95f97cfa51fba752188c9 Mon Sep 17 00:00:00 2001 From: zhouyunpeng <2474138779@qq.com> Date: Thu, 9 Mar 2023 00:09:51 +0800 Subject: [PATCH 2/3] fix typos --- .../apache/rocketmq/acl/AccessValidator.java | 2 +- .../acl/plain/PlainAccessValidator.java | 4 ++-- .../acl/plain/PlainPermissionManager.java | 18 +++++++++--------- .../broker/processor/AdminBrokerProcessor.java | 8 ++++---- .../org/apache/rocketmq/client/MQAdmin.java | 8 ++++---- .../client/producer/DefaultMQProducer.java | 4 ++-- ...iple_ACL_Files_\350\256\276\350\256\241.md" | 4 ++-- .../acl/DeleteAccessConfigSubCommand.java | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java b/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java index 2b5a8826c2c..315184c6150 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java @@ -65,7 +65,7 @@ public interface AccessValidator { * * @return */ - boolean deleteAccessConfig(String accesskey); + boolean deleteAccessConfig(String accessKey); /** * Get the access resource config version information diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java index 09d3daf2816..a7015eaca73 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java @@ -56,8 +56,8 @@ public boolean updateAccessConfig(PlainAccessConfig plainAccessConfig) { } @Override - public boolean deleteAccessConfig(String accesskey) { - return aclPlugEngine.deleteAccessConfig(accesskey); + public boolean deleteAccessConfig(String accessKey) { + return aclPlugEngine.deleteAccessConfig(accessKey); } @Override diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java index 7a8390f524f..fcaba1ddac8 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java @@ -439,27 +439,27 @@ public Map createAclAccessConfigMap(Map existedA return newAccountsMap; } - public boolean deleteAccessConfig(String accesskey) { - if (StringUtils.isEmpty(accesskey)) { - log.error("Parameter value accesskey is null or empty String,Please check your parameter"); + public boolean deleteAccessConfig(String accessKey) { + if (StringUtils.isEmpty(accessKey)) { + log.error("Parameter value accessKey is null or empty String,Please check your parameter"); return false; } - if (accessKeyTable.containsKey(accesskey)) { - String aclFileName = accessKeyTable.get(accesskey); + if (accessKeyTable.containsKey(accessKey)) { + String aclFileName = accessKeyTable.get(accessKey); Map aclAccessConfigMap = AclUtils.getYamlDataObject(aclFileName, Map.class); if (aclAccessConfigMap == null || aclAccessConfigMap.isEmpty()) { - log.warn("No data found in {} when deleting access config of {}", aclFileName, accesskey); + log.warn("No data found in {} when deleting access config of {}", aclFileName, accessKey); return true; } List> accounts = (List>) aclAccessConfigMap.get("accounts"); Iterator> itemIterator = accounts.iterator(); while (itemIterator.hasNext()) { - if (itemIterator.next().get(AclConstants.CONFIG_ACCESS_KEY).equals(accesskey)) { + if (itemIterator.next().get(AclConstants.CONFIG_ACCESS_KEY).equals(accessKey)) { // Delete the related acl config element itemIterator.remove(); - accessKeyTable.remove(accesskey); + accessKeyTable.remove(accessKey); aclAccessConfigMap.put(AclConstants.CONFIG_ACCOUNTS, accounts); return AclUtils.writeDataObject(aclFileName, updateAclConfigFileVersion(aclFileName, aclAccessConfigMap)); } @@ -618,7 +618,7 @@ public void validate(PlainAccessResource plainAccessResource) { throw new AclException(String.format("No acl config for %s", plainAccessResource.getAccessKey())); } - // Check the white addr for accesskey + // Check the white addr for accessKey String aclFileName = accessKeyTable.get(plainAccessResource.getAccessKey()); PlainAccessResource ownedAccess = aclPlainAccessResourceMap.get(aclFileName).get(plainAccessResource.getAccessKey()); if (null == ownedAccess) { 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 17e1e86c94d..24632cad583 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 @@ -558,14 +558,14 @@ private synchronized RemotingCommand updateAndCreateAccessConfig(ChannelHandlerC response.setRemark(null); NettyRemotingAbstract.writeResponse(ctx.channel(), request, response); } else { - String errorMsg = "The accesskey[" + requestHeader.getAccessKey() + "] corresponding to accessConfig has been updated failed."; + String errorMsg = "The accessKey[" + requestHeader.getAccessKey() + "] corresponding to accessConfig has been updated failed."; LOGGER.warn(errorMsg); response.setCode(ResponseCode.UPDATE_AND_CREATE_ACL_CONFIG_FAILED); response.setRemark(errorMsg); return response; } } catch (Exception e) { - LOGGER.error("Failed to generate a proper update accessvalidator response", e); + LOGGER.error("Failed to generate a proper update accessValidator response", e); response.setCode(ResponseCode.UPDATE_AND_CREATE_ACL_CONFIG_FAILED); response.setRemark(e.getMessage()); return response; @@ -592,7 +592,7 @@ private synchronized RemotingCommand deleteAccessConfig(ChannelHandlerContext ct response.setRemark(null); NettyRemotingAbstract.writeResponse(ctx.channel(), request, response); } else { - String errorMsg = "The accesskey[" + requestHeader.getAccessKey() + "] corresponding to accessConfig has been deleted failed."; + String errorMsg = "The accessKey[" + requestHeader.getAccessKey() + "] corresponding to accessConfig has been deleted failed."; LOGGER.warn(errorMsg); response.setCode(ResponseCode.DELETE_ACL_CONFIG_FAILED); response.setRemark(errorMsg); @@ -600,7 +600,7 @@ private synchronized RemotingCommand deleteAccessConfig(ChannelHandlerContext ct } } catch (Exception e) { - LOGGER.error("Failed to generate a proper delete accessvalidator response", e); + LOGGER.error("Failed to generate a proper delete accessValidator response", e); response.setCode(ResponseCode.DELETE_ACL_CONFIG_FAILED); response.setRemark(e.getMessage()); return response; diff --git a/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java b/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java index 79386bd471b..c2e936be43f 100644 --- a/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java +++ b/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java @@ -29,8 +29,8 @@ */ public interface MQAdmin { /** - * Creates an topic - * @param key accesskey + * Creates a topic + * @param key accessKey * @param newTopic topic name * @param queueNum topic's queue number * @param attributes @@ -39,8 +39,8 @@ void createTopic(final String key, final String newTopic, final int queueNum, Ma throws MQClientException; /** - * Creates an topic - * @param key accesskey + * Creates a topic + * @param key accessKey * @param newTopic topic name * @param queueNum topic's queue number * @param topicSysFlag topic system flag diff --git a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java index db5b1d62cbf..6e9ffed8c0c 100644 --- a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java +++ b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java @@ -769,7 +769,7 @@ public TransactionSendResult sendMessageInTransaction(Message msg, /** * This method will be removed in a certain version after April 5, 2020, so please do not use this method. * - * @param key accesskey + * @param key accessKey * @param newTopic topic name * @param queueNum topic's queue number * @param attributes @@ -785,7 +785,7 @@ public void createTopic(String key, String newTopic, int queueNum, Map Date: Thu, 9 Mar 2023 20:55:01 +0800 Subject: [PATCH 3/3] fix typos --- .../store/timer/TimerMessageStore.java | 42 +++++++++---------- .../store/timer/TimerMessageStoreTest.java | 6 +-- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java index c6ab81df42c..72c402d20db 100644 --- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java +++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java @@ -74,13 +74,13 @@ public class TimerMessageStore { public static final String TIMER_ENQUEUE_MS = MessageConst.PROPERTY_TIMER_ENQUEUE_MS; public static final String TIMER_DEQUEUE_MS = MessageConst.PROPERTY_TIMER_DEQUEUE_MS; public static final String TIMER_ROLL_TIMES = MessageConst.PROPERTY_TIMER_ROLL_TIMES; - public static final String TIMER_DELETE_UNIQKEY = MessageConst.PROPERTY_TIMER_DEL_UNIQKEY; + public static final String TIMER_DELETE_UNIQUE_KEY = MessageConst.PROPERTY_TIMER_DEL_UNIQKEY; public static final Random RANDOM = new Random(); public static final int PUT_OK = 0, PUT_NEED_RETRY = 1, PUT_NO_RETRY = 2; public static final int DAY_SECS = 24 * 3600; // The total days in the timer wheel when precision is 1000ms. // If the broker shutdown last more than the configured days, will cause message loss - public static final int TIMER_WHELL_TTL_DAY = 7; + public static final int TIMER_WHEEL_TTL_DAY = 7; public static final int TIMER_BLANK_SLOTS = 60; public static final int MAGIC_DEFAULT = 1; public static final int MAGIC_ROLL = 1 << 1; @@ -152,7 +152,7 @@ public TimerMessageStore(final MessageStore messageStore, final MessageStoreConf this.timerLogFileSize = storeConfig.getMappedFileSizeTimerLog(); this.precisionMs = storeConfig.getTimerPrecisionMs(); // TimerWheel contains the fixed number of slots regardless of precision. - this.slotsTotal = TIMER_WHELL_TTL_DAY * DAY_SECS; + this.slotsTotal = TIMER_WHEEL_TTL_DAY * DAY_SECS; this.timerWheel = new TimerWheel(getTimerWheelPath(storeConfig.getStorePathRootDir()), this.slotsTotal, precisionMs); this.timerLog = new TimerLog(getTimerLogPath(storeConfig.getStorePathRootDir()), timerLogFileSize); @@ -274,8 +274,8 @@ public void recover() { if (currReadTimeMs < nextReadTimeMs) { currReadTimeMs = nextReadTimeMs; } - //the timer wheel may contain physical offset bigger than timerlog - //This will only happen when the timerlog is damaged + //the timer wheel may contain physical offset bigger than timerLog + //This will only happen when the timerLog is damaged //hard to test long minFirst = timerWheel.checkPhyPos(currReadTimeMs, processOffset); if (debug) { @@ -353,10 +353,10 @@ public long reviseQueueOffset(long processOffset) { } } - //recover timerlog and revise timerwheel + //recover timerLog and revise timerWheel //return process offset private long recoverAndRevise(long beginOffset, boolean checkTimerLog) { - LOGGER.info("Begin to recover timerlog offset:{} check:{}", beginOffset, checkTimerLog); + LOGGER.info("Begin to recover timerLog offset:{} check:{}", beginOffset, checkTimerLog); MappedFile lastFile = timerLog.getMappedFileQueue().getLastMappedFile(); if (null == lastFile) { return 0; @@ -398,7 +398,7 @@ private long recoverAndRevise(long beginOffset, boolean checkTimerLog) { timerWheel.reviseSlot(delayTime, TimerWheel.IGNORE, sbr.getStartOffset() + position, true); } } catch (Exception e) { - LOGGER.error("Recover timerlog error", e); + LOGGER.error("Recover timerLog error", e); stopCheck = true; break; } @@ -445,7 +445,7 @@ public void start() { int checkOffset = timerLog.getOffsetForLastUnit(); timerLog.getMappedFileQueue().deleteExpiredFileByOffsetForTimerLog(minPy, checkOffset, TimerLog.UNIT_SIZE); } catch (Exception e) { - LOGGER.error("Error in cleaning timerlog", e); + LOGGER.error("Error in cleaning timerLog", e); } } }, 30, 30, TimeUnit.SECONDS); @@ -470,7 +470,7 @@ public void start() { } } } catch (Exception e) { - LOGGER.error("Error in cleaning timerlog", e); + LOGGER.error("Error in cleaning timerLog", e); } } }, 45, 45, TimeUnit.MINUTES); @@ -692,7 +692,7 @@ public boolean doEnqueue(long offsetPy, int sizePy, long delayedTime, MessageExt delayedTime = tmpWriteTimeMs + timerRollWindowSlots * precisionMs; } } - boolean isDelete = messageExt.getProperty(TIMER_DELETE_UNIQKEY) != null; + boolean isDelete = messageExt.getProperty(TIMER_DELETE_UNIQUE_KEY) != null; if (isDelete) { magic = magic | MAGIC_DELETE; } @@ -909,7 +909,7 @@ public int dequeue() throws Exception { } } if (deleteMsgStack.size() == 0 && normalMsgStack.size() == 0) { - LOGGER.warn("dequeue time:{} but read nothing from timerlog", currReadTimeMs); + LOGGER.warn("dequeue time:{} but read nothing from timerLog", currReadTimeMs); } for (SelectMappedBufferResult sbr : sbrs) { if (null != sbr) { @@ -1000,7 +1000,7 @@ private MessageExt getMessageByCommitOffset(long offsetPy, int sizePy) { msgExt = MessageDecoder.decode(bufferLocal.get(), true, false, false); } if (null == msgExt) { - LOGGER.warn("Fail to read msg from commitlog offsetPy:{} sizePy:{}", offsetPy, sizePy); + LOGGER.warn("Fail to read msg from commitLog offsetPy:{} sizePy:{}", offsetPy, sizePy); } else { return msgExt; } @@ -1144,14 +1144,14 @@ public void checkAndReviseMetrics() { //check the hash collision between small ons and big ons for (Map.Entry bjgEntry : bigOnes.entrySet()) { if (smallHashs.containsKey(hashTopicForMetrics(bjgEntry.getKey()))) { - Iterator> smalllIt = smallOnes.entrySet().iterator(); - while (smalllIt.hasNext()) { - Map.Entry smallEntry = smalllIt.next(); + Iterator> smallIt = smallOnes.entrySet().iterator(); + while (smallIt.hasNext()) { + Map.Entry smallEntry = smallIt.next(); if (hashTopicForMetrics(smallEntry.getKey()) == hashTopicForMetrics(bjgEntry.getKey())) { LOGGER.warn("[CheckAndReviseMetrics]Metric hash collision between small-big code:{} small topic:{}{} big topic:{}{}", hashTopicForMetrics(smallEntry.getKey()), smallEntry.getKey(), smallEntry.getValue(), bjgEntry.getKey(), bjgEntry.getValue()); - smalllIt.remove(); + smallIt.remove(); } } } @@ -1494,11 +1494,11 @@ public void run() { tr.idempotentRelease(); doRes = true; } else { - String uniqkey = MessageClientIDSetter.getUniqID(msgExt); - if (null == uniqkey) { - LOGGER.warn("No uniqkey for msg:{}", msgExt); + String uniqueKey = MessageClientIDSetter.getUniqID(msgExt); + if (null == uniqueKey) { + LOGGER.warn("No uniqueKey for msg:{}", msgExt); } - if (null != uniqkey && tr.getDeleteList() != null && tr.getDeleteList().size() > 0 && tr.getDeleteList().contains(uniqkey)) { + if (null != uniqueKey && tr.getDeleteList() != null && tr.getDeleteList().size() > 0 && tr.getDeleteList().contains(uniqueKey)) { doRes = true; tr.idempotentRelease(); perfs.getCounter("dequeue_delete").flow(1); diff --git a/store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java b/store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java index c56c8c4b4e7..7ace2d9fe61 100644 --- a/store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java @@ -305,7 +305,7 @@ public void testDeleteTimerMessage() throws Exception { MessageExtBrokerInner delMsg = buildMessage(delayMs, topic, false); transformTimerMessage(timerMessageStore,delMsg); - MessageAccessor.putProperty(delMsg, TimerMessageStore.TIMER_DELETE_UNIQKEY, uniqKey); + MessageAccessor.putProperty(delMsg, TimerMessageStore.TIMER_DELETE_UNIQUE_KEY, uniqKey); delMsg.setPropertiesString(MessageDecoder.messageProperties2String(delMsg.getProperties())); assertEquals(PutMessageStatus.PUT_OK, messageStore.putMessage(delMsg).getPutMessageStatus()); @@ -338,7 +338,7 @@ public void testPutDeleteTimerMessage() throws Exception { MessageExtBrokerInner delMsg = buildMessage(delayMs, topic, false); transformTimerMessage(timerMessageStore,delMsg); - MessageAccessor.putProperty(delMsg, TimerMessageStore.TIMER_DELETE_UNIQKEY, "XXX"); + MessageAccessor.putProperty(delMsg, TimerMessageStore.TIMER_DELETE_UNIQUE_KEY, "XXX"); delMsg.setPropertiesString(MessageDecoder.messageProperties2String(delMsg.getProperties())); assertEquals(PutMessageStatus.PUT_OK, messageStore.putMessage(delMsg).getPutMessageStatus()); @@ -361,7 +361,7 @@ public Boolean call() { // Test put expired delete msg. MessageExtBrokerInner expiredInner = buildMessage(System.currentTimeMillis() - 100, topic, false); - MessageAccessor.putProperty(expiredInner, TimerMessageStore.TIMER_DELETE_UNIQKEY, "XXX"); + MessageAccessor.putProperty(expiredInner, TimerMessageStore.TIMER_DELETE_UNIQUE_KEY, "XXX"); PutMessageResult putMessageResult = transformTimerMessage(timerMessageStore,expiredInner); assertEquals(PutMessageStatus.WHEEL_TIMER_MSG_ILLEGAL, putMessageResult.getPutMessageStatus()); }