update the jdbcTemplate example and test cases

tests/examples/JDBC/SpringJdbcTemplate/pom.xml

@@ -1,85 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.taosdata.jdbc</groupId>
+    <groupId>com.taosdata.jdbc</groupId>
-  <artifactId>SpringJdbcTemplate</artifactId>
+    <artifactId>SpringJdbcTemplate</artifactId>
-  <version>1.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
-  <name>SpringJdbcTemplate</name>
+    <name>SpringJdbcTemplate</name>
-  <url>http://www.taosdata.com</url>
+    <url>http://www.taosdata.com</url>
 
-  <properties>
+    <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
+    </properties>
 
-  <dependencies>
+    <dependencies>
 
-    <dependency>
+        <dependency>
-      <groupId>org.springframework</groupId>
+            <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
+            <artifactId>spring-context</artifactId>
-      <version>4.3.2.RELEASE</version>
+            <version>5.2.8.RELEASE</version>
-    </dependency>
+        </dependency>
 
-    <dependency>
+        <dependency>
-      <groupId>org.springframework</groupId>
+            <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
-      <version>4.3.2.RELEASE</version>
+            <version>5.1.9.RELEASE</version>
-    </dependency>
+        </dependency>
 
-    <dependency>
+        <dependency>
-      <groupId>junit</groupId>
+            <groupId>org.springframework</groupId>
-      <artifactId>junit</artifactId>
+            <artifactId>spring-test</artifactId>
-      <version>4.11</version>
+            <version>5.1.9.RELEASE</version>
-      <scope>test</scope>
+        </dependency>
-    </dependency>
 
-    <dependency>
+        <dependency>
-      <groupId>com.taosdata.jdbc</groupId>
+            <groupId>junit</groupId>
-      <artifactId>taos-jdbcdriver</artifactId>
+            <artifactId>junit</artifactId>
-      <version>2.0.2</version>
+            <version>4.13</version>
-    </dependency>
+            <scope>test</scope>
+        </dependency>
 
-  </dependencies>
+        <dependency>
+            <groupId>com.taosdata.jdbc</groupId>
+            <artifactId>taos-jdbcdriver</artifactId>
+            <version>2.0.4</version>
+        </dependency>
 
-  <build>
+    </dependencies>
-    <plugins>
+
-      <plugin>
+    <build>
-        <artifactId>maven-compiler-plugin</artifactId>
+        <plugins>
-        <version>3.8.0</version>
+            <plugin>
-        <configuration>
+                <artifactId>maven-compiler-plugin</artifactId>
-          <source>1.8</source>
+                <version>3.8.0</version>
-          <target>1.8</target>
+                <configuration>
-        </configuration>
+                    <source>1.8</source>
-      </plugin>
+                    <target>1.8</target>
-      <plugin>
+                </configuration>
-        <groupId>org.apache.maven.plugins</groupId>
+            </plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
+            <plugin>
-        <version>3.1.0</version>
+                <groupId>org.apache.maven.plugins</groupId>
-        <configuration>
+                <artifactId>maven-assembly-plugin</artifactId>
-          <archive>
+                <version>3.1.0</version>
-            <manifest>
+                <configuration>
-              <mainClass>com.taosdata.jdbc.App</mainClass>
+                    <archive>
-            </manifest>
+                        <manifest>
-          </archive>
+                            <mainClass>com.taosdata.jdbc.example.jdbcTemplate.App</mainClass>
-          <descriptorRefs>
+                        </manifest>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </archive>
-          </descriptorRefs>
+                    <descriptorRefs>
-        </configuration>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
-        <executions>
+                    </descriptorRefs>
-          <execution>
+                </configuration>
-            <id>make-assembly</id>
+                <executions>
-            <phase>package</phase>
+                    <execution>
-            <goals>
+                        <id>make-assembly</id>
-              <goal>single</goal>
+                        <phase>package</phase>
-            </goals>
+                        <goals>
-          </execution>
+                            <goal>single</goal>
-        </executions>
+                        </goals>
-      </plugin>
+                    </execution>
-    </plugins>
+                </executions>
-  </build>
+            </plugin>
+        </plugins>
+    </build>
 </project>

tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/App.java

@@ -1,44 +0,0 @@
-package com.taosdata.jdbc;
-
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-import java.util.Map;
-
-public class App {
-
-    public static void main( String[] args ) {
-
-        ApplicationContext ctx = new ClassPathXmlApplicationContext("applicationContext.xml");
-
-        JdbcTemplate jdbcTemplate = (JdbcTemplate) ctx.getBean("jdbcTemplate");
-
-        // create database
-        jdbcTemplate.execute("create database if not exists db ");
-
-        // create table
-        jdbcTemplate.execute("create table if not exists db.tb (ts timestamp, temperature int, humidity float)");
-
-        String insertSql = "insert into db.tb values(now, 23, 10.3) (now + 1s, 20, 9.3)";
-
-        // insert rows
-        int affectedRows = jdbcTemplate.update(insertSql);
-
-        System.out.println("insert success " + affectedRows + " rows.");
-
-        // query for list
-        List<Map<String, Object>> resultList =  jdbcTemplate.queryForList("select * from db.tb");
-
-        if(!CollectionUtils.isEmpty(resultList)){
-            for (Map<String, Object> row : resultList){
-                System.out.printf("%s, %d, %s\n", row.get("ts"), row.get("temperature"), row.get("humidity"));
-            }
-        }
-
-    }
-
-}

tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/App.java

@@ -0,0 +1,48 @@
+package com.taosdata.jdbc.example.jdbcTemplate;
+
+
+import com.taosdata.jdbc.example.jdbcTemplate.dao.ExecuteAsStatement;
+import com.taosdata.jdbc.example.jdbcTemplate.dao.WeatherDao;
+import com.taosdata.jdbc.example.jdbcTemplate.domain.Weather;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+public class App {
+
+    private static Random random = new Random(System.currentTimeMillis());
+
+    public static void main(String[] args) {
+
+        ApplicationContext ctx = new ClassPathXmlApplicationContext("applicationContext.xml");
+
+        ExecuteAsStatement executor = ctx.getBean(ExecuteAsStatement.class);
+        // drop database
+        executor.doExecute("drop database if exists test");
+        // create database
+        executor.doExecute("create database if not exists test");
+        //use database
+        executor.doExecute("use test");
+        // create table
+        executor.doExecute("create table if not exists test.weather (ts timestamp, temperature int, humidity float)");
+
+        WeatherDao weatherDao = ctx.getBean(WeatherDao.class);
+        Weather weather = new Weather(new Timestamp(new Date().getTime()), random.nextFloat() * 50.0f, random.nextInt(100));
+        // insert rows
+        int affectedRows = weatherDao.add(weather);
+        System.out.println("insert success " + affectedRows + " rows.");
+
+        // query for list
+        int limit = 10, offset = 0;
+        List<Weather> weatherList = weatherDao.queryForList(limit, offset);
+        for (Weather w : weatherList) {
+            System.out.println(w);
+        }
+
+    }
+
+}

tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/ExecuteAsStatement.java

@@ -0,0 +1,6 @@
+package com.taosdata.jdbc.example.jdbcTemplate.dao;
+
+public interface ExecuteAsStatement{
+
+    void doExecute(String sql);
+}

tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/WeatherDao.java

@@ -0,0 +1,17 @@
+package com.taosdata.jdbc.example.jdbcTemplate.dao;
+
+import com.taosdata.jdbc.example.jdbcTemplate.domain.Weather;
+
+import java.util.List;
+
+public interface WeatherDao {
+
+
+    int add(Weather weather);
+
+    int[] batchInsert(List<Weather> weatherList);
+
+    List<Weather> queryForList(int limit, int offset);
+
+    int count();
+}

tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/impl/ExecuteAsStatementImpl.java

@@ -0,0 +1,19 @@
+package com.taosdata.jdbc.example.jdbcTemplate.dao.impl;
+
+import com.taosdata.jdbc.example.jdbcTemplate.dao.ExecuteAsStatement;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public class ExecuteAsStatementImpl implements ExecuteAsStatement {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public void doExecute(String sql) {
+        jdbcTemplate.execute(sql);
+    }
+}

tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/impl/WeatherDaoImpl.java

@@ -0,0 +1,64 @@
+package com.taosdata.jdbc.example.jdbcTemplate.dao.impl;
+
+import com.taosdata.jdbc.example.jdbcTemplate.dao.WeatherDao;
+import com.taosdata.jdbc.example.jdbcTemplate.domain.Weather;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public class WeatherDaoImpl implements WeatherDao {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public int add(Weather weather) {
+        return jdbcTemplate.update(
+                "insert into test.weather(ts, temperature, humidity) VALUES(?,?,?)",
+                weather.getTs(), weather.getTemperature(), weather.getHumidity()
+        );
+    }
+
+    @Override
+    public int[] batchInsert(List<Weather> weatherList) {
+        return jdbcTemplate.batchUpdate("insert into test.weather(ts, temperature, humidity) values( ?, ?, ?)", new BatchPreparedStatementSetter() {
+            @Override
+            public void setValues(PreparedStatement ps, int i) throws SQLException {
+                ps.setTimestamp(1, weatherList.get(i).getTs());
+                ps.setFloat(2, weatherList.get(i).getTemperature());
+                ps.setInt(3, weatherList.get(i).getHumidity());
+            }
+
+            @Override
+            public int getBatchSize() {
+                return weatherList.size();
+            }
+        });
+    }
+
+    @Override
+    public List<Weather> queryForList(int limit, int offset) {
+        return jdbcTemplate.query("select * from test.weather limit ? offset ?", (rs, rowNum) -> {
+            Timestamp ts = rs.getTimestamp("ts");
+            float temperature = rs.getFloat("temperature");
+            int humidity = rs.getInt("humidity");
+            return new Weather(ts, temperature, humidity);
+        }, limit, offset);
+    }
+
+    @Override
+    public int count() {
+        return jdbcTemplate.queryForObject("select count(*) from test.weather", Integer.class);
+    }
+}

tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/domain/Weather.java

@@ -0,0 +1,54 @@
+package com.taosdata.jdbc.example.jdbcTemplate.domain;
+
+import java.sql.Timestamp;
+
+public class Weather {
+
+    private Timestamp ts;
+    private float temperature;
+    private int humidity;
+
+    public Weather() {
+    }
+
+    public Weather(Timestamp ts, float temperature, int humidity) {
+        this.ts = ts;
+        this.temperature = temperature;
+        this.humidity = humidity;
+    }
+
+    @Override
+    public String toString() {
+        return "Weather{" +
+                "ts=" + ts +
+                ", temperature=" + temperature +
+                ", humidity=" + humidity +
+                '}';
+    }
+
+    public Timestamp getTs() {
+        return ts;
+    }
+
+    public void setTs(Timestamp ts) {
+        this.ts = ts;
+    }
+
+    public float getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(float temperature) {
+        this.temperature = temperature;
+    }
+
+    public int getHumidity() {
+        return humidity;
+    }
+
+    public void setHumidity(int humidity) {
+        this.humidity = humidity;
+    }
+
+
+}

tests/examples/JDBC/SpringJdbcTemplate/src/main/resources/applicationContext.xml

@@ -5,20 +5,21 @@
        xsi:schemaLocation="
 	http://www.springframework.org/schema/beans
 	http://www.springframework.org/schema/beans/spring-beans.xsd
-	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
-	"
        default-autowire="byName">
 
     <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
         <property name="driverClassName" value="com.taosdata.jdbc.TSDBDriver"></property>
-        <property name="url" value="jdbc:TAOS://127.0.0.1:6030/log"></property>
+        <property name="url" value="jdbc:TAOS://192.168.236.137:6030/"></property>
         <property name="username" value="root"></property>
         <property name="password" value="taosdata"></property>
     </bean>
 
 
-    <bean id = "jdbcTemplate"  class="org.springframework.jdbc.core.JdbcTemplate" >
+    <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
-        <property name="dataSource" ref = "dataSource" ></property>
+        <property name="dataSource" ref="dataSource"></property>
     </bean>
 
+    <context:component-scan base-package="com.taosdata.jdbc.example.jdbcTemplate"/>
+
 </beans>

tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/AppTest.java

@@ -7,14 +7,12 @@ import org.junit.Test;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest {
-{
     /**
      * Rigorous Test :-)
      */
     @Test
-    public void shouldAnswerWithTrue()
+    public void shouldAnswerWithTrue() {
-    {
+        assertTrue(true);
-        assertTrue( true );
     }
 }

tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/example/jdbcTemplate/BatcherInsertTest.java

@@ -0,0 +1,65 @@
+package com.taosdata.jdbc.example.jdbcTemplate;
+
+
+import com.taosdata.jdbc.example.jdbcTemplate.dao.ExecuteAsStatement;
+import com.taosdata.jdbc.example.jdbcTemplate.dao.WeatherDao;
+import com.taosdata.jdbc.example.jdbcTemplate.domain.Weather;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration({"classpath:applicationContext.xml"})
+public class BatcherInsertTest {
+
+
+    @Autowired
+    private WeatherDao weatherDao;
+    @Autowired
+    private ExecuteAsStatement executor;
+
+    private static final int numOfRecordsPerTable = 1000;
+    private static long ts = 1496732686000l;
+    private static Random random = new Random(System.currentTimeMillis());
+
+    @Before
+    public void before() {
+        // drop database
+        executor.doExecute("drop database if exists test");
+        // create database
+        executor.doExecute("create database if not exists test");
+        //use database
+        executor.doExecute("use test");
+        // create table
+        executor.doExecute("create table if not exists test.weather (ts timestamp, temperature int, humidity float)");
+    }
+
+    @Test
+    public void batchInsert() {
+        List<Weather> weatherList = new ArrayList<>();
+        for (int i = 0; i < numOfRecordsPerTable; i++) {
+            ts += 1000;
+            Weather weather = new Weather(new Timestamp(ts), random.nextFloat() * 50.0f, random.nextInt(100));
+            weatherList.add(weather);
+        }
+        long start = System.currentTimeMillis();
+        weatherDao.batchInsert(weatherList);
+        long end = System.currentTimeMillis();
+        System.out.println("batch insert(" + numOfRecordsPerTable + " rows) time cost ==========> " + (end - start) + " ms");
+
+        int count = weatherDao.count();
+        assertEquals(count, numOfRecordsPerTable);
+    }
+
+
+}