You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/04/14 08:58:59 UTC
[iotdb] branch ty-mpp updated: add StorageEngineV2
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty-mpp
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ty-mpp by this push:
new b3e2a54c9a add StorageEngineV2
b3e2a54c9a is described below
commit b3e2a54c9ababe976d59d703c18ab23f45f3850c
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu Apr 14 16:58:47 2022 +0800
add StorageEngineV2
---
.../java/org/apache/iotdb/db/service/IoTDB.java | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
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 ea34ae40da..547799c2c7 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
@@ -30,6 +30,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.rest.IoTDBRestServiceCheck;
import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor;
import org.apache.iotdb.db.engine.StorageEngine;
+import org.apache.iotdb.db.engine.StorageEngineV2;
import org.apache.iotdb.db.engine.cache.CacheHitRatioMonitor;
import org.apache.iotdb.db.engine.compaction.CompactionTaskManager;
import org.apache.iotdb.db.engine.cq.ContinuousQueryService;
@@ -138,23 +139,26 @@ public class IoTDB implements IoTDBMBean {
registerManager.register(CacheHitRatioMonitor.getInstance());
registerManager.register(CompactionTaskManager.getInstance());
JMXService.registerMBean(getInstance(), mbeanName);
- registerManager.register(WALManager.getInstance());
- registerManager.register(StorageEngine.getInstance());
- registerManager.register(TemporaryQueryDataFileService.getInstance());
- registerManager.register(UDFClassLoaderManager.getInstance());
- registerManager.register(UDFRegistrationService.getInstance());
- registerManager.register(ReceiverService.getInstance());
- registerManager.register(MetricsService.getInstance());
// in mpp mode we need to start some other services
if (IoTDBDescriptor.getInstance().getConfig().isMppMode()) {
+ registerManager.register(StorageEngineV2.getInstance());
registerManager.register(DataBlockService.getInstance());
registerManager.register(FragmentInstanceScheduler.getInstance());
IoTDBDescriptor.getInstance()
.getConfig()
.setRpcImplClassName(DataNodeTSIServiceImpl.class.getName());
+ } else {
+ registerManager.register(StorageEngine.getInstance());
}
+ registerManager.register(WALManager.getInstance());
+ registerManager.register(TemporaryQueryDataFileService.getInstance());
+ registerManager.register(UDFClassLoaderManager.getInstance());
+ registerManager.register(UDFRegistrationService.getInstance());
+ registerManager.register(ReceiverService.getInstance());
+ registerManager.register(MetricsService.getInstance());
+
// in cluster mode, RPC service is not enabled.
if (IoTDBDescriptor.getInstance().getConfig().isEnableRpcService()) {
registerManager.register(RPCService.getInstance());
@@ -170,7 +174,9 @@ public class IoTDB implements IoTDBMBean {
logger.info("IoTDB is set up, now may some sgs are not ready, please wait several seconds...");
- while (!StorageEngine.getInstance().isAllSgReady()) {
+ while (IoTDBDescriptor.getInstance().getConfig().isMppMode()
+ ? !StorageEngineV2.getInstance().isAllSgReady()
+ : !StorageEngine.getInstance().isAllSgReady()) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {