You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by go...@apache.org on 2020/05/27 13:51:08 UTC
[incubator-tubemq] branch master updated: [TUBEMQ-159] Fix some
typos (#99)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
The following commit(s) were added to refs/heads/master by this push:
new 418f5df [TUBEMQ-159] Fix some typos (#99)
418f5df is described below
commit 418f5df501cca590f9a0b6ac485ebde687b479cb
Author: Neo Yang <ck...@gmail.com>
AuthorDate: Wed May 27 21:51:02 2020 +0800
[TUBEMQ-159] Fix some typos (#99)
Fix incorrect parameter name.
---
LICENSE | 8 ++--
docs/http_access_API_definition.md | 12 +++---
resources/assets/scripts/brokerDetail.js | 8 ++--
resources/assets/scripts/brokerList.js | 2 +-
resources/assets/scripts/common/helper.js | 2 +-
resources/assets/scripts/subscribe.js | 2 +-
resources/assets/scripts/subscribeDetail.js | 2 +-
resources/assets/scripts/topicDetail.js | 10 ++---
resources/assets/scripts/topicList.js | 2 +-
.../client/consumer/BaseMessageConsumer.java | 4 +-
.../client/producer/SimpleMessageProducer.java | 4 +-
.../org/apache/tubemq/corebase/TBaseConstants.java | 4 +-
.../tubemq/server/broker/BrokerServiceServer.java | 4 +-
.../broker/msgstore/disk/MsgFileStatisInfo.java | 4 +-
.../broker/msgstore/mem/MsgMemStatisInfo.java | 10 ++---
.../server/broker/msgstore/mem/MsgMemStore.java | 4 +-
.../tubemq/server/broker/utils/DataStoreUtils.java | 2 +-
.../server/broker/web/BrokerAdminServlet.java | 4 +-
.../tubemq/server/common/TServerConstants.java | 4 +-
.../zookeeper/RecoverableZooKeeper.java | 2 +-
.../common/offsetstorage/zookeeper/ZKUtil.java | 2 +-
.../server/common/utils/WebParameterUtils.java | 2 +-
.../org/apache/tubemq/server/master/TMaster.java | 6 +--
.../server/master/balance/DefaultLoadBalancer.java | 4 +-
.../nodebroker/BrokerSyncStatusInfo.java | 2 +-
.../nodemanage/nodeconsumer/ConsumerBandInfo.java | 14 +++----
.../server/master/web/action/screen/Webapi.java | 16 ++++----
.../web/handler/WebAdminFlowRuleHandler.java | 6 +--
.../web/handler/WebAdminGroupCtrlHandler.java | 38 ++++++++---------
.../web/handler/WebAdminTopicAuthHandler.java | 6 +--
.../web/handler/WebBrokerDefConfHandler.java | 48 +++++++++++-----------
.../web/handler/WebBrokerTopicConfHandler.java | 10 ++---
.../tubemq/server/tools/StoreRepairAdmin.java | 20 ++++-----
33 files changed, 134 insertions(+), 134 deletions(-)
diff --git a/LICENSE b/LICENSE
index ff689ee..5fc63d0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -250,10 +250,10 @@ Redistribution and use in source and binary forms, with or without modification,
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROF [...]
-Open Source Software Licensed under the Apache License Version 2.0 and Other License of the Third-party Componnents therein
+Open Source Software Licensed under the Apache License Version 2.0 and Other License of the Third-party Components therein
--------------------------------------------------------------------------------------------------------------------------------
1. hbase 0.94.27 （Please note that the software have been modified.）
-Copyrighy (C) The Apache Software Foundation
+Copyright (C) The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -290,7 +290,7 @@ The JRuby community went out of their way to make JRuby compatible with Apache
projects: See https://issues.apache.org/jira/browse/HBASE-3374)
-Open Source Software Licensed under the Apache License Version 2.0 and Other License of the Third-party Componnents therein
+Open Source Software Licensed under the Apache License Version 2.0 and Other License of the Third-party Components therein
--------------------------------------------------------------------------------------------------------------------------------
1. openmct v0.9.0
Copyright (c) 2014-2015, United States Government as represented by the Administrator of the National Aeronautics and Space Administration.
@@ -1333,7 +1333,7 @@ Copyright 2009-2011 The Apache Software Foundation
Copyright (C) 2008 The Guava Authors
10. servlet-api 2.5
-Copyriht (c) Mort Bay Consulting
+Copyright (c) Mort Bay Consulting
11. spring-core 4.1.6.RELEASE
Copyright (c) the original author or authors.
diff --git a/docs/http_access_API_definition.md b/docs/http_access_API_definition.md
index 569b0b8..6e4cdde 100644
--- a/docs/http_access_API_definition.md
+++ b/docs/http_access_API_definition.md
@@ -740,7 +740,7 @@ __Request__
|---|---|---|---|
|groupName|yes|the group name to set flow control rule|String|
|enableBind|no|whether to bind consuming permission, default value 0 means disable|int|
-|allowBCleintRatio|no|the ratio of the number of the consuming target's broker against the number of client in consuming group|int|
+|allowedBClientRate|no|the ratio of the number of the consuming target's broker against the number of client in consuming group|int|
|createUser|yes|the creator|String|
|createDate|yes|the creating date in format `yyyyMMddHHmmss`|String|
|confModAuthToken|yes|the authorized key for configuration update|String|
@@ -755,7 +755,7 @@ __Request__
|---|---|---|---|
|groupName|yes|the group name to set flow control rule|String|
|enableBind|no|whether to bind consuming permission, default value 0 means disable|int|
-|allowBCleintRatio|no|the ratio of the number of the consuming target's broker against the number of client in consuming group|int|
+|allowedBClientRate|no|the ratio of the number of the consuming target's broker against the number of client in consuming group|int|
|createUser|yes|the creator|String|
### `admin_upd_consume_group_setting`
@@ -768,8 +768,8 @@ __Request__
|---|---|---|---|
|groupName|yes|the group name to set flow control rule|String|
|enableBind|no|whether to bind consuming permission, default value 0 means disable|int|
-|allowBCleintRatio|no|the ratio of the number of the consuming target's broker against the number of client in consuming group|int|
-|modfiyUser|yes|the modifier|String|
+|allowedBClientRate|no|the ratio of the number of the consuming target's broker against the number of client in consuming group|int|
+|modifyUser|yes|the modifier|String|
|modifyDate|yes|the modifying date in format `yyyyMMddHHmmss`|String|
|confModAuthToken|yes|the authorized key for configuration update|String|
@@ -782,7 +782,7 @@ __Request__
|name|must|description|type|
|---|---|---|---|
|groupName|yes|the group name to set flow control rule|String|
-|modfiyUser|yes|the modifier|String|
+|modifyUser|yes|the modifier|String|
|modifyDate|yes|the modifying date in format `yyyyMMddHHmmss`|String|
|confModAuthToken|yes|the authorized key for configuration update|String|
@@ -850,7 +850,7 @@ __Request__
### `admin_manual_set_current_offset`
-Modfiy the offset value of consuming group under current broker. The new value will be persisted to ZK.
+Modify the offset value of consuming group under current broker. The new value will be persisted to ZK.
__Request__
diff --git a/resources/assets/scripts/brokerDetail.js b/resources/assets/scripts/brokerDetail.js
index 4cbcf05..5a0fd8a 100644
--- a/resources/assets/scripts/brokerDetail.js
+++ b/resources/assets/scripts/brokerDetail.js
@@ -116,7 +116,7 @@
'false': '否',
'-': '-'
};
- var getCheckeBox = function (data, className) {
+ var getCheckBox = function (data, className) {
var checked = data === "true" ? ' checked' : '';
className = className || '';
return '<span class="switch' + checked + ' ' + className
@@ -132,7 +132,7 @@
' <div class="row">' +
' <div class="tit">可发布:</div>' +
' <div class="cnt">' +
- getCheckeBox(dataSet.acceptPublish, 'js_toggle_pub') +
+ getCheckBox(dataSet.acceptPublish, 'js_toggle_pub') +
' </div>' +
' </div>' +
' <div class="row">' +
@@ -175,7 +175,7 @@
' <div class="row">' +
' <div class="tit">可订阅:</div>' +
' <div class="cnt">' +
- getCheckeBox(dataSet.acceptSubscribe, 'js_toggle_sub') +
+ getCheckBox(dataSet.acceptSubscribe, 'js_toggle_sub') +
' </div>' +
' </div>' +
' <div class="row">' +
@@ -297,7 +297,7 @@
"orderable": false
}],
language: {
- searchPlaceholder: '请输入消费组或者Tipc名称',
+ searchPlaceholder: '请输入消费组或者Topic名称',
processing: "Loading...",
search: "搜索:",
//lengthMenu: "每页显示 _MENU_ 条",
diff --git a/resources/assets/scripts/brokerList.js b/resources/assets/scripts/brokerList.js
index 5ef0a59..c1b5d9b 100644
--- a/resources/assets/scripts/brokerList.js
+++ b/resources/assets/scripts/brokerList.js
@@ -297,7 +297,7 @@
}
}],
language: {
- searchPlaceholder: '请输入消费组或者Tipc名称',
+ searchPlaceholder: '请输入消费组或者Topic名称',
search: "搜索:",
//lengthMenu: "每页显示 _MENU_ 条",
lengthMenu: '每页显示 <select class="min">'
diff --git a/resources/assets/scripts/common/helper.js b/resources/assets/scripts/common/helper.js
index d5693ef..90cb680 100644
--- a/resources/assets/scripts/common/helper.js
+++ b/resources/assets/scripts/common/helper.js
@@ -58,7 +58,7 @@
* @param {String} [value]
* @param {{expires:Number|'forever', domain:String, path:String , inCommon : boolean , secure :
* boolean}} [options]
- * @reutrns {String}
+ * @returns {String}
* @example
* $.cookie(key); //读取cookie
* $.cookie(key, null); //删除cookie
diff --git a/resources/assets/scripts/subscribe.js b/resources/assets/scripts/subscribe.js
index df361ca..4c5ab6c 100644
--- a/resources/assets/scripts/subscribe.js
+++ b/resources/assets/scripts/subscribe.js
@@ -69,7 +69,7 @@
"defaultContent": '--'
}],
language: {
- searchPlaceholder: '请输入消费组或者Tipc名称',
+ searchPlaceholder: '请输入消费组或者Topic名称',
processing: "Loading...",
search: "搜索:",
//lengthMenu: "每页显示 _MENU_ 条",
diff --git a/resources/assets/scripts/subscribeDetail.js b/resources/assets/scripts/subscribeDetail.js
index 393f7a5..64b4f2b 100644
--- a/resources/assets/scripts/subscribeDetail.js
+++ b/resources/assets/scripts/subscribeDetail.js
@@ -82,7 +82,7 @@
title: "分区ID"
}],
language: {
- searchPlaceholder: '请输入消费组或者Tipc名称',
+ searchPlaceholder: '请输入消费组或者Topic名称',
processing: "Loading...",
search: "搜索:",
//lengthMenu: "每页显示 _MENU_ 条",
diff --git a/resources/assets/scripts/topicDetail.js b/resources/assets/scripts/topicDetail.js
index 923f194..563f7c3 100644
--- a/resources/assets/scripts/topicDetail.js
+++ b/resources/assets/scripts/topicDetail.js
@@ -173,7 +173,7 @@
var checked = data === true ? '是' : '否';
return checked;
};
- var getCheckeBox = function (data, className) {
+ var getCheckBox = function (data, className) {
var checked = data === true ? ' checked' : '';
className = className || '';
return '<span class="switch' + checked + ' ' + className
@@ -205,7 +205,7 @@
' <div class="row">' +
' <div class="tit">可发布:</div>' +
' <div class="cnt">' +
- getCheckeBox(dataSet.isSrvAcceptPublish, 'js_toggle_pub') +
+ getCheckBox(dataSet.isSrvAcceptPublish, 'js_toggle_pub') +
' </div>' +
' </div>' +
' <div class="row">' +
@@ -230,7 +230,7 @@
' <div class="row">' +
' <div class="tit">可订阅:</div>' +
' <div class="cnt">' +
- getCheckeBox(dataSet.isSrvAcceptSubscribe, 'js_toggle_pub') +
+ getCheckBox(dataSet.isSrvAcceptSubscribe, 'js_toggle_pub') +
' </div>' +
' </div>' +
' <div class="row">' +
@@ -335,7 +335,7 @@
}
}],
language: {
- searchPlaceholder: '请输入消费组或者Tipc名称',
+ searchPlaceholder: '请输入消费组或者Topic名称',
processing: "Loading...",
search: "搜索:",
//lengthMenu: "每页显示 _MENU_ 条",
@@ -414,7 +414,7 @@
}
}],
language: {
- searchPlaceholder: '请输入消费组或者Tipc名称',
+ searchPlaceholder: '请输入消费组或者Topic名称',
processing: "Loading...",
search: "搜索:",
//lengthMenu: "每页显示 _MENU_ 条",
diff --git a/resources/assets/scripts/topicList.js b/resources/assets/scripts/topicList.js
index 11f1d7d..b755a94 100644
--- a/resources/assets/scripts/topicList.js
+++ b/resources/assets/scripts/topicList.js
@@ -195,7 +195,7 @@
}
}],
language: {
- searchPlaceholder: '请输入消费组或者Tipc名称',
+ searchPlaceholder: '请输入消费组或者Topic名称',
search: "搜索:",
//lengthMenu: "每页显示 _MENU_ 条",
lengthMenu: '每页显示 <select class="min">'
diff --git a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/BaseMessageConsumer.java b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/BaseMessageConsumer.java
index 3d806ca..a46446c 100644
--- a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/BaseMessageConsumer.java
+++ b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/BaseMessageConsumer.java
@@ -378,7 +378,7 @@ public class BaseMessageConsumer implements MessageConsumer {
}
/**
- * Chekc if current consumer is shutdown.
+ * Check if current consumer is shutdown.
*
* @return consumer status
*/
@@ -518,7 +518,7 @@ public class BaseMessageConsumer implements MessageConsumer {
/**
* Check if the rebalance is stopped.
*
- * @return reblance status
+ * @return rebalance status
*/
private boolean isRebalanceStopped() {
return isRebalanceStopped.get();
diff --git a/tubemq-client/src/main/java/org/apache/tubemq/client/producer/SimpleMessageProducer.java b/tubemq-client/src/main/java/org/apache/tubemq/client/producer/SimpleMessageProducer.java
index 22d0007..19e399b 100644
--- a/tubemq-client/src/main/java/org/apache/tubemq/client/producer/SimpleMessageProducer.java
+++ b/tubemq-client/src/main/java/org/apache/tubemq/client/producer/SimpleMessageProducer.java
@@ -290,11 +290,11 @@ public class SimpleMessageProducer implements MessageProducer {
}
int msgSize = TStringUtils.isBlank(message.getAttribute())
? message.getData().length : (message.getData().length + message.getAttribute().length());
- if (msgSize > TBaseConstants.META_MAX_MESSAGEG_DATA_SIZE) {
+ if (msgSize > TBaseConstants.META_MAX_MESSAGE_DATA_SIZE) {
throw new TubeClientException(new StringBuilder(512)
.append("Illegal parameter: over max message length for the total size of")
.append(" message data and attribute, allowed size is ")
- .append(TBaseConstants.META_MAX_MESSAGEG_DATA_SIZE)
+ .append(TBaseConstants.META_MAX_MESSAGE_DATA_SIZE)
.append(", message's real size is ").append(msgSize).toString());
}
if (isShutDown.get()) {
diff --git a/tubemq-core/src/main/java/org/apache/tubemq/corebase/TBaseConstants.java b/tubemq-core/src/main/java/org/apache/tubemq/corebase/TBaseConstants.java
index 3fc2f88..2f1be7a 100644
--- a/tubemq-core/src/main/java/org/apache/tubemq/corebase/TBaseConstants.java
+++ b/tubemq-core/src/main/java/org/apache/tubemq/corebase/TBaseConstants.java
@@ -29,8 +29,8 @@ public class TBaseConstants {
public static final String META_DEFAULT_CHARSET_NAME = "UTF-8";
public static final int META_MAX_MSGTYPE_LENGTH = 255;
- public static final int META_MAX_MESSAGEG_HEADER_SIZE = 1024;
- public static final int META_MAX_MESSAGEG_DATA_SIZE = 1024 * 1024;
+ public static final int META_MAX_MESSAGE_HEADER_SIZE = 1024;
+ public static final int META_MAX_MESSAGE_DATA_SIZE = 1024 * 1024;
public static final int META_MAX_PARTITION_COUNT = 100;
public static final int META_MAX_BROKER_IP_LENGTH = 32;
public static final int META_MAX_USERNAME_LENGTH = 64;
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/BrokerServiceServer.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/BrokerServiceServer.java
index 5cd6bf8..ef0cc8a 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/BrokerServiceServer.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/BrokerServiceServer.java
@@ -639,10 +639,10 @@ public class BrokerServiceServer implements BrokerReadService, BrokerWriteServic
builder.setErrMsg("data length is zero!");
return builder.build();
}
- if (dataLength > TBaseConstants.META_MAX_MESSAGEG_DATA_SIZE + 1024) {
+ if (dataLength > TBaseConstants.META_MAX_MESSAGE_DATA_SIZE + 1024) {
builder.setErrCode(TErrCodeConstants.BAD_REQUEST);
builder.setErrMsg(strBuffer.append("data length over max length, allowed max length is ")
- .append(TBaseConstants.META_MAX_MESSAGEG_DATA_SIZE + 1024)
+ .append(TBaseConstants.META_MAX_MESSAGE_DATA_SIZE + 1024)
.append(", data length is ").append(dataLength).toString());
return builder.build();
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/MsgFileStatisInfo.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/MsgFileStatisInfo.java
index ff4679f..9d62696 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/MsgFileStatisInfo.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/MsgFileStatisInfo.java
@@ -61,7 +61,7 @@ public class MsgFileStatisInfo {
putCountSet.writeFailCont.incrementAndGet();
}
if (System.currentTimeMillis() - lastStatisTime.get()
- > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATITON) {
+ > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATION) {
if (isStart.compareAndSet(true, false)) {
if (putCountSet != null) {
putCountSet.endTime = System.currentTimeMillis();
@@ -99,7 +99,7 @@ public class MsgFileStatisInfo {
putCountSet.msgTotalCnt.addAndGet(msgTotalCnt);
}
if (currTime - lastStatisTime.get()
- > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATITON) {
+ > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATION) {
if (isStart.compareAndSet(true, false)) {
if (putCountSet != null) {
putCountSet.endTime = currTime;
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/mem/MsgMemStatisInfo.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/mem/MsgMemStatisInfo.java
index aa82495..e9c0418 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/mem/MsgMemStatisInfo.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/mem/MsgMemStatisInfo.java
@@ -66,7 +66,7 @@ public class MsgMemStatisInfo {
putCountSet.writeFailCont.incrementAndGet();
}
if (System.currentTimeMillis() - lastStatisTime.get()
- > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATITON) {
+ > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATION) {
if (isStart.compareAndSet(true, false)) {
if (putCountSet != null) {
putCountSet.endTime = System.currentTimeMillis();
@@ -100,7 +100,7 @@ public class MsgMemStatisInfo {
}
}
if (timeRecv - lastStatisTime.get()
- > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATITON) {
+ > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATION) {
if (isStart.compareAndSet(true, false)) {
if (putCountSet != null) {
putCountSet.endTime = timeRecv;
@@ -125,7 +125,7 @@ public class MsgMemStatisInfo {
}
}
if (System.currentTimeMillis() - lastStatisTime.get()
- > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATITON) {
+ > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATION) {
if (isStart.compareAndSet(true, false)) {
if (putCountSet != null) {
putCountSet.endTime = System.currentTimeMillis();
@@ -149,7 +149,7 @@ public class MsgMemStatisInfo {
}
}
if (flushTIme - lastStatisTime.get()
- > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATITON) {
+ > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATION) {
if (isStart.compareAndSet(true, false)) {
if (putCountSet != null) {
putCountSet.endTime = flushTIme;
@@ -178,7 +178,7 @@ public class MsgMemStatisInfo {
}
}
if (timeRecv - lastStatisTime.get()
- > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATITON) {
+ > TServerConstants.CFG_STORE_STATS_MAX_REFRESH_DURATION) {
if (isStart.compareAndSet(true, false)) {
if (putCountSet != null) {
putCountSet.endTime = timeRecv;
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/mem/MsgMemStore.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/mem/MsgMemStore.java
index 6f14f4f..93d175a 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/mem/MsgMemStore.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/mem/MsgMemStore.java
@@ -236,7 +236,7 @@ public class MsgMemStore implements Closeable {
if ((cDataOffset < 0)
|| (cDataSize <= 0)
|| (cDataOffset >= currDataOffset)
- || (cDataSize > TBaseConstants.META_MAX_MESSAGEG_DATA_SIZE + 1024)
+ || (cDataSize > TBaseConstants.META_MAX_MESSAGE_DATA_SIZE + 1024)
|| (cDataOffset + cDataSize > currDataOffset)) {
readedOff = usedPos + DataStoreUtils.STORE_INDEX_HEAD_LEN;
continue;
@@ -300,7 +300,7 @@ public class MsgMemStore implements Closeable {
readPos += this.indexUnitLength;
if (cDataOffset >= this.cacheDataOffset.get()
|| cDataSize > this.cacheDataSize.get()
- || cDataSize > TBaseConstants.META_MAX_MESSAGEG_DATA_SIZE + 1024
+ || cDataSize > TBaseConstants.META_MAX_MESSAGE_DATA_SIZE + 1024
|| cDataOffset + cDataSize > this.cacheDataOffset.get()) {
logger.error(strBuffer
.append("[Mem Cache] flush Message found error data: cDataOffset=")
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/utils/DataStoreUtils.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/utils/DataStoreUtils.java
index a3e605d..58cce9a 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/utils/DataStoreUtils.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/utils/DataStoreUtils.java
@@ -50,7 +50,7 @@ public class DataStoreUtils {
//
public static final int MAX_MSG_TRANSFER_SIZE = 1024 * 1024;
public static final int MAX_MSG_DATA_STORE_SIZE =
- TBaseConstants.META_MAX_MESSAGEG_DATA_SIZE * 2;
+ TBaseConstants.META_MAX_MESSAGE_DATA_SIZE * 2;
public static final int MAX_READ_BUFFER_ADJUST = MAX_MSG_DATA_STORE_SIZE * 10;
public static final int STORE_DATA_PREFX_LEN = 48;
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/web/BrokerAdminServlet.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/web/BrokerAdminServlet.java
index 05428fe..9eface6 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/web/BrokerAdminServlet.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/web/BrokerAdminServlet.java
@@ -203,7 +203,7 @@ public class BrokerAdminServlet extends HttpServlet {
}
/***
- * Query broker's all messge store info.
+ * Query broker's all message store info.
*
* @param req
* @return
@@ -413,7 +413,7 @@ public class BrokerAdminServlet extends HttpServlet {
topicName, partitionId, manualOffset, modifyUser);
if (oldOffset < 0) {
sBuilder.append("{\"result\":false,\"errCode\":401,\"errMsg\":\"")
- .append("Manual update current Offset failue!")
+ .append("Manual update current Offset failure!")
.append("\"}");
} else {
sBuilder.append("{\"result\":true,\"errCode\":0,\"errMsg\":\"")
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/common/TServerConstants.java b/tubemq-server/src/main/java/org/apache/tubemq/server/common/TServerConstants.java
index 3691154..b737dd0 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/common/TServerConstants.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/common/TServerConstants.java
@@ -41,7 +41,7 @@ public final class TServerConstants {
public static final int CFG_CONSUMER_CLIENTID_MAX_LENGTH =
TBaseConstants.META_MAX_GROUPNAME_LENGTH + 512;
- public static final long CFG_REPORT_DEFAULT_SYNC_DURATITON = 2 * 3600 * 1000;
- public static final long CFG_STORE_STATS_MAX_REFRESH_DURATITON = 20 * 60 * 1000;
+ public static final long CFG_REPORT_DEFAULT_SYNC_DURATION = 2 * 3600 * 1000;
+ public static final long CFG_STORE_STATS_MAX_REFRESH_DURATION = 20 * 60 * 1000;
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/RecoverableZooKeeper.java b/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/RecoverableZooKeeper.java
index c9e27ea..6a27d9d 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/RecoverableZooKeeper.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/RecoverableZooKeeper.java
@@ -330,7 +330,7 @@ public class RecoverableZooKeeper {
}
/**
- * getData is an idemnpotent operation. Retry before throwing exception
+ * getData is an idempotent operation. Retry before throwing exception
*
* @return Data
*/
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZKUtil.java b/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZKUtil.java
index d2f1cdf..77d5436 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZKUtil.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZKUtil.java
@@ -50,7 +50,7 @@ public class ZKUtil {
private static final int RETRY_TIMES = 3;
private static final int RETRY_INTERVAL = 1000;
private static final int SOCKET_RETRY_WAIT_MS = 200;
- private static final int DEFAULT_ZOOKEPER_CLIENT_PORT = 2181;
+ private static final int DEFAULT_ZOOKEEPER_CLIENT_PORT = 2181;
// Replace this with ZooKeeper constant when ZOOKEEPER-277 is resolved.
private static final char ZNODE_PATH_SEPARATOR = '/';
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/WebParameterUtils.java b/tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/WebParameterUtils.java
index 9545645..4ccd0e2 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/WebParameterUtils.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/WebParameterUtils.java
@@ -289,7 +289,7 @@ public class WebParameterUtils {
* @param reqToken the token for checking
* @throws Exception if authorization failed
*/
- public static void reqAuthorizenCheck(TMaster master,
+ public static void reqAuthorizeCheck(TMaster master,
BrokerConfManager brokerConfManager,
String reqToken) throws Exception {
if (brokerConfManager.isPrimaryNodeActive()) {
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/TMaster.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/TMaster.java
index 0d93ec7..43c6000 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/TMaster.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/TMaster.java
@@ -543,7 +543,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
builder.setErrMsg(paramCheckResult.errMsg);
return builder.build();
}
- Map<String, Long> requredPartMap = (Map<String, Long>) paramCheckResult.checkData;
+ Map<String, Long> requiredPartMap = (Map<String, Long>) paramCheckResult.checkData;
Map<String, TreeSet<String>> reqTopicConditions =
DataConverterUtil.convertTopicConditions(request.getTopicConditionList());
String sessionKey = request.hasSessionKey() ? request.getSessionKey() : "";
@@ -557,7 +557,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
ConsumerInfo inConsumerInfo =
new ConsumerInfo(consumerId, overtls, groupName,
reqTopicSet, reqTopicConditions, isReqConsumeBand,
- sessionKey, sessionTime, sourceCount, requredPartMap);
+ sessionKey, sessionTime, sourceCount, requiredPartMap);
paramCheckResult =
PBParameterUtils.checkConsumerInputInfo(inConsumerInfo,
masterConfig, defaultBrokerConfManager, topicPSInfoManager, strBuffer);
@@ -2171,7 +2171,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
}
/**
- * get neet balance group list
+ * get need balance group list
*
* @param strBuffer
* @return
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/balance/DefaultLoadBalancer.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/balance/DefaultLoadBalancer.java
index 01a4107..58adbda 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/balance/DefaultLoadBalancer.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/balance/DefaultLoadBalancer.java
@@ -138,7 +138,7 @@ public class DefaultLoadBalancer implements LoadBalancer {
}
consumerHolder.setCurConsumeBClientInfo(group, defAllowBClientRate,
confAllowBClientRate, curBClientRate, minClientCnt, false);
- if (consumerBandInfo.isRebalanCheckPrint()) {
+ if (consumerBandInfo.isRebalanceCheckPrint()) {
logger.info(strBuffer.append("[UnBound Alloc 2] Not allocate partition :group(")
.append(group).append(")'s consumer getCachedSize(")
.append(consumerBandInfo.getGroupCnt())
@@ -539,7 +539,7 @@ public class DefaultLoadBalancer implements LoadBalancer {
consumerHolder.setCurConsumeBClientInfo(group,
defAllowBClientRate, confAllowBClientRate,
curBClientRate, minClientCnt, false);
- if (consumerBandInfo.isRebalanCheckPrint()) {
+ if (consumerBandInfo.isRebalanceCheckPrint()) {
logger.info(strBuffer.append("[UnBound Alloc 1] Not allocate partition :group(")
.append(group).append(")'s consumer getCachedSize(")
.append(consumerBandInfo.getGroupCnt())
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
index 3b82f5e..b02d279 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
@@ -289,7 +289,7 @@ public class BrokerSyncStatusInfo {
*/
public boolean needReportData() {
if (System.currentTimeMillis() - this.lastDataPushInMills
- > TServerConstants.CFG_REPORT_DEFAULT_SYNC_DURATITON) {
+ > TServerConstants.CFG_REPORT_DEFAULT_SYNC_DURATION) {
this.lastDataPushInMills = System.currentTimeMillis();
return true;
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodeconsumer/ConsumerBandInfo.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodeconsumer/ConsumerBandInfo.java
index 2f33cc9..97e9f89 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodeconsumer/ConsumerBandInfo.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodeconsumer/ConsumerBandInfo.java
@@ -60,7 +60,7 @@ public class ConsumerBandInfo {
private int curBClientRate = -2; //current broker/client ratio
private int minRequireClientCnt = -2; //minimal client count according to above ratio
private int rebalanceCheckStatus = -2; //rebalance check status
- private boolean rebalanCheckPrint = true; //log print flag
+ private boolean rebalanceCheckPrint = true; //log print flag
public ConsumerBandInfo(boolean isSelectedBig) {
this.sessionKey = "";
@@ -84,7 +84,7 @@ public class ConsumerBandInfo {
Map<String, NodeRebInfo> rebalanceMap,
int defBClientRate, int confBClientRate,
int curBClientRate, int minRequireClientCnt,
- int rebalanceCheckStatus, boolean rebalanCheckPrint) {
+ int rebalanceCheckStatus, boolean rebalanceCheckPrint) {
this.isBandConsume = isBandConsume;
this.sessionKey = sessionKey;
this.sessionTime = sessionTime;
@@ -99,7 +99,7 @@ public class ConsumerBandInfo {
this.curBClientRate = curBClientRate;
this.minRequireClientCnt = minRequireClientCnt;
this.rebalanceCheckStatus = rebalanceCheckStatus;
- this.rebalanCheckPrint = rebalanCheckPrint;
+ this.rebalanceCheckPrint = rebalanceCheckPrint;
this.topicSet.addAll(topicSet);
for (Map.Entry<String, ConsumerInfo> entry : consumerInfoMap.entrySet()) {
this.consumerInfoMap.put(entry.getKey(), entry.getValue().clone());
@@ -397,7 +397,7 @@ public class ConsumerBandInfo {
this.confBClientRate = confBClientRate;
this.curBClientRate = curBClientRate;
this.minRequireClientCnt = minRequireClientCnt;
- this.rebalanCheckPrint = false;
+ this.rebalanceCheckPrint = false;
if (isRebalanced) {
this.rebalanceCheckStatus = 1;
} else {
@@ -405,8 +405,8 @@ public class ConsumerBandInfo {
}
}
- public boolean isRebalanCheckPrint() {
- return rebalanCheckPrint;
+ public boolean isRebalanceCheckPrint() {
+ return rebalanceCheckPrint;
}
public AtomicBoolean getNotAllocate() {
@@ -480,7 +480,7 @@ public class ConsumerBandInfo {
this.partOffsetMap, this.rebalanceMap,
this.defBClientRate, this.confBClientRate,
this.curBClientRate, this.minRequireClientCnt,
- this.rebalanceCheckStatus, this.rebalanCheckPrint);
+ this.rebalanceCheckStatus, this.rebalanceCheckPrint);
}
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/action/screen/Webapi.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/action/screen/Webapi.java
index 3a39275..ce74f7b 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/action/screen/Webapi.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/action/screen/Webapi.java
@@ -271,7 +271,7 @@ public class Webapi implements Action {
strBuffer = webGroupCtrlHandler.adminRebalanceGroupAllocateInfo(req);
} else if ("admin_transfer_current_master".equals(method)) {
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager, req.getParameter("confModAuthToken"));
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager, req.getParameter("confModAuthToken"));
brokerConfManager.transferMaster();
strBuffer.append("{\"result\":true,\"errCode\":0," +
"\"errMsg\":\"TransferMaster method called, please wait 20 seconds!\"}");
@@ -421,7 +421,7 @@ public class Webapi implements Action {
String sessionKey = "";
int reqSourceCount = -1;
int curSourceCount = -1;
- long rebanceCheckTime = -1;
+ long rebalanceCheckTime = -1;
int defBClientRate = -2;
int confBClientRate = -2;
int curBClientRate = -2;
@@ -430,7 +430,7 @@ public class Webapi implements Action {
Set<String> topicSet = new HashSet<>();
List<ConsumerInfo> consumerList = new ArrayList<>();
Map<String, NodeRebInfo> nodeRebInfoMap = new ConcurrentHashMap<>();
- Map<String, TreeSet<String>> existedTopicCondtions = new HashMap<>();
+ Map<String, TreeSet<String>> existedTopicConditions = new HashMap<>();
ConsumerInfoHolder consumerHolder = master.getConsumerHolder();
ConsumerBandInfo consumerBandInfo = consumerHolder.getConsumerBandInfo(strConsumeGroup);
if (consumerBandInfo != null) {
@@ -441,7 +441,7 @@ public class Webapi implements Action {
consumerList = consumerBandInfo.getConsumerInfoList();
}
if (consumerBandInfo.getTopicConditions() != null) {
- existedTopicCondtions = consumerBandInfo.getTopicConditions();
+ existedTopicConditions = consumerBandInfo.getTopicConditions();
}
nodeRebInfoMap = consumerBandInfo.getRebalanceMap();
isBandConsume = consumerBandInfo.isBandConsume();
@@ -456,7 +456,7 @@ public class Webapi implements Action {
sessionKey = consumerBandInfo.getSessionKey();
reqSourceCount = consumerBandInfo.getSourceCount();
curSourceCount = consumerBandInfo.getGroupCnt();
- rebanceCheckTime = consumerBandInfo.getCurCheckCycle();
+ rebalanceCheckTime = consumerBandInfo.getCurCheckCycle();
}
}
strBuffer.append("{\"result\":true,\"errCode\":0,\"errMsg\":\"OK\"")
@@ -485,7 +485,7 @@ public class Webapi implements Action {
.append("\",\"isSelectBig\":").append(isSelectBig)
.append(",\"reqSourceCount\":").append(reqSourceCount)
.append(",\"curSourceCount\":").append(curSourceCount)
- .append(",\"rebanceCheckTime\":").append(rebanceCheckTime);
+ .append(",\"rebalanceCheckTime\":").append(rebalanceCheckTime);
}
strBuffer.append(",\"rebInfo\":{");
if (rebalanceStatus == -2) {
@@ -503,9 +503,9 @@ public class Webapi implements Action {
.append(",\"curBClientRate\":").append(curBClientRate);
}
strBuffer.append("},\"filterConds\":{");
- if (existedTopicCondtions != null) {
+ if (existedTopicConditions != null) {
int keyCount = 0;
- for (Map.Entry<String, TreeSet<String>> entry : existedTopicCondtions.entrySet()) {
+ for (Map.Entry<String, TreeSet<String>> entry : existedTopicConditions.entrySet()) {
if (keyCount++ > 0) {
strBuffer.append(",");
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
index acc74c0..5259cdc 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
@@ -58,7 +58,7 @@ public class WebAdminFlowRuleHandler {
StringBuilder strBuffer = new StringBuilder(512);
try {
// check if allow modify
- WebParameterUtils.reqAuthorizenCheck(master,
+ WebParameterUtils.reqAuthorizeCheck(master,
brokerConfManager, req.getParameter("confModAuthToken"));
// get createUser info
String createUser =
@@ -132,7 +132,7 @@ public class WebAdminFlowRuleHandler {
int opType) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master,
+ WebParameterUtils.reqAuthorizeCheck(master,
brokerConfManager, req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -178,7 +178,7 @@ public class WebAdminFlowRuleHandler {
// #lizard forgives
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master,
+ WebParameterUtils.reqAuthorizeCheck(master,
brokerConfManager, req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("createUser",
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
index 78e4a43..0fa9c58 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
@@ -67,7 +67,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminAddGroupFilterCondInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -149,7 +149,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminBatchAddGroupFilterCondInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -261,7 +261,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminModGroupFilterCondInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -349,7 +349,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminBatchModGroupFilterCondInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -464,7 +464,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminDeleteGroupFilterCondInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
Set<String> batchOpTopicNames =
WebParameterUtils.getBatchTopicNames(req.getParameter("topicName"),
@@ -519,7 +519,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminRebalanceGroupAllocateInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String groupName =
WebParameterUtils.validGroupParameter("groupName",
@@ -592,7 +592,7 @@ public class WebAdminGroupCtrlHandler {
.append(groupName).append(", consumerIds=")
.append(batchOpConsumerIds.toString())
.append(", reJoinWait=").append(reJoinWait)
- .append(", creater=").append(modifyUser).toString());
+ .append(", creator=").append(modifyUser).toString());
sBuilder.delete(0, sBuilder.length());
consumerInfoHolder.addRebConsumerInfo(groupName, batchOpConsumerIds, reJoinWait);
sBuilder.append("{\"result\":true,\"errCode\":0,\"errMsg\":\"OK\"}");
@@ -701,7 +701,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminAddConsumerGroupInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -759,7 +759,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminBatchAddConsumerGroupInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -778,7 +778,7 @@ public class WebAdminGroupCtrlHandler {
if ((jsonArray == null) || (jsonArray.isEmpty())) {
throw new Exception("Null value of groupNameJsonSet, please set the value first!");
}
- Set<String> confgiuredTopicSet = brokerConfManager.getTotalConfiguredTopicNames();
+ Set<String> configuredTopicSet = brokerConfManager.getTotalConfiguredTopicNames();
HashMap<String, BdbConsumerGroupEntity> inGroupAuthConfEntityMap =
new HashMap<>();
for (int j = 0; j < jsonArray.size(); j++) {
@@ -809,7 +809,7 @@ public class WebAdminGroupCtrlHandler {
groupCreateUser = createUser;
groupCreateDate = createDate;
}
- if (!confgiuredTopicSet.contains(groupTopicName)) {
+ if (!configuredTopicSet.contains(groupTopicName)) {
throw new Exception(sBuilder.append("Topic ").append(groupTopicName)
.append(" not configure in master configure, please configure first!").toString());
}
@@ -918,7 +918,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminDeleteConsumerGroupInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
Set<String> batchOpTopicNames =
WebParameterUtils.getBatchTopicNames(req.getParameter("topicName"),
@@ -982,7 +982,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminAddBlackGroupInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -1027,7 +1027,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminBatchAddBlackGroupInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -1173,7 +1173,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminDeleteBlackGroupInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
Set<String> batchOpGroupNames =
WebParameterUtils.getBatchGroupNames(req.getParameter("groupName"),
@@ -1218,7 +1218,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminAddConsumeGroupSettingInfo(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -1266,7 +1266,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminBatchAddConsumeGroupSetting(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -1417,7 +1417,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminUpdConsumeGroupSetting(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -1492,7 +1492,7 @@ public class WebAdminGroupCtrlHandler {
public StringBuilder adminDeleteConsumeGroupSetting(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
Set<String> batchOpGroupNames =
WebParameterUtils.getBatchGroupNames(req.getParameter("groupName"),
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java
index 77beb91..4722035 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java
@@ -58,7 +58,7 @@ public class WebAdminTopicAuthHandler {
HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
@@ -103,7 +103,7 @@ public class WebAdminTopicAuthHandler {
public StringBuilder adminBatchAddTopicAuthControl(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String operator =
WebParameterUtils.validStringParameter("createUser", req.getParameter("createUser"),
@@ -191,7 +191,7 @@ public class WebAdminTopicAuthHandler {
public StringBuilder adminDeleteTopicAuthControl(HttpServletRequest req) throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser",
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
index e94f187..8c2260d 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
@@ -81,13 +81,13 @@ public class WebBrokerDefConfHandler {
*
* @param webMaster
* @param brokeId
- * @param oldManagStatus
+ * @param oldManageStatus
* @param newManageStatus
* @return
*/
public static boolean isBrokerStartNeedFast(BrokerConfManager webMaster,
int brokeId,
- int oldManagStatus,
+ int oldManageStatus,
int newManageStatus) {
ConcurrentHashMap<String, BdbTopicConfEntity> bdbTopicConfEntMap =
webMaster.getBrokerTopicConfEntitySet(brokeId);
@@ -106,12 +106,12 @@ public class WebBrokerDefConfHandler {
if (isNeedFastStart) {
switch (newManageStatus) {
case TStatusConstants.STATUS_MANAGE_ONLINE: {
- if ((oldManagStatus == TStatusConstants.STATUS_MANAGE_APPLY)
- || (oldManagStatus == TStatusConstants.STATUS_MANAGE_OFFLINE)
- || (oldManagStatus == TStatusConstants.STATUS_MANAGE_ONLINE_NOT_READ)) {
+ if ((oldManageStatus == TStatusConstants.STATUS_MANAGE_APPLY)
+ || (oldManageStatus == TStatusConstants.STATUS_MANAGE_OFFLINE)
+ || (oldManageStatus == TStatusConstants.STATUS_MANAGE_ONLINE_NOT_READ)) {
isNeedFastStart = false;
}
- if (oldManagStatus == TStatusConstants.STATUS_MANAGE_ONLINE) {
+ if (oldManageStatus == TStatusConstants.STATUS_MANAGE_ONLINE) {
if ((brokerSyncStatusInfo.isBrokerConfChanged())
|| (!brokerSyncStatusInfo.isBrokerLoaded())) {
isNeedFastStart = false;
@@ -120,11 +120,11 @@ public class WebBrokerDefConfHandler {
}
break;
case TStatusConstants.STATUS_MANAGE_ONLINE_NOT_WRITE: {
- if ((oldManagStatus == TStatusConstants.STATUS_MANAGE_APPLY)
- || (oldManagStatus == TStatusConstants.STATUS_MANAGE_OFFLINE)) {
+ if ((oldManageStatus == TStatusConstants.STATUS_MANAGE_APPLY)
+ || (oldManageStatus == TStatusConstants.STATUS_MANAGE_OFFLINE)) {
isNeedFastStart = false;
}
- if (oldManagStatus == TStatusConstants.STATUS_MANAGE_ONLINE_NOT_WRITE) {
+ if (oldManageStatus == TStatusConstants.STATUS_MANAGE_ONLINE_NOT_WRITE) {
if ((brokerSyncStatusInfo.isBrokerConfChanged())
|| (!brokerSyncStatusInfo.isBrokerLoaded())) {
isNeedFastStart = false;
@@ -133,8 +133,8 @@ public class WebBrokerDefConfHandler {
}
break;
case TStatusConstants.STATUS_MANAGE_OFFLINE: {
- if ((oldManagStatus == TStatusConstants.STATUS_MANAGE_ONLINE)
- || (oldManagStatus == TStatusConstants.STATUS_MANAGE_ONLINE_NOT_WRITE)) {
+ if ((oldManageStatus == TStatusConstants.STATUS_MANAGE_ONLINE)
+ || (oldManageStatus == TStatusConstants.STATUS_MANAGE_ONLINE_NOT_WRITE)) {
isNeedFastStart = false;
}
}
@@ -158,7 +158,7 @@ public class WebBrokerDefConfHandler {
HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String brokerIp =
WebParameterUtils.validAddressParameter("brokerIp",
@@ -314,7 +314,7 @@ public class WebBrokerDefConfHandler {
// #lizard forgives
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser", req.getParameter("createUser"),
@@ -328,7 +328,7 @@ public class WebBrokerDefConfHandler {
if ((brokerJsonArray == null) || (brokerJsonArray.isEmpty())) {
throw new Exception("Null value of brokerJsonSet, please set the value first!");
}
- HashMap<String, BdbBrokerConfEntity> inBrokerConfEntiyMap = new HashMap<>();
+ HashMap<String, BdbBrokerConfEntity> inBrokerConfEntityMap = new HashMap<>();
ConcurrentHashMap<Integer, BdbBrokerConfEntity> bdbBrokerConfEntityMap =
brokerConfManager.getBrokerConfStoreMap();
for (int count = 0; count < brokerJsonArray.size(); count++) {
@@ -375,7 +375,7 @@ public class WebBrokerDefConfHandler {
throw new Exception(strBuffer.toString());
}
}
- for (BdbBrokerConfEntity brokerConfEntity : inBrokerConfEntiyMap.values()) {
+ for (BdbBrokerConfEntity brokerConfEntity : inBrokerConfEntityMap.values()) {
if (brokerConfEntity.getBrokerIp().equals(brokerIp)
&& brokerConfEntity.getBrokerPort() == brokerPort) {
throw new Exception(strBuffer
@@ -456,7 +456,7 @@ public class WebBrokerDefConfHandler {
.append(TokenConstants.TOKEN_TLS_PORT).append(TokenConstants.EQ)
.append(brokerTlsPort).toString();
strBuffer.delete(0, strBuffer.length());
- inBrokerConfEntiyMap.put(inputKey, new BdbBrokerConfEntity(brokerId, brokerIp,
+ inBrokerConfEntityMap.put(inputKey, new BdbBrokerConfEntity(brokerId, brokerIp,
brokerPort, numPartitions, unflushThreshold, unflushInterval, deleteWhen,
deletePolicy, manageStatus, acceptPublish, acceptSubscribe, attributes,
true, false, itemCreateUser, itemCreateDate, itemCreateUser, itemCreateDate));
@@ -467,7 +467,7 @@ public class WebBrokerDefConfHandler {
.append(ee.getMessage()).toString());
}
}
- for (BdbBrokerConfEntity brokerConfEntity : inBrokerConfEntiyMap.values()) {
+ for (BdbBrokerConfEntity brokerConfEntity : inBrokerConfEntityMap.values()) {
brokerConfManager.confAddBrokerDefaultConfig(brokerConfEntity);
}
strBuffer.append("{\"result\":true,\"errCode\":0,\"errMsg\":\"OK\"}");
@@ -490,7 +490,7 @@ public class WebBrokerDefConfHandler {
HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -573,7 +573,7 @@ public class WebBrokerDefConfHandler {
public StringBuilder adminSetReadOrWriteBrokerConf(HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -739,7 +739,7 @@ public class WebBrokerDefConfHandler {
HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -785,7 +785,7 @@ public class WebBrokerDefConfHandler {
public StringBuilder adminUpdateBrokerConf(HttpServletRequest req) throws Throwable {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser = WebParameterUtils.validStringParameter("modifyUser",
req.getParameter("modifyUser"), TBaseConstants.META_MAX_USERNAME_LENGTH, true, "");
@@ -946,7 +946,7 @@ public class WebBrokerDefConfHandler {
public StringBuilder adminReloadBrokerConf(HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -1009,7 +1009,7 @@ public class WebBrokerDefConfHandler {
public StringBuilder adminOfflineBrokerConf(HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -1093,7 +1093,7 @@ public class WebBrokerDefConfHandler {
public StringBuilder adminDeleteBrokerConfEntityInfo(HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
index 9b81d42..181c26f 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
@@ -73,7 +73,7 @@ public class WebBrokerTopicConfHandler {
public StringBuilder adminAddTopicEntityInfo(HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
// user
String createUser =
@@ -224,7 +224,7 @@ public class WebBrokerTopicConfHandler {
public StringBuilder adminBatchAddTopicEntityInfo(HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String createUser =
WebParameterUtils.validStringParameter("createUser", req.getParameter("createUser"),
@@ -710,7 +710,7 @@ public class WebBrokerTopicConfHandler {
try {
// Check if the request is authorized
// and the parameters are valid
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager,
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager,
req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser",
@@ -857,7 +857,7 @@ public class WebBrokerTopicConfHandler {
public StringBuilder adminRedoDeleteTopicEntityInfo(HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder(512);
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager, req.getParameter("confModAuthToken"));
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager, req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser", req.getParameter("modifyUser"),
TBaseConstants.META_MAX_USERNAME_LENGTH, true, "");
@@ -1169,7 +1169,7 @@ public class WebBrokerTopicConfHandler {
public StringBuilder adminModifyTopicEntityInfo(HttpServletRequest req) throws Exception {
StringBuilder strBuffer = new StringBuilder();
try {
- WebParameterUtils.reqAuthorizenCheck(master, brokerConfManager, req.getParameter("confModAuthToken"));
+ WebParameterUtils.reqAuthorizeCheck(master, brokerConfManager, req.getParameter("confModAuthToken"));
String modifyUser =
WebParameterUtils.validStringParameter("modifyUser", req.getParameter("modifyUser"),
TBaseConstants.META_MAX_USERNAME_LENGTH, true, "");
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/tools/StoreRepairAdmin.java b/tubemq-server/src/main/java/org/apache/tubemq/server/tools/StoreRepairAdmin.java
index 8fd1f5b..3785eee 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/tools/StoreRepairAdmin.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/tools/StoreRepairAdmin.java
@@ -87,7 +87,7 @@ public class StoreRepairAdmin {
int count = 0;
ExecutorService executor =
Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1);
- List<Callable<IndexReparStore>> tasks = new ArrayList<>();
+ List<Callable<IndexRepairStore>> tasks = new ArrayList<>();
if (ls != null) {
for (final File subDir : ls) {
if (subDir == null) {
@@ -106,15 +106,15 @@ public class StoreRepairAdmin {
}
}
final int storeId = Integer.parseInt(name.substring(index + 1));
- tasks.add(new Callable<IndexReparStore>() {
+ tasks.add(new Callable<IndexRepairStore>() {
@Override
- public IndexReparStore call() throws Exception {
+ public IndexRepairStore call() throws Exception {
StringBuilder sBuilder = new StringBuilder(512);
logger.info(sBuilder.append("[Data Repair] Loading data directory:")
.append(subDir.getAbsolutePath()).append("...").toString());
sBuilder.delete(0, sBuilder.length());
- final IndexReparStore messageStore =
- new IndexReparStore(storePath, topic, storeId);
+ final IndexRepairStore messageStore =
+ new IndexRepairStore(storePath, topic, storeId);
messageStore.reCreateIndexFiles();
logger.info(sBuilder.append("[Data Repair] Finished data index recreation :")
.append(subDir.getAbsolutePath()).toString());
@@ -126,13 +126,13 @@ public class StoreRepairAdmin {
}
}
if (count > 0) {
- CompletionService<IndexReparStore> completionService =
+ CompletionService<IndexRepairStore> completionService =
new ExecutorCompletionService<>(executor);
- for (Callable<IndexReparStore> task : tasks) {
+ for (Callable<IndexRepairStore> task : tasks) {
completionService.submit(task);
}
for (int i = 0; i < tasks.size(); i++) {
- IndexReparStore messageStore =
+ IndexRepairStore messageStore =
completionService.take().get();
if (messageStore != null) {
messageStore.close();
@@ -153,7 +153,7 @@ public class StoreRepairAdmin {
System.exit(0);
}
- private static class IndexReparStore implements Closeable {
+ private static class IndexRepairStore implements Closeable {
private static final String DATA_SUFFIX = ".tube";
private static final String INDEX_SUFFIX = ".index";
private static final int ONE_M_BYTES = 10 * 1024 * 1024;
@@ -169,7 +169,7 @@ public class StoreRepairAdmin {
500000 * DataStoreUtils.STORE_INDEX_HEAD_LEN;
private SegmentList segments;
- public IndexReparStore(final String basePath,
+ public IndexRepairStore(final String basePath,
final String topic,
final int storeId) {
this.basePath = basePath;