change

src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java

 package com.taosdata.jdbc;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -9,84 +10,107 @@ import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
 
-public class ImportTest extends BaseTest {
-    Connection connection = null;
-    Statement statement = null;
+public class ImportTest {
+    Connection connection;
     String dbName = "test";
     String tName = "t0";
-    String host = "localhost";
+    String host = "127.0.0.1";
+    private static long ts;
 
     @Before
-    public void createDatabase() throws SQLException {
+    public void createDatabase() {
         try {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+            connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+            Statement stmt = connection.createStatement();
+            stmt.executeUpdate("drop database if exists " + dbName);
+            stmt.executeUpdate("create database if not exists " + dbName);
+            stmt.executeUpdate("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
+            ts = System.currentTimeMillis();
+            stmt.close();
         } catch (ClassNotFoundException e) {
             return;
+        } catch (SQLException e) {
+            e.printStackTrace();
         }
-        Properties properties = new Properties();
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
-
-        statement = connection.createStatement();
-        statement.executeUpdate("drop database if exists " + dbName);
-        statement.executeUpdate("create database if not exists " + dbName);
-        statement.executeUpdate("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
 
     }
 
     @Test
-    public void insertData() throws Exception {
-        long ts = 1496732686000l;
-
-        for (int i = 0; i < 50; i++) {
-            ts++;
-            int row = statement.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")");
-            System.out.println("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")\t" + row);
-            assertEquals(1, row);
+    public void case001_insertData() throws Exception {
+        try (Statement stmt = connection.createStatement()) {
+            for (int i = 0; i < 50; i++) {
+                ts++;
+                int row = stmt.executeUpdate("import into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")");
+                System.out.println("import into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")\t" + row);
+                assertEquals(1, row);
+            }
         }
     }
 
     @Test
-    public void selectData() throws Exception {
-        insertData();
-        String sql = "select * from test.t0";
-        ResultSet resSet = statement.executeQuery(sql);
+    public void case002_checkSum() {
+        Assert.assertEquals(50, select());
+    }
 
-        while (resSet.next()) {
-            for (int i = 1; i <= resSet.getMetaData().getColumnCount(); i++) {
-                System.out.printf(i + ": " + resSet.getString(i) + "\t");
+    private int select() {
+        int count = 0;
+        try (Statement stmt = connection.createStatement()) {
+
+            String sql = "select * from " + dbName + "." + tName;
+            ResultSet rs = stmt.executeQuery(sql);
+            while (rs.next()) {
+                for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+                    System.out.printf(i + ": " + rs.getString(i) + "\t");
+                }
+                count++;
             }
+            rs.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
         }
-        resSet.close();
+        return count;
     }
 
     @Test
-    public void importData() throws Exception {
+    public void case003_importData() {
         // 避免时间重复
-        long ts = 1496732686000l;
-
-        StringBuilder sqlBuilder = new StringBuilder("insert into ").append(dbName).append(".").append(tName).append(" values ");
-
-        for (int i = 0; i < 50; i++) {
-            int a = i / 5;
-            long t = ts + a;
-            sqlBuilder.append("(").append(t).append(",").append((100 + i)).append(",").append(i).append(") ");
+        try (Statement stmt = connection.createStatement()) {
+            StringBuilder sqlBuilder = new StringBuilder("import into ").append(dbName).append(".").append(tName).append(" values ");
+            for (int i = 0; i < 50; i++) {
+                int a = i / 5;
+                long t = ts + a;
+                sqlBuilder.append("(").append(t).append(",").append((100 + i)).append(",").append(i).append(") ");
+            }
+            System.out.println(sqlBuilder.toString());
+            int rows = stmt.executeUpdate(sqlBuilder.toString());
+            assertEquals(10, rows);
+        } catch (SQLException e) {
+            e.printStackTrace();
         }
-        System.out.println(sqlBuilder.toString());
-        int rows = statement.executeUpdate(sqlBuilder.toString());
-        System.out.println(rows);
-        assertEquals(10, rows);
     }
 
-    @After
-    public void close() throws Exception {
-        statement.executeUpdate("drop database " + dbName);
-        statement.close();
-        connection.close();
-        Thread.sleep(10);
+    @Test
+    public void case004_checkSum() {
+        Assert.assertEquals(100, select());
+    }
 
+    @After
+    public void close() {
+        try {
+            if (connection != null) {
+                Statement statement = connection.createStatement();
+                statement.executeUpdate("drop database " + dbName);
+                statement.close();
+                connection.close();
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
     }
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/TimeStampUtil.java

+package com.taosdata.jdbc.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class TimeStampUtil {
+
+    private static final String datetimeFormat = "yyyy-MM-dd HH:mm:ss.SSS";
+
+    public static long datetimeToLong(String dateTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat(datetimeFormat);
+        try {
+            return sdf.parse(dateTime).getTime();
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("invalid datetime string >>> " + dateTime);
+        }
+    }
+
+    public static String longToDatetime(long time) {
+        SimpleDateFormat sdf = new SimpleDateFormat(datetimeFormat);
+        return sdf.format(new Date(time));
+    }
+
+    public static class TimeTuple {
+        public Long start;
+        public Long end;
+        public Long timeGap;
+
+        TimeTuple(long start, long end, long timeGap) {
+            this.start = start;
+            this.end = end;
+            this.timeGap = timeGap;
+        }
+    }
+
+    public static TimeTuple range(long start, long timeGap, long size) {
+        long now = System.currentTimeMillis();
+        if (timeGap < 1)
+            timeGap = 1;
+        if (start == 0)
+            start = now - size * timeGap;
+
+        // 如果size小于1异常
+        if (size < 1)
+            throw new IllegalArgumentException("size less than 1.");
+        // 如果timeGap为1，已经超长，需要前移start
+        if (start + size > now) {
+            start = now - size;
+            return new TimeTuple(start, now, 1);
+        }
+        long end = start + (long) (timeGap * size);
+        if (end > now) {
+            //压缩timeGap
+            end = now;
+            double gap = (end - start) / (size * 1.0f);
+            if (gap < 1.0f) {
+                timeGap = 1;
+                start = end - size;
+            } else {
+                timeGap = (long) gap;
+                end = start + (long) (timeGap * size);
+            }
+        }
+        return new TimeTuple(start, end, timeGap);
+    }
+}