You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by al...@apache.org on 2020/04/27 02:26:26 UTC
[incubator-tubemq] branch master updated: [TUBEMQ-82] Fix some
typos & update comments (#65)
This is an automated email from the ASF dual-hosted git repository.
aloyszhang 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 ee2e2fd [TUBEMQ-82] Fix some typos & update comments (#65)
ee2e2fd is described below
commit ee2e2fd4ca2df1c6271a5eac0920235e8b0d3b1e
Author: Tboy <gu...@immomo.com>
AuthorDate: Mon Apr 27 10:26:17 2020 +0800
[TUBEMQ-82] Fix some typos & update comments (#65)
---
.../tubemq/server/broker/msgstore/disk/FileSegment.java | 16 +++++++---------
.../server/broker/msgstore/disk/FileSegmentList.java | 6 +++++-
.../tubemq/server/broker/nodeinfo/ConsumerNodeInfo.java | 10 +++++-----
.../java/org/apache/tubemq/server/master/TMaster.java | 12 ++++++------
4 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/FileSegment.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/FileSegment.java
index 9bbb21b..949d149 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/FileSegment.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/FileSegment.java
@@ -80,7 +80,7 @@ public class FileSegment implements Segment {
long remaining = checkOffset == Long.MAX_VALUE ? -1 : (checkOffset - this.start);
if (this.segmentType == SegmentType.DATA) {
RecoverResult recoverResult = this.recoverData(remaining);
- if (recoverResult.isEqutal()) {
+ if (recoverResult.isEqual()) {
logger.info(
"[File Store] Data Segment recover success, ignore content check!");
} else {
@@ -94,7 +94,7 @@ public class FileSegment implements Segment {
}
} else {
RecoverResult recoverResult = this.recoverIndex(remaining);
- if (recoverResult.isEqutal()) {
+ if (recoverResult.isEqual()) {
logger.info(
"[File Store] Index Segment recover success, ignore content check!");
} else {
@@ -174,7 +174,6 @@ public class FileSegment implements Segment {
@Override
public long append(final ByteBuffer buf) throws IOException {
if (!this.mutable) {
- // 只有最后一个segment为可修改状态
if (this.segmentType == SegmentType.DATA) {
throw new UnsupportedOperationException("[File Store] Data Segment is immutable!");
} else {
@@ -321,7 +320,6 @@ public class FileSegment implements Segment {
return 0;
}
if (!mutable) {
- // 最后一个segment不能主动设置过期
if (checkTimestamp - file.lastModified() > maxValidTimeMs) {
if (expired.compareAndSet(false, true)) {
expiredTime = System.currentTimeMillis();
@@ -461,19 +459,19 @@ public class FileSegment implements Segment {
private static class RecoverResult {
private long truncated;
- private boolean isEqutal;
+ private boolean isEqual;
- public RecoverResult(long truncated, boolean isEqutal) {
+ public RecoverResult(long truncated, boolean isEqual) {
this.truncated = truncated;
- this.isEqutal = isEqutal;
+ this.isEqual = isEqual;
}
public long getTruncated() {
return truncated;
}
- public boolean isEqutal() {
- return isEqutal;
+ public boolean isEqual() {
+ return isEqual;
}
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/FileSegmentList.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/FileSegmentList.java
index f0c350c..04f52af 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/FileSegmentList.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/disk/FileSegmentList.java
@@ -252,9 +252,13 @@ public class FileSegmentList implements SegmentList {
return sum;
}
+ /**
+ * Binary search the segment that contains the offset
+ * @param offset
+ * @return
+ */
@Override
public Segment findSegment(final long offset) {
- // 二分法查找包含offset的segment
final Segment[] curViews = segmentList.get();
if (curViews.length == 0) {
return null;
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/nodeinfo/ConsumerNodeInfo.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/nodeinfo/ConsumerNodeInfo.java
index 18f837d..786390c 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/nodeinfo/ConsumerNodeInfo.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/nodeinfo/ConsumerNodeInfo.java
@@ -130,13 +130,13 @@ public class ConsumerNodeInfo {
// #lizard forgives
public int getCurrentAllowedSize(final String storeKey,
final FlowCtrlRuleHandler flowCtrlRuleHandler,
- final long currMaxDataOffset, int maxMsgTrnsSize,
+ final long currMaxDataOffset, int maxMsgTransferSize,
boolean isEscFlowCtrl) {
if (lastDataRdOffset >= 0) {
long curDataDlt = currMaxDataOffset - lastDataRdOffset;
long currTime = System.currentTimeMillis();
recalcMsgLimitValue(curDataDlt,
- currTime, maxMsgTrnsSize, flowCtrlRuleHandler);
+ currTime, maxMsgTransferSize, flowCtrlRuleHandler);
if (storeManager.isSsdServiceStart()
&& needSsdProc.get()
&& (currTime - createTime > 2 * 60 * 1000)) {
@@ -400,10 +400,10 @@ public class ConsumerNodeInfo {
*
* @param curDataDlt
* @param currTime
- * @param maxMsgTrnsSize
+ * @param maxMsgTransferSize
* @param flowCtrlRuleHandler
*/
- private void recalcMsgLimitValue(long curDataDlt, long currTime, int maxMsgTrnsSize,
+ private void recalcMsgLimitValue(long curDataDlt, long currTime, int maxMsgTransferSize,
final FlowCtrlRuleHandler flowCtrlRuleHandler) {
if (currTime > nextLimitUpdateTime) {
this.curFlowCtrlVal = flowCtrlRuleHandler.getCurDataLimit(curDataDlt);
@@ -422,7 +422,7 @@ public class ConsumerNodeInfo {
currTime + TBaseConstants.CFG_FC_MAX_LIMITING_DURATION;
this.totalUnitSec = this.curFlowCtrlVal.dataLtInSize / 12;
this.sentUnit =
- totalUnitSec > maxMsgTrnsSize ? maxMsgTrnsSize : (int) totalUnitSec;
+ totalUnitSec > maxMsgTransferSize ? maxMsgTransferSize : (int) totalUnitSec;
} else if (currTime > nextStatTime) {
sentMsgSize = 0;
nextStatTime =
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 ca08965..8a35d25 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
@@ -149,7 +149,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
private boolean startupResetBalance = true;
private int balanceDelayTimes = 0;
private Sleeper stopSleeper = new Sleeper(1000, this);
- private SimpleVisitTokenManager visitTokenManage;
+ private SimpleVisitTokenManager visitTokenManager;
/**
* constructor
@@ -164,7 +164,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
this.checkAndCreateBdbDataPath();
this.masterAddInfo =
new NodeAddrInfo(masterConfig.getHostName(), masterConfig.getPort());
- this.visitTokenManage = new SimpleVisitTokenManager(this.masterConfig);
+ this.visitTokenManager = new SimpleVisitTokenManager(this.masterConfig);
this.serverAuthHandler = new SimpleCertificateMasterHandler(this.masterConfig);
this.producerHolder = new ProducerInfoHolder();
this.consumerHolder = new ConsumerInfoHolder();
@@ -2175,7 +2175,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
*/
private MasterBrokerAuthorizedInfo.Builder genBrokerAuthorizedInfo(String authAuthorizedToken) {
MasterBrokerAuthorizedInfo.Builder authorizedBuilder = MasterBrokerAuthorizedInfo.newBuilder();
- authorizedBuilder.setVisitAuthorizedToken(visitTokenManage.getBrokerVisitTokens());
+ authorizedBuilder.setVisitAuthorizedToken(visitTokenManager.getBrokerVisitTokens());
if (TStringUtils.isNotBlank(authAuthorizedToken)) {
authorizedBuilder.setAuthAuthorizedToken(authAuthorizedToken);
}
@@ -2191,9 +2191,9 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
private MasterAuthorizedInfo.Builder genAuthorizedInfo(String authAuthorizedToken, boolean isBroker) {
MasterAuthorizedInfo.Builder authorizedBuilder = MasterAuthorizedInfo.newBuilder();
if (isBroker) {
- authorizedBuilder.setVisitAuthorizedToken(visitTokenManage.getFreshVisitToken());
+ authorizedBuilder.setVisitAuthorizedToken(visitTokenManager.getFreshVisitToken());
} else {
- authorizedBuilder.setVisitAuthorizedToken(visitTokenManage.getCurVisitToken());
+ authorizedBuilder.setVisitAuthorizedToken(visitTokenManager.getCurVisitToken());
}
if (TStringUtils.isNotBlank(authAuthorizedToken)) {
authorizedBuilder.setAuthAuthorizedToken(authAuthorizedToken);
@@ -2332,7 +2332,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
zkOffsetStorage.close();
defaultBrokerConfManager.stop();
defaultBdbStoreService.stop();
- visitTokenManage.stop();
+ visitTokenManager.stop();
if (!shutdownHooked.get()) {
Runtime.getRuntime().removeShutdownHook(shutdownHook);
}