You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/22 04:20:50 UTC
[iotdb] branch master updated: Correct the spelling of millseconds
to milliseconds (#2092)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 988a135 Correct the spelling of millseconds to milliseconds (#2092)
988a135 is described below
commit 988a135ad72150eff9612b979a5436f681103863
Author: Benedict Jin <as...@apache.org>
AuthorDate: Sun Nov 22 12:20:38 2020 +0800
Correct the spelling of millseconds to milliseconds (#2092)
---
.../java/org/apache/iotdb/db/engine/StorageEngine.java | 2 +-
.../compaction/CompactionMergeTaskPoolManager.java | 10 +++++-----
.../iotdb/db/engine/merge/manage/MergeManager.java | 16 ++++++++--------
.../main/java/org/apache/iotdb/db/service/IService.java | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index d7d1df6..6594bf2 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -292,7 +292,7 @@ public class StorageEngine implements IService {
}
@Override
- public void shutdown(long millseconds) throws ShutdownException {
+ public void shutdown(long milliseconds) throws ShutdownException {
try {
forceCloseAllProcessor();
} catch (TsFileProcessorException e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java
index 830ea56..aa2ef5f 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java
@@ -67,9 +67,9 @@ public class CompactionMergeTaskPoolManager implements IService {
}
@Override
- public void waitAndStop(long millseconds) {
+ public void waitAndStop(long milliseconds) {
if (pool != null) {
- awaitTermination(pool, millseconds);
+ awaitTermination(pool, milliseconds);
logger.info("Waiting for task pool to shut down");
waitTermination();
}
@@ -96,12 +96,12 @@ public class CompactionMergeTaskPoolManager implements IService {
logger.info("CompactionManager stopped");
}
- private void awaitTermination(ExecutorService service, long millseconds) {
+ private void awaitTermination(ExecutorService service, long milliseconds) {
try {
service.shutdown();
- service.awaitTermination(millseconds, TimeUnit.MILLISECONDS);
+ service.awaitTermination(milliseconds, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- logger.warn("CompactionThreadPool can not be closed in {} ms", millseconds);
+ logger.warn("CompactionThreadPool can not be closed in {} ms", milliseconds);
Thread.currentThread().interrupt();
}
service.shutdownNow();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
index ac0e38d..aa4f0d1 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
@@ -192,17 +192,17 @@ public class MergeManager implements IService, MergeManagerMBean {
}
@Override
- public void waitAndStop(long millseconds) {
+ public void waitAndStop(long milliseconds) {
if (mergeTaskPool != null) {
if (timedMergeThreadPool != null) {
- awaitTermination(timedMergeThreadPool, millseconds);
+ awaitTermination(timedMergeThreadPool, milliseconds);
timedMergeThreadPool = null;
}
- awaitTermination(taskCleanerThreadPool, millseconds);
+ awaitTermination(taskCleanerThreadPool, milliseconds);
taskCleanerThreadPool = null;
- awaitTermination(mergeTaskPool, millseconds);
- awaitTermination(mergeChunkSubTaskPool, millseconds);
+ awaitTermination(mergeTaskPool, milliseconds);
+ awaitTermination(mergeChunkSubTaskPool, milliseconds);
logger.info("Waiting for task pool to shut down");
long startTime = System.currentTimeMillis();
while (!mergeTaskPool.isTerminated() || !mergeChunkSubTaskPool.isTerminated()) {
@@ -227,12 +227,12 @@ public class MergeManager implements IService, MergeManagerMBean {
}
}
- private void awaitTermination(ExecutorService service, long millseconds) {
+ private void awaitTermination(ExecutorService service, long milliseconds) {
try {
service.shutdown();
- service.awaitTermination(millseconds, TimeUnit.MILLISECONDS);
+ service.awaitTermination(milliseconds, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- logger.warn("MergeThreadPool can not be closed in {} ms", millseconds);
+ logger.warn("MergeThreadPool can not be closed in {} ms", milliseconds);
Thread.currentThread().interrupt();
}
service.shutdownNow();
diff --git a/server/src/main/java/org/apache/iotdb/db/service/IService.java b/server/src/main/java/org/apache/iotdb/db/service/IService.java
index 96c4918..4bd32dd 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/IService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/IService.java
@@ -34,9 +34,9 @@ public interface IService {
*/
void stop();
- default void waitAndStop(long millseconds) {stop();}
+ default void waitAndStop(long milliseconds) {stop();}
- default void shutdown(long millseconds) throws ShutdownException {waitAndStop(millseconds);}
+ default void shutdown(long milliseconds) throws ShutdownException {waitAndStop(milliseconds);}
/**
* Get the name of the the service.