[incubator-iotdb] branch fix_incorrect_version_file_position updated: add merge in test

[jiangtian]

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

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


The following commit(s) were added to 
refs/heads/fix_incorrect_version_file_position by this push:
     new 9e04c0e  add merge in test
9e04c0e is described below

commit 9e04c0e8389014f4b09a36bc89a13f961fd488dd
Author: 江天 <jt2594...@163.com>
AuthorDate: Tue Apr 9 23:20:29 2019 +0800

    add merge in test
---
 .../test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git 
a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java 
b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
index 16cdd98..ba42cd0 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
@@ -18,20 +18,15 @@
  */
 package org.apache.iotdb.db.integration;
 
-import static org.apache.iotdb.db.integration.Constant.TIMESTAMP_STR;
-
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.ResultSet;
 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.apache.iotdb.jdbc.IoTDBConnection;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -75,13 +70,12 @@ public class IoTDBVersionIT {
               .format("INSERT INTO root.versionTest1(timestamp, s0) VALUES 
(%d, %d)", i*100+j, j));
         }
         statement.execute("FLUSH");
-      }
-      for (int i = 0; i < 3 * SimpleFileVersionController.getSaveInterval(); i 
++) {
         for (int j = 1; j <= 100; j ++) {
           statement.execute(String
               .format("INSERT INTO root.versionTest2(timestamp, s0) VALUES 
(%d, %d)", i*100+j, j));
         }
         statement.execute("FLUSH");
+        statement.execute("MERGE");
       }
 
       statement.close();