[incubator-iotdb] branch fix_closed_channel_issue updated: modify IoTDBFlushQueryMergeTest

[caogaofei]

This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch fix_closed_channel_issue
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/fix_closed_channel_issue by 
this push:
     new 004f370  modify IoTDBFlushQueryMergeTest
004f370 is described below

commit 004f37058b3a1207a143cc79e6f374a5ddf284cb
Author: CGF <cgf1...@foxmail.com>
AuthorDate: Sat Mar 23 17:12:21 2019 +0800

    modify IoTDBFlushQueryMergeTest
---
 .../apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
 
b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
index c00391c..b018e44 100644
--- 
a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
+++ 
b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
@@ -38,7 +38,6 @@ public class IoTDBFlushQueryMergeTest {
 
   private static IoTDB daemon;
   private static String[] sqls = new String[]{
-
       "SET STORAGE GROUP TO root.vehicle.d0", "SET STORAGE GROUP TO 
root.vehicle.d1",
 
       "CREATE TIMESERIES root.vehicle.d0.s0 WITH DATATYPE=INT32, ENCODING=RLE",
@@ -62,6 +61,7 @@ public class IoTDBFlushQueryMergeTest {
   };
 
   private static IoTDBConfig iotDBConfig = 
IoTDBDescriptor.getInstance().getConfig();
+  private static long overflowFileSizeThreshold;
 
   @BeforeClass
   public static void setUp() throws Exception {
@@ -70,15 +70,15 @@ public class IoTDBFlushQueryMergeTest {
     daemon = IoTDB.getInstance();
     daemon.active();
     EnvironmentUtils.envSetUp();
+    overflowFileSizeThreshold = iotDBConfig.getOverflowFileSizeThreshold();
     iotDBConfig.setOverflowFileSizeThreshold(0);
-
     insertData();
-
   }
 
   @AfterClass
   public static void tearDown() throws Exception {
     daemon.stop();
+    iotDBConfig.setOverflowFileSizeThreshold(overflowFileSizeThreshold);
     EnvironmentUtils.cleanEnv();
   }
 
@@ -117,10 +117,6 @@ public class IoTDBFlushQueryMergeTest {
       ResultSet resultSet = statement.getResultSet();
       int cnt = 0;
       while (resultSet.next()) {
-        String ans = resultSet.getString(TIMESTAMP_STR) + "," + 
resultSet.getString(d0s0) + ","
-            + resultSet.getString(d0s1) + "," + resultSet.getString(d0s2) + 
"," + resultSet
-            .getString(d0s3)
-            + "," + resultSet.getString(d1s0);
         cnt++;
       }
       statement.close();