You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ge...@apache.org on 2020/02/11 02:20:27 UTC
[incubator-iotdb] 01/01: remove usused daemon.
This is an automated email from the ASF dual-hosted git repository.
geniuspig pushed a commit to branch redundant_daemon
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 2637ab36c0eec4a3068249777e15bfd0c8c12883
Author: zhutianci <zh...@gmail.com>
AuthorDate: Mon Feb 10 14:23:59 2020 +0800
remove usused daemon.
---
.../apache/iotdb/db/integration/IoTDBDisableAlignIT.java | 7 +------
.../org/apache/iotdb/db/integration/IoTDBQueryDemoIT.java | 14 +++++++++-----
.../org/apache/iotdb/db/integration/IoTDBRecoverIT.java | 14 ++++----------
.../java/org/apache/iotdb/db/utils/EnvironmentUtils.java | 12 ++++++++++++
4 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java
index dc85e7a..da3764f 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDisableAlignIT.java
@@ -31,8 +31,7 @@ import java.sql.*;
import static org.junit.Assert.fail;
public class IoTDBDisableAlignIT {
-
- private static IoTDB daemon;
+
private static String[] sqls = new String[]{
"SET STORAGE GROUP TO root.vehicle",
@@ -101,17 +100,13 @@ public class IoTDBDisableAlignIT {
@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/IoTDBQueryDemoIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryDemoIT.java
index ee758a7..3b06634 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
@@ -18,7 +18,15 @@
*/
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.service.IoTDB;
+import static org.junit.Assert.fail;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.AfterClass;
@@ -26,10 +34,6 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.sql.*;
-
-import static org.junit.Assert.fail;
-
public class IoTDBQueryDemoIT {
private static String[] sqls = new String[]{
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
index 301cf62..2ec2bdd 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
@@ -45,7 +45,6 @@ public class IoTDBRecoverIT {
private static final String TIMESTAMP_STR = "Time";
private static final String TEMPERATURE_STR = "root.ln.wf01.wt01.temperature";
- private static IoTDB daemon;
private static String[] creationSqls = new String[]{
"SET STORAGE GROUP TO root.vehicle.d0",
"SET STORAGE GROUP TO root.vehicle.d1",
@@ -82,8 +81,6 @@ public class IoTDBRecoverIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- daemon.active();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -91,7 +88,6 @@ public class IoTDBRecoverIT {
@After
public void tearDown() throws Exception {
- daemon.stop();
EnvironmentUtils.cleanEnv();
}
@@ -156,15 +152,14 @@ public class IoTDBRecoverIT {
}
// we want to recover
- daemon.stop();
+ EnvironmentUtils.stopDaemon();
// wait for close
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
- daemon.active();
- EnvironmentUtils.envSetUp();
+ EnvironmentUtils.activeDaemon();
// count test
retArray = new String[]{
@@ -211,15 +206,14 @@ public class IoTDBRecoverIT {
}
// we want to recover
- daemon.stop();
+ EnvironmentUtils.stopDaemon();
// wait for close
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
- daemon.active();
- EnvironmentUtils.envSetUp();
+ EnvironmentUtils.activeDaemon();
// maxminValueTest
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 5c3770b..d13326b 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
@@ -160,6 +160,18 @@ public class EnvironmentUtils {
TEST_QUERY_CONTEXT = new QueryContext(TEST_QUERY_JOB_ID);
}
+ public static void stopDaemon() {
+ if(daemon != null) {
+ daemon.stop();
+ }
+ }
+
+ public static void activeDaemon() {
+ if(daemon != null) {
+ daemon.active();
+ }
+ }
+
private static void createAllDir() {
// create sequential files
for (String path : directoryManager.getAllSequenceFileFolders()) {