You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/01/07 13:16:24 UTC
[incubator-iotdb] 02/02: move IoTDB daemon to EnvironmentUtils;
allow iotdb-engine.properties providing incomplete parameters for
hdfs
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_406_refactor_environmentutils
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 7f93f819aa6e3ae2da02508507f9e16835478d7a
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jan 7 21:15:56 2020 +0800
move IoTDB daemon to EnvironmentUtils; allow iotdb-engine.properties providing incomplete parameters for hdfs
---
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 8 +++
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 3 ++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 25 ++++++----
.../org/apache/iotdb/db/engine/StorageEngine.java | 2 +
.../engine/storagegroup/StorageGroupProcessor.java | 8 ++-
.../db/engine/storagegroup/TsFileResource.java | 7 ++-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 2 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../org/apache/iotdb/db/service/JDBCService.java | 7 ++-
.../apache/iotdb/db/service/RegisterManager.java | 3 ++
.../iotdb/db/integration/IOTDBGroupByIT.java | 5 --
.../integration/IOTDBGroupByInnerIntervalIT.java | 6 ---
.../iotdb/db/integration/IoTDBAggregationIT.java | 6 ---
.../integration/IoTDBAggregationLargeDataIT.java | 6 ---
.../integration/IoTDBAggregationSmallDataIT.java | 6 ---
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 18 +++----
.../db/integration/IoTDBAutoCreateSchemaIT.java | 6 ---
.../apache/iotdb/db/integration/IoTDBCloseIT.java | 6 ---
.../iotdb/db/integration/IoTDBCompleteIT.java | 6 ---
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 6 +--
.../db/integration/IoTDBDeleteStorageGroupIT.java | 6 ---
.../iotdb/db/integration/IoTDBDeletionIT.java | 6 ---
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 5 --
.../apache/iotdb/db/integration/IoTDBFillIT.java | 6 ---
.../db/integration/IoTDBFloatPrecisionIT.java | 6 ---
.../db/integration/IoTDBFlushQueryMergeTest.java | 5 --
.../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 5 --
.../iotdb/db/integration/IoTDBLargeDataIT.java | 5 --
.../iotdb/db/integration/IoTDBLimitSlimitIT.java | 5 --
.../integration/IoTDBLoadExternalTsfileTest.java | 4 --
.../iotdb/db/integration/IoTDBMergeTest.java | 6 ---
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 6 ---
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 6 ---
.../db/integration/IoTDBMultiStatementsIT.java | 6 ---
.../iotdb/db/integration/IoTDBNumberPathIT.java | 6 ---
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 4 --
.../iotdb/db/integration/IoTDBQuotedPathIT.java | 5 --
.../db/integration/IoTDBSequenceDataQueryIT.java | 5 --
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 5 --
.../iotdb/db/integration/IoTDBSimpleQueryTest.java | 5 --
.../iotdb/db/integration/IoTDBTimeZoneIT.java | 5 --
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 6 ---
.../iotdb/db/integration/IoTDBVersionIT.java | 6 ---
.../apache/iotdb/db/utils/EnvironmentUtils.java | 57 +++++++++++++---------
server/src/test/resources/logback.xml | 2 +-
46 files changed, 96 insertions(+), 227 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index f3a4fce..75e6014 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -1189,6 +1189,10 @@ public class IoTDBConfig {
return hdfsIp.split(",");
}
+ String getRawHDFSIp() {
+ return hdfsIp;
+ }
+
public void setHdfsIp(String[] hdfsIp) {
this.hdfsIp = String.join(",", hdfsIp);
}
@@ -1221,6 +1225,10 @@ public class IoTDBConfig {
return dfsHaNamenodes.split(",");
}
+ String getRawDfsHaNamenodes() {
+ return dfsHaNamenodes;
+ }
+
public void setDfsHaNamenodes(String[] dfsHaNamenodes) {
this.dfsHaNamenodes = String.join(",", dfsHaNamenodes);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
index 056d760..51282e0 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
@@ -81,4 +81,7 @@ public class IoTDBConstant {
public static final int MEMTABLE_NUM_IN_EACH_STORAGE_GROUP = 4;
+ //just for test
+ public static int THRIFT_SERVER_WAIT_TIME_FOR_STOP = 60;//wait for 60 second by default.
+
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 9b684dc..98c6179 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -23,6 +23,8 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
import java.time.ZoneId;
import java.util.Properties;
import org.apache.iotdb.db.conf.directories.DirectoryManager;
@@ -56,6 +58,11 @@ public class IoTDBDescriptor {
if (url != null) {
url = url + File.separatorChar + "conf" + File.separatorChar + IoTDBConfig.CONFIG_NAME;
} else {
+ URL uri = IoTDBConfig.class.getResource("/" + IoTDBConfig.CONFIG_NAME);
+ if (uri != null) {
+ url = uri.getPath();
+ return url;
+ }
logger.warn(
"Cannot find IOTDB_HOME or IOTDB_CONF environment variable when loading "
+ "config file {}, use default configuration",
@@ -273,11 +280,11 @@ public class IoTDBDescriptor {
properties.getProperty("core_site_path", conf.getCoreSitePath()));
conf.setHdfsSitePath(
properties.getProperty("hdfs_site_path", conf.getHdfsSitePath()));
- conf.setHdfsIp(properties.getProperty("hdfs_ip").split(","));
+ conf.setHdfsIp(properties.getProperty("hdfs_ip", conf.getRawHDFSIp()).split(","));
conf.setHdfsPort(properties.getProperty("hdfs_port", conf.getHdfsPort()));
conf.setDfsNameServices(
properties.getProperty("dfs_nameservices", conf.getDfsNameServices()));
- conf.setDfsHaNamenodes(properties.getProperty("dfs_ha_namenodes").split(","));
+ conf.setDfsHaNamenodes(properties.getProperty("dfs_ha_namenodes", conf.getRawDfsHaNamenodes()).split(","));
conf.setDfsHaAutomaticFailoverEnabled(
Boolean.parseBoolean(properties.getProperty("dfs_ha_automatic_failover_enabled",
String.valueOf(conf.isDfsHaAutomaticFailoverEnabled()))));
@@ -296,22 +303,22 @@ public class IoTDBDescriptor {
// At the same time, set TSFileConfig
TSFileDescriptor.getInstance().getConfig()
- .setTSFileStorageFs(properties.getProperty("tsfile_storage_fs"));
+ .setTSFileStorageFs(properties.getProperty("tsfile_storage_fs", conf.getTsFileStorageFs().name()));
TSFileDescriptor.getInstance().getConfig().setKerberosKeytabFilePath(
properties.getProperty("core_site_path", conf.getCoreSitePath()));
TSFileDescriptor.getInstance().getConfig().setKerberosPrincipal(
properties.getProperty("hdfs_site_path", conf.getHdfsSitePath()));
TSFileDescriptor.getInstance().getConfig()
- .setHdfsIp(properties.getProperty("hdfs_ip").split(","));
- TSFileDescriptor.getInstance().getConfig().setHdfsPort(properties.getProperty("hdfs_port"));
+ .setHdfsIp(properties.getProperty("hdfs_ip", conf.getRawHDFSIp()).split(","));
+ TSFileDescriptor.getInstance().getConfig().setHdfsPort(properties.getProperty("hdfs_port", conf.getHdfsPort()));
TSFileDescriptor.getInstance().getConfig()
- .setDfsNameServices(properties.getProperty("dfs_nameservices"));
+ .setDfsNameServices(properties.getProperty("dfs_nameservices", conf.getDfsNameServices()));
TSFileDescriptor.getInstance().getConfig()
- .setDfsHaNamenodes(properties.getProperty("dfs_ha_namenodes").split(","));
+ .setDfsHaNamenodes(properties.getProperty("dfs_ha_namenodes", conf.getRawDfsHaNamenodes()).split(","));
TSFileDescriptor.getInstance().getConfig().setDfsHaAutomaticFailoverEnabled(
- Boolean.parseBoolean(properties.getProperty("dfs_ha_automatic_failover_enabled")));
+ Boolean.parseBoolean(properties.getProperty("dfs_ha_automatic_failover_enabled", String.valueOf(conf.isDfsHaAutomaticFailoverEnabled()))));
TSFileDescriptor.getInstance().getConfig().setDfsClientFailoverProxyProvider(
- properties.getProperty("dfs_client_failover_proxy_provider"));
+ properties.getProperty("dfs_client_failover_proxy_provider", conf.getDfsClientFailoverProxyProvider()));
TSFileDescriptor.getInstance().getConfig().setUseKerberos(Boolean.parseBoolean(
properties.getProperty("hdfs_use_kerberos", String.valueOf(conf.isUseKerberos()))));
TSFileDescriptor.getInstance().getConfig().setKerberosKeytabFilePath(
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 6e95fdf..9ef8082 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
@@ -131,6 +131,7 @@ public class StorageEngine implements IService {
try {
future.get();
} catch (InterruptedException | ExecutionException e) {
+ e.printStackTrace();
throw new StorageEngineFailureException("StorageEngine failed to recover.", e);
}
}
@@ -160,6 +161,7 @@ public class StorageEngine implements IService {
syncCloseAllProcessor();
ttlCheckThread.shutdownNow();
recoveryThreadPool.shutdownNow();
+ this.reset();
try {
ttlCheckThread.awaitTermination(30, TimeUnit.SECONDS);
} catch (InterruptedException e) {
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 e8ee449..6786577 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
@@ -24,6 +24,7 @@ import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFF
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -632,7 +633,12 @@ public class StorageGroupProcessor {
try {
FileUtils.deleteDirectory(storageGroupFolder);
} catch (IOException e) {
- logger.error("Delete TsFiles failed", e);
+ logger.warn("Delete TsFiles failed: {}", e.getMessage());
+ try {
+ Files.delete(storageGroupFolder.toPath());
+ } catch (IOException e1) {
+ logger.error("Delete TsFiles folder failed", e1);
+ }
}
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index 8411045..01325cf 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.file.Files;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -368,7 +369,11 @@ public class TsFileResource {
* clean the close flag when the file is successfully closed.
*/
public void cleanCloseFlag() {
- new File(file.getAbsoluteFile() + CLOSING_SUFFIX).delete();
+ try {
+ Files.delete(new File(file.getAbsoluteFile() + CLOSING_SUFFIX).toPath());
+ } catch (IOException e) {
+ logger.error("Cannot delete the file.", new File(file.getAbsoluteFile() + CLOSING_SUFFIX));
+ }
}
public boolean isCloseFlagSet() {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MGraph.java b/server/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
index 6793322..299e28c 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
@@ -178,7 +178,7 @@ public class MGraph implements Serializable {
}
/**
- * Check whether the input path is storage group for current Metadata Tree or not.
+ * Check whether the input path is a storage group for current Metadata Tree or not.
*
* @param path Format: root.node.(node)*
* @apiNote :for cluster
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
index 2c5e2ef..e469387 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
@@ -245,7 +245,7 @@ public class MTree implements Serializable {
* Check whether the input path is storage group or not
*
* @param path input path
- * @return if it is storage group, return true. Else return false
+ * @return if the whole path is a storage group, return true. Else return false
* @apiNote :for cluster
*/
boolean checkStorageGroup(String path) {
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 16b8d2d..35bf0c2 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
@@ -83,9 +83,9 @@ public class IoTDB implements IoTDBMBean {
setUncaughtExceptionHandler();
initMManager();
+ registerManager.register(JMXService.getInstance());
registerManager.register(StorageEngine.getInstance());
registerManager.register(MultiFileLogNodeManager.getInstance());
- registerManager.register(JMXService.getInstance());
registerManager.register(JDBCService.getInstance());
registerManager.register(Monitor.getInstance());
registerManager.register(StatMonitor.getInstance());
diff --git a/server/src/main/java/org/apache/iotdb/db/service/JDBCService.java b/server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
index cd69573..9ca30aa 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
@@ -18,6 +18,8 @@
*/
package org.apache.iotdb.db.service;
+import static org.apache.iotdb.db.conf.IoTDBConstant.THRIFT_SERVER_WAIT_TIME_FOR_STOP;
+
import java.net.InetSocketAddress;
import java.util.concurrent.CountDownLatch;
import org.apache.iotdb.db.concurrent.IoTDBThreadPoolFactory;
@@ -33,6 +35,7 @@ import org.apache.thrift.protocol.TCompactProtocol;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
+import org.apache.thrift.server.TThreadPoolServer.Args;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
@@ -207,8 +210,8 @@ public class JDBCService implements JDBCServiceMBean, IService {
IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
serverTransport = new TServerSocket(new InetSocketAddress(config.getRpcAddress(),
config.getRpcPort()));
- poolArgs = new TThreadPoolServer.Args(serverTransport).maxWorkerThreads(IoTDBDescriptor.
- getInstance().getConfig().getRpcMaxConcurrentClientNum()).minWorkerThreads(1);
+ poolArgs = new Args(serverTransport).maxWorkerThreads(IoTDBDescriptor.
+ getInstance().getConfig().getRpcMaxConcurrentClientNum()).minWorkerThreads(1).stopTimeoutVal(THRIFT_SERVER_WAIT_TIME_FOR_STOP);
poolArgs.executorService = IoTDBThreadPoolFactory.createThriftRpcClientThreadPool(poolArgs,
ThreadName.JDBC_CLIENT.getName());
poolArgs.processor(processor);
diff --git a/server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java b/server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
index 942246e..de57204 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.service;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.iotdb.db.exception.StartupException;
import org.slf4j.Logger;
@@ -51,6 +52,8 @@ public class RegisterManager {
* stop all service and clear iService list.
*/
public void deregisterAll() {
+ //we stop JMXServer at last
+ Collections.reverse(iServices);
for (IService service : iServices) {
try {
service.stop();
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
index 84ed123..1c7cd7f 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -34,7 +33,6 @@ import static org.junit.Assert.fail;
public class IOTDBGroupByIT {
- private static IoTDB daemon;
private static String[] dataSet1 = new String[]{
"SET STORAGE GROUP TO root.ln.wf01.wt01",
@@ -103,8 +101,6 @@ public class IOTDBGroupByIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -112,7 +108,6 @@ public class IOTDBGroupByIT {
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByInnerIntervalIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByInnerIntervalIT.java
index af67c8c..a2abf85 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByInnerIntervalIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByInnerIntervalIT.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.IoTDBSQLException;
@@ -33,8 +32,6 @@ import static org.junit.Assert.*;
public class IOTDBGroupByInnerIntervalIT {
- private static IoTDB daemon;
-
private static String[] dataSet1 = new String[]{
"SET STORAGE GROUP TO root.ln.wf01.wt01",
"CREATE TIMESERIES root.ln.wf01.wt01.status WITH DATATYPE=BOOLEAN, ENCODING=PLAIN",
@@ -101,8 +98,6 @@ public class IOTDBGroupByInnerIntervalIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -110,7 +105,6 @@ public class IOTDBGroupByInnerIntervalIT {
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
index 68cdd7b..c0ba40e 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -35,8 +34,6 @@ import static org.junit.Assert.fail;
public class IoTDBAggregationIT {
- private static IoTDB daemon;
-
private static String[] creationSqls = new String[]{
"SET STORAGE GROUP TO root.vehicle.d0",
"SET STORAGE GROUP TO root.vehicle.d1",
@@ -78,8 +75,6 @@ public class IoTDBAggregationIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -87,7 +82,6 @@ public class IoTDBAggregationIT {
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
index e96dcbc..064c9ba 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
@@ -35,7 +35,6 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -111,19 +110,14 @@ public class IoTDBAggregationLargeDataIT {
"insert into root.vehicle.d0(timestamp,s4) values(100, true)",
};
- private IoTDB daemon;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
index 959af04..85bac77 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
@@ -35,7 +35,6 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -119,13 +118,9 @@ public class IoTDBAggregationSmallDataIT {
"insert into root.vehicle.d0(timestamp,s4) values(100, true)"
};
- private IoTDB daemon;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
//Thread.sleep(5000);
@@ -134,7 +129,6 @@ public class IoTDBAggregationSmallDataIT {
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
index 3bc5646..1de876f 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.db.integration;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.sql.Connection;
@@ -28,7 +27,6 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -45,7 +43,6 @@ import org.slf4j.LoggerFactory;
public class IoTDBAuthorizationIT {
private static Logger logger = LoggerFactory.getLogger(IoTDBAuthorizationIT.class);
- private IoTDB daemon;
public static void main(String[] args) throws Exception {
for (int i = 0; i < 10; i++) {
@@ -59,14 +56,11 @@ public class IoTDBAuthorizationIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
@@ -617,8 +611,8 @@ public class IoTDBAuthorizationIT {
"temppw");
Statement userStmt = userCon.createStatement();
- int insertCnt = 2000000;
- int batchSize = 5000;
+ int insertCnt = 20000;
+ int batchSize = 500;
long time;
time = System.currentTimeMillis();
@@ -631,8 +625,8 @@ public class IoTDBAuthorizationIT {
userStmt.executeBatch();
userStmt.clearBatch();
}
- if (logger.isDebugEnabled()) {
- logger.debug("User inserted {} data points used {} ms with {} privileges.", insertCnt,
+ if (logger.isInfoEnabled()) {
+ logger.info("User inserted {} data points used {} ms with {} privileges.", insertCnt,
System.currentTimeMillis() - time, privilegeCnt);
}
@@ -645,8 +639,8 @@ public class IoTDBAuthorizationIT {
adminStmt.executeBatch();
adminStmt.clearBatch();
}
- if (logger.isDebugEnabled()) {
- logger.debug("User inserted {} data points used {} ms with {} privileges.", insertCnt,
+ if (logger.isInfoEnabled()) {
+ logger.info("User inserted {} data points used {} ms with {} privileges.", insertCnt,
System.currentTimeMillis() - time, privilegeCnt);
}
adminCon.close();
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAutoCreateSchemaIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAutoCreateSchemaIT.java
index 4b7a20e..84a8348 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAutoCreateSchemaIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAutoCreateSchemaIT.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.integration;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -42,22 +41,17 @@ import java.sql.Statement;
*/
public class IoTDBAutoCreateSchemaIT {
- private static IoTDB daemon;
-
private static IoTDBConfig conf = IoTDBDescriptor.getInstance().getConfig();
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
conf.setAutoCreateSchemaEnabled(true);
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
conf.setAutoCreateSchemaEnabled(false);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCloseIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCloseIT.java
index d700432..4215421 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCloseIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCloseIT.java
@@ -26,7 +26,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
@@ -42,8 +41,6 @@ import org.junit.Test;
*/
public class IoTDBCloseIT {
- private static IoTDB daemon;
-
private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig();
private static int maxNumberOfPointsInPage;
private static int pageSizeInByte;
@@ -66,8 +63,6 @@ public class IoTDBCloseIT {
tsFileConfig.setGroupSizeInByte(1024 * 1000);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 1000);
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -75,7 +70,6 @@ public class IoTDBCloseIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
// recovery value
tsFileConfig.setMaxNumberOfPointsInPage(maxNumberOfPointsInPage);
tsFileConfig.setPageSizeInByte(pageSizeInByte);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
index 674ed4f..bb8459e 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
@@ -25,7 +25,6 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -39,19 +38,14 @@ import org.junit.Test;
*/
public class IoTDBCompleteIT {
- private IoTDB daemon;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
index ed0422b..b381ff1 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.AfterClass;
@@ -38,7 +37,6 @@ import static org.junit.Assert.fail;
*/
public class IoTDBDaemonIT {
- private static IoTDB daemon;
private static String[] sqls = new String[]{
"SET STORAGE GROUP TO root.vehicle.d0", "SET STORAGE GROUP TO root.vehicle.d1",
@@ -102,8 +100,6 @@ public class IoTDBDaemonIT {
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -112,7 +108,7 @@ public class IoTDBDaemonIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
+
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java
index cdc6736..72e5ef3 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.IoTDBSQLException;
@@ -36,19 +35,14 @@ import static org.junit.Assert.assertTrue;
public class IoTDBDeleteStorageGroupIT {
- private static IoTDB daemon;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
index 2dc2a81..6d54a9d 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
@@ -29,7 +29,6 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Locale;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -38,7 +37,6 @@ import org.junit.Ignore;
import org.junit.Test;
public class IoTDBDeletionIT {
- private static IoTDB daemon;
private static String[] creationSqls = new String[]{
"SET STORAGE GROUP TO root.vehicle.d0", "SET STORAGE GROUP TO root.vehicle.d1",
@@ -58,8 +56,6 @@ public class IoTDBDeletionIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareSeries();
@@ -67,8 +63,6 @@ public class IoTDBDeletionIT {
@After
public void tearDown() throws Exception {
- daemon.stop();
-
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
index 5f2bf2f..e5b8f94 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
@@ -31,7 +31,6 @@ import java.sql.Statement;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.query.timegenerator.EngineTimeGenerator;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
@@ -53,7 +52,6 @@ import org.junit.Test;
*/
public class IoTDBEngineTimeGeneratorIT {
- private static IoTDB daemon;
private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig();
private static int maxNumberOfPointsInPage;
private static int pageSizeInByte;
@@ -78,8 +76,6 @@ public class IoTDBEngineTimeGeneratorIT {
tsFileConfig.setGroupSizeInByte(1024 * 1024 * 100);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 1024 * 100);
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -88,7 +84,6 @@ public class IoTDBEngineTimeGeneratorIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
// recovery value
tsFileConfig.setMaxNumberOfPointsInPage(maxNumberOfPointsInPage);
tsFileConfig.setPageSizeInByte(pageSizeInByte);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
index 36aaef1..01cb99c 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
@@ -25,7 +25,6 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -35,8 +34,6 @@ import org.junit.Test;
public class IoTDBFillIT {
- private static IoTDB daemon;
-
private static String[] dataSet1 = new String[]{
"SET STORAGE GROUP TO root.ln.wf01.wt01",
"CREATE TIMESERIES root.ln.wf01.wt01.status WITH DATATYPE=BOOLEAN, ENCODING=PLAIN",
@@ -106,8 +103,6 @@ public class IoTDBFillIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -115,7 +110,6 @@ public class IoTDBFillIT {
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
index 941f3fa..41ad847 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
@@ -31,7 +31,6 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.db.utils.MathUtils;
import org.apache.iotdb.jdbc.Config;
@@ -46,8 +45,6 @@ import org.junit.Test;
*/
public class IoTDBFloatPrecisionIT {
- private static IoTDB daemon;
-
private static final String CREATE_TEMPLATE_SQL = "CREATE TIMESERIES root.vehicle.%s.%s WITH DATATYPE=%s, ENCODING=%s, MAX_POINT_NUMBER=%d";
private static final String INSERT_TEMPLATE_SQL = "insert into root.vehicle.%s(timestamp,%s) values(%d,%s)";
private static List<String> sqls = new ArrayList<>();
@@ -61,15 +58,12 @@ public class IoTDBFloatPrecisionIT {
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
initCreateSQLStatement();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
}
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
index c3c9513..a7a7538 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
@@ -26,7 +26,6 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.Statement;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.AfterClass;
@@ -36,7 +35,6 @@ import org.junit.Test;
public class IoTDBFlushQueryMergeTest {
- private static IoTDB daemon;
private static String[] sqls = new String[]{
"SET STORAGE GROUP TO root.vehicle.d0",
"CREATE TIMESERIES root.vehicle.d0.s0 WITH DATATYPE=INT32, ENCODING=RLE",
@@ -60,15 +58,12 @@ public class IoTDBFlushQueryMergeTest {
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
}
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupbyDeviceIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupbyDeviceIT.java
index 5af4fbe..39ff574 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupbyDeviceIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupbyDeviceIT.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.AfterClass;
@@ -32,7 +31,6 @@ import static org.junit.Assert.fail;
public class IoTDBGroupbyDeviceIT {
- private static IoTDB daemon;
private static String[] sqls = new String[]{
"SET STORAGE GROUP TO root.vehicle",
@@ -101,8 +99,6 @@ public class IoTDBGroupbyDeviceIT {
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -111,7 +107,6 @@ public class IoTDBGroupbyDeviceIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
index b977019..ff7b00b 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
@@ -28,7 +28,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
@@ -44,7 +43,6 @@ import org.junit.Test;
*/
public class IoTDBLargeDataIT {
- private static IoTDB daemon;
private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig();
private static int maxNumberOfPointsInPage;
private static int pageSizeInByte;
@@ -67,8 +65,6 @@ public class IoTDBLargeDataIT {
tsFileConfig.setGroupSizeInByte(1024 * 1000);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 1000);
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -76,7 +72,6 @@ public class IoTDBLargeDataIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
// recovery value
tsFileConfig.setMaxNumberOfPointsInPage(maxNumberOfPointsInPage);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
index c5f1d7a..9cbbfa0 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
@@ -42,8 +42,6 @@ import org.junit.Test;
*/
public class IoTDBLimitSlimitIT {
- private static IoTDB daemon;
-
private static String[] insertSqls = new String[]{"SET STORAGE GROUP TO root.vehicle",
"CREATE TIMESERIES root.vehicle.d0.s0 WITH DATATYPE=INT32, ENCODING=RLE",
@@ -88,14 +86,11 @@ public class IoTDBLimitSlimitIT {
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
}
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java
index d340145..bf76bed 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java
@@ -41,7 +41,6 @@ import static org.junit.Assert.*;
public class IoTDBLoadExternalTsfileTest {
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBLoadExternalTsfileTest.class);
- private static IoTDB daemon;
private static String[] insertSequenceSqls = new String[]{
"SET STORAGE GROUP TO root.vehicle",
"SET STORAGE GROUP TO root.test",
@@ -115,8 +114,6 @@ public class IoTDBLoadExternalTsfileTest {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData(insertSequenceSqls);
@@ -124,7 +121,6 @@ public class IoTDBLoadExternalTsfileTest {
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java
index 6284842..cac2173 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java
@@ -26,7 +26,6 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -35,21 +34,16 @@ import org.junit.Test;
public class IoTDBMergeTest {
- private static IoTDB daemon;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
index 9a15850..d851481 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
@@ -38,8 +38,6 @@ import static org.junit.Assert.fail;
*/
public class IoTDBMetadataFetchIT {
- private static IoTDB daemon;
-
private DatabaseMetaData databaseMetaData;
private static void insertSQL() throws ClassNotFoundException, SQLException {
@@ -65,9 +63,6 @@ public class IoTDBMetadataFetchIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
-
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertSQL();
@@ -75,7 +70,6 @@ public class IoTDBMetadataFetchIT {
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
index 686816f..039bdec 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.db.integration;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
@@ -39,8 +38,6 @@ import static org.junit.Assert.*;
*/
public class IoTDBMultiSeriesIT {
- private static IoTDB daemon;
-
private static boolean testFlag = Constant.testFlag;
private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig();
private static int maxNumberOfPointsInPage;
@@ -64,8 +61,6 @@ public class IoTDBMultiSeriesIT {
tsFileConfig.setGroupSizeInByte(1024 * 1000);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 1000);
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -73,7 +68,6 @@ public class IoTDBMultiSeriesIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
// recovery value
tsFileConfig.setMaxNumberOfPointsInPage(maxNumberOfPointsInPage);
tsFileConfig.setPageSizeInByte(pageSizeInByte);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiStatementsIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiStatementsIT.java
index 9c35a36..25667d5 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiStatementsIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiStatementsIT.java
@@ -26,7 +26,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
@@ -42,8 +41,6 @@ import org.junit.Test;
*/
public class IoTDBMultiStatementsIT {
- private static IoTDB daemon;
-
private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig();
private static int maxNumberOfPointsInPage;
private static int pageSizeInByte;
@@ -66,8 +63,6 @@ public class IoTDBMultiStatementsIT {
tsFileConfig.setGroupSizeInByte(1024 * 1000);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 1000);
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -75,7 +70,6 @@ public class IoTDBMultiStatementsIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
// recovery value
tsFileConfig.setMaxNumberOfPointsInPage(maxNumberOfPointsInPage);
tsFileConfig.setPageSizeInByte(pageSizeInByte);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBNumberPathIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBNumberPathIT.java
index aff76c8..755b9ae 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBNumberPathIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBNumberPathIT.java
@@ -25,7 +25,6 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -39,19 +38,14 @@ import org.junit.Test;
*/
public class IoTDBNumberPathIT {
- private IoTDB daemon;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryDemoIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryDemoIT.java
index ebba549..77191a6 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryDemoIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryDemoIT.java
@@ -32,7 +32,6 @@ import static org.junit.Assert.fail;
public class IoTDBQueryDemoIT {
- private static IoTDB daemon;
private static String[] sqls = new String[]{
"set storage group to root.ln",
"create timeseries root.ln.wf01.wt01.status with datatype=BOOLEAN,encoding=PLAIN",
@@ -107,8 +106,6 @@ public class IoTDBQueryDemoIT {
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
importData();
@@ -116,7 +113,6 @@ public class IoTDBQueryDemoIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQuotedPathIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQuotedPathIT.java
index 6e86112..d3199a1 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQuotedPathIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQuotedPathIT.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -33,20 +32,16 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class IoTDBQuotedPathIT {
- private IoTDB daemon;
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
index 856f924..5399751 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
@@ -36,7 +36,6 @@ import org.apache.iotdb.db.qp.physical.crud.QueryPlan;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.control.QueryResourceManager;
import org.apache.iotdb.db.query.executor.EngineQueryRouter;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
@@ -60,7 +59,6 @@ import org.junit.Test;
*/
public class IoTDBSequenceDataQueryIT {
- private static IoTDB daemon;
private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig();
private static int maxNumberOfPointsInPage;
private static int pageSizeInByte;
@@ -85,8 +83,6 @@ public class IoTDBSequenceDataQueryIT {
tsFileConfig.setGroupSizeInByte(1024 * 1024 * 100);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 1024 * 100);
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -94,7 +90,6 @@ public class IoTDBSequenceDataQueryIT {
@AfterClass
public static void tearDown() throws Exception {
- daemon.stop();
// recovery value
tsFileConfig.setMaxNumberOfPointsInPage(maxNumberOfPointsInPage);
tsFileConfig.setPageSizeInByte(pageSizeInByte);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
index adf68b8..3b7d883 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
@@ -62,8 +62,6 @@ import org.junit.Test;
*/
public class IoTDBSeriesReaderIT {
- private static IoTDB daemon;
-
private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig();
private static int pageSizeInByte;
private static int groupSizeInByte;
@@ -85,8 +83,6 @@ public class IoTDBSeriesReaderIT {
tsFileConfig.setGroupSizeInByte(1024 * 1024 * 150);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 16);
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
insertData();
@@ -98,7 +94,6 @@ public class IoTDBSeriesReaderIT {
@AfterClass
public static void tearDown() throws Exception {
connection.close();
- daemon.stop();
// recovery value
tsFileConfig.setMaxNumberOfPointsInPage(1024 * 1024 * 150);
tsFileConfig.setPageSizeInByte(pageSizeInByte);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSimpleQueryTest.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSimpleQueryTest.java
index 200c48d..d50e785 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSimpleQueryTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSimpleQueryTest.java
@@ -23,7 +23,6 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -31,18 +30,14 @@ import org.junit.Before;
import org.junit.Test;
public class IoTDBSimpleQueryTest {
- private IoTDB deamon;
@Before
public void setUp() throws Exception {
- deamon = IoTDB.getInstance();
- deamon.active();
EnvironmentUtils.envSetUp();
}
@After
public void tearDown() throws Exception {
- deamon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
index 2b8a274..15dfeca 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
@@ -25,7 +25,6 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.IoTDBConnection;
@@ -48,20 +47,16 @@ public class IoTDBTimeZoneIT {
"1514779203000,8", "1514782804000,5", "1514782805000,7", "1514782806000,9",
"1514782807000,10",
"1514782808000,11", "1514782809000,12", "1514782810000,13", "1514789200000,6",};
- private IoTDB daemon;
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
createTimeseries();
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
index 766f267..12bcae1 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
@@ -28,7 +28,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.IoTDBConnection;
@@ -39,20 +38,15 @@ import org.junit.Test;
public class IoTDBTtlIT {
- private IoTDB daemon;
-
@Before
public void setUp() throws Exception {
Class.forName(Config.JDBC_DRIVER_NAME);
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
}
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
index 11c5c5b..36b337c 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
@@ -23,7 +23,6 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.iotdb.db.engine.version.SimpleFileVersionController;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.After;
@@ -32,18 +31,13 @@ import org.junit.Test;
public class IoTDBVersionIT {
- private IoTDB deamon;
-
@Before
public void setUp() throws Exception {
- deamon = IoTDB.getInstance();
- deamon.active();
EnvironmentUtils.envSetUp();
}
@After
public void tearDown() throws Exception {
- deamon.stop();
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
index 9d57edf..f9ea0f0 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
@@ -18,8 +18,11 @@
*/
package org.apache.iotdb.db.utils;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.auth.AuthException;
import org.apache.iotdb.db.auth.authorizer.IAuthorizer;
@@ -41,6 +44,7 @@ import org.apache.iotdb.db.monitor.StatMonitor;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.control.FileReaderManager;
import org.apache.iotdb.db.query.control.QueryResourceManager;
+import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.MetricsService;
import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager;
import org.junit.Assert;
@@ -68,6 +72,8 @@ public class EnvironmentUtils {
private static long oldGroupSizeInByte = config.getMemtableSizeThreshold();
+ private static IoTDB daemon;
+
public static void cleanEnv() throws IOException, StorageEngineException {
QueryResourceManager.getInstance().endQuery(TEST_QUERY_JOB_ID);
@@ -78,14 +84,21 @@ public class EnvironmentUtils {
// clean storage group manager
if (!StorageEngine.getInstance().deleteAll()) {
logger.error("Can't close the storage group manager in EnvironmentUtils");
- Assert.fail();
+ fail();
+ }
+
+
+ if (daemon != null) {
+ daemon.stop();
+ daemon = null;
}
- StorageEngine.getInstance().reset();
+
+ //StorageEngine.getInstance().reset();
IoTDBDescriptor.getInstance().getConfig().setReadOnly(false);
- StatMonitor.getInstance().close();
+ //StatMonitor.getInstance().close();
// clean wal
- MultiFileLogNodeManager.getInstance().stop();
+ //MultiFileLogNodeManager.getInstance().stop();
// clean cache
if (config.isMetaDataCacheEnable()) {
TsFileMetaDataCache.getInstance().clear();
@@ -94,8 +107,8 @@ public class EnvironmentUtils {
// close metadata
MManager.getInstance().clear();
- MergeManager.getINSTANCE().stop();
- MetricsService.getInstance().stop();
+ //MergeManager.getINSTANCE().stop();
+ //MetricsService.getInstance().stop();
// delete all directory
cleanAllDir();
@@ -142,28 +155,22 @@ public class EnvironmentUtils {
* disable memory control</br> this function should be called before all code in the setup
*/
public static void envSetUp() throws StartupException {
+ if (daemon == null) {
+ daemon = new IoTDB();
+ try {
+ daemon.active();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
IoTDBDescriptor.getInstance().getConfig().setEnableParameterAdapter(false);
- MManager.getInstance().init();
+ //MManager.getInstance().init();
IoTDBConfigDynamicAdapter.getInstance().setInitialized(true);
createAllDir();
// disable the system monitor
config.setEnableStatMonitor(false);
- IAuthorizer authorizer;
- try {
- authorizer = LocalFileAuthorizer.getInstance();
- } catch (AuthException e) {
- throw new StartupException(e);
- }
- try {
- authorizer.reset();
- } catch (AuthException e) {
- throw new StartupException(e);
- }
- StorageEngine.getInstance().reset();
- MultiFileLogNodeManager.getInstance().start();
- FlushManager.getInstance().start();
- MergeManager.getINSTANCE().start();
TEST_QUERY_JOB_ID = QueryResourceManager.getInstance().assignQueryId(true);
TEST_QUERY_CONTEXT = new QueryContext(TEST_QUERY_JOB_ID);
}
@@ -188,6 +195,12 @@ public class EnvironmentUtils {
for (String dataDir : config.getDataDirs()) {
createDir(dataDir);
}
+ //create user and roles folder
+ try {
+ LocalFileAuthorizer.getInstance().reset();
+ } catch (AuthException e) {
+ e.printStackTrace();
+ }
}
private static void createDir(String dir) {
diff --git a/server/src/test/resources/logback.xml b/server/src/test/resources/logback.xml
index efee6ca..0eaf9fe 100644
--- a/server/src/test/resources/logback.xml
+++ b/server/src/test/resources/logback.xml
@@ -30,7 +30,7 @@
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>ERROR</level>
+ <level>INFO</level>
</filter>
</appender>
<!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtil" level="debug" />-->