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/04/09 01:51:59 UTC
[incubator-iotdb] branch fix_upgrade_new created (now d0dee63)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch fix_upgrade_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at d0dee63 start jdbc service at last
This branch includes the following new commits:
new d0dee63 start jdbc service at last
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: start jdbc service at last
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch fix_upgrade_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d0dee633cad2b226c9281ee100fed49169ba4625
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Apr 9 09:51:01 2020 +0800
start jdbc service at last
---
.../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 8 ++++----
server/src/main/java/org/apache/iotdb/db/service/IoTDB.java | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index c0d8cef..b8a342d 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -968,12 +968,12 @@ public class StorageGroupProcessor {
*/
public int countUpgradeFiles() {
int cntUpgradeFileNum = 0;
- for (TsFileResource seqTsFileResource : new ArrayList<>(sequenceFileList)) {
+ for (TsFileResource seqTsFileResource : sequenceFileList) {
if (UpgradeUtils.isNeedUpgrade(seqTsFileResource)) {
cntUpgradeFileNum += 1;
}
}
- for (TsFileResource unseqTsFileResource : new ArrayList<>(unSequenceFileList)) {
+ for (TsFileResource unseqTsFileResource : unSequenceFileList) {
if (UpgradeUtils.isNeedUpgrade(unseqTsFileResource)) {
cntUpgradeFileNum += 1;
}
@@ -982,10 +982,10 @@ public class StorageGroupProcessor {
}
public void upgrade() {
- for (TsFileResource seqTsFileResource : new ArrayList<>(sequenceFileList)) {
+ for (TsFileResource seqTsFileResource : sequenceFileList) {
seqTsFileResource.doUpgrade();
}
- for (TsFileResource unseqTsFileResource : new ArrayList<>(unSequenceFileList)) {
+ for (TsFileResource unseqTsFileResource : unSequenceFileList) {
unseqTsFileResource.doUpgrade();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
index 0445986..e8dcb02 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
@@ -93,7 +93,6 @@ public class IoTDB implements IoTDBMBean {
registerManager.register(StorageEngine.getInstance());
registerManager.register(MultiFileLogNodeManager.getInstance());
registerManager.register(JMXService.getInstance());
- registerManager.register(JDBCService.getInstance());
registerManager.register(Monitor.getInstance());
registerManager.register(StatMonitor.getInstance());
registerManager.register(Measurement.INSTANCE);
@@ -106,7 +105,7 @@ public class IoTDB implements IoTDBMBean {
registerManager.register(CacheHitRatioMonitor.getInstance());
registerManager.register(MetricsService.getInstance());
JMXService.registerMBean(getInstance(), mbeanName);
-
+ registerManager.register(JDBCService.getInstance());
logger.info("IoTDB is set up.");
}