xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-2695]<test>: change jdbc unit test cases

This commit is contained in:
zyyang 2021-01-11 18:12:30 +08:00
parent 7dbfd4000e
commit cfe4422580
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
View File

@ -19,14 +19,13 @@ import java.util.Map;
public class TaosDemoApplication { public class TaosDemoApplication {
private static Logger logger = Logger.getLogger(TaosDemoApplication.class); private static final Logger logger = Logger.getLogger(TaosDemoApplication.class);
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
// 读配置参数 // 读配置参数
JdbcTaosdemoConfig config = new JdbcTaosdemoConfig(args); JdbcTaosdemoConfig config = new JdbcTaosdemoConfig(args);
boolean isHelp = Arrays.asList(args).contains("--help"); boolean isHelp = Arrays.asList(args).contains("--help");
if (isHelp || config.host == null || config.host.isEmpty()) { if (isHelp || config.host == null || config.host.isEmpty()) {
// if (isHelp) {
JdbcTaosdemoConfig.printHelp(); JdbcTaosdemoConfig.printHelp();
System.exit(0); System.exit(0);
} }
@ -75,7 +74,7 @@ public class TaosDemoApplication {
} }
} }
end = System.currentTimeMillis(); end = System.currentTimeMillis();
logger.error(">>> create table time cost : " + (end - start) + " ms."); logger.info(">>> create table time cost : " + (end - start) + " ms.");
/**********************************************************************************/ /**********************************************************************************/
// 插入 // 插入
long tableSize = config.numOfTables; long tableSize = config.numOfTables;
@ -90,7 +89,7 @@ public class TaosDemoApplication {
// multi threads to insert // multi threads to insert
int affectedRows = subTableService.insertMultiThreads(superTableMeta, threadSize, tableSize, startTime, gap, config); int affectedRows = subTableService.insertMultiThreads(superTableMeta, threadSize, tableSize, startTime, gap, config);
end = System.currentTimeMillis(); end = System.currentTimeMillis();
logger.error("insert " + affectedRows + " rows, time cost: " + (end - start) + " ms"); logger.info("insert " + affectedRows + " rows, time cost: " + (end - start) + " ms");
/**********************************************************************************/ /**********************************************************************************/
// 删除表 // 删除表
if (config.dropTable) { if (config.dropTable) {
@ -108,5 +107,4 @@ public class TaosDemoApplication {
return startTime; return startTime;
} }
} }

8
tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/DatabaseMapperImpl.java
View File

@ -21,27 +21,27 @@ public class DatabaseMapperImpl implements DatabaseMapper {
public void createDatabase(String dbname) { public void createDatabase(String dbname) {
String sql = "create database if not exists " + dbname; String sql = "create database if not exists " + dbname;
jdbcTemplate.execute(sql); jdbcTemplate.execute(sql);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
} }
@Override @Override
public void dropDatabase(String dbname) { public void dropDatabase(String dbname) {
String sql = "drop database if exists " + dbname; String sql = "drop database if exists " + dbname;
jdbcTemplate.update(sql); jdbcTemplate.update(sql);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
} }
@Override @Override
public void createDatabaseWithParameters(Map<String, String> map) { public void createDatabaseWithParameters(Map<String, String> map) {
String sql = SqlSpeller.createDatabase(map); String sql = SqlSpeller.createDatabase(map);
jdbcTemplate.execute(sql); jdbcTemplate.execute(sql);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
} }
@Override @Override
public void useDatabase(String dbname) { public void useDatabase(String dbname) {
String sql = "use " + dbname; String sql = "use " + dbname;
jdbcTemplate.execute(sql); jdbcTemplate.execute(sql);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
} }
} }

10
tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SubTableMapperImpl.java
View File

@ -21,14 +21,14 @@ public class SubTableMapperImpl implements SubTableMapper {
@Override @Override
public void createUsingSuperTable(SubTableMeta subTableMeta) { public void createUsingSuperTable(SubTableMeta subTableMeta) {
String sql = SqlSpeller.createTableUsingSuperTable(subTableMeta); String sql = SqlSpeller.createTableUsingSuperTable(subTableMeta);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
jdbcTemplate.execute(sql); jdbcTemplate.execute(sql);
} }
@Override @Override
public int insertOneTableMultiValues(SubTableValue subTableValue) { public int insertOneTableMultiValues(SubTableValue subTableValue) {
String sql = SqlSpeller.insertOneTableMultiValues(subTableValue); String sql = SqlSpeller.insertOneTableMultiValues(subTableValue);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
int affectRows = 0; int affectRows = 0;
try { try {
@ -42,7 +42,7 @@ public class SubTableMapperImpl implements SubTableMapper {
@Override @Override
public int insertOneTableMultiValuesUsingSuperTable(SubTableValue subTableValue) { public int insertOneTableMultiValuesUsingSuperTable(SubTableValue subTableValue) {
String sql = SqlSpeller.insertOneTableMultiValuesUsingSuperTable(subTableValue); String sql = SqlSpeller.insertOneTableMultiValuesUsingSuperTable(subTableValue);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
int affectRows = 0; int affectRows = 0;
try { try {
@ -56,7 +56,7 @@ public class SubTableMapperImpl implements SubTableMapper {
@Override @Override
public int insertMultiTableMultiValues(List<SubTableValue> tables) { public int insertMultiTableMultiValues(List<SubTableValue> tables) {
String sql = SqlSpeller.insertMultiSubTableMultiValues(tables); String sql = SqlSpeller.insertMultiSubTableMultiValues(tables);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
int affectRows = 0; int affectRows = 0;
try { try {
affectRows = jdbcTemplate.update(sql); affectRows = jdbcTemplate.update(sql);
@ -69,7 +69,7 @@ public class SubTableMapperImpl implements SubTableMapper {
@Override @Override
public int insertMultiTableMultiValuesUsingSuperTable(List<SubTableValue> tables) { public int insertMultiTableMultiValuesUsingSuperTable(List<SubTableValue> tables) {
String sql = SqlSpeller.insertMultiTableMultiValuesUsingSuperTable(tables); String sql = SqlSpeller.insertMultiTableMultiValuesUsingSuperTable(tables);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
int affectRows = 0; int affectRows = 0;
try { try {
affectRows = jdbcTemplate.update(sql); affectRows = jdbcTemplate.update(sql);

4
tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SuperTableMapperImpl.java
View File

@ -18,14 +18,14 @@ public class SuperTableMapperImpl implements SuperTableMapper {
@Override @Override
public void createSuperTable(SuperTableMeta tableMetadata) { public void createSuperTable(SuperTableMeta tableMetadata) {
String sql = SqlSpeller.createSuperTable(tableMetadata); String sql = SqlSpeller.createSuperTable(tableMetadata);
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
jdbcTemplate.execute(sql); jdbcTemplate.execute(sql);
} }
@Override @Override
public void dropSuperTable(String database, String name) { public void dropSuperTable(String database, String name) {
String sql = "drop table if exists " + database + "." + name; String sql = "drop table if exists " + database + "." + name;
logger.info("SQL >>> " + sql); logger.debug("SQL >>> " + sql);
jdbcTemplate.execute(sql); jdbcTemplate.execute(sql);
} }
} }

8
tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/TableMapperImpl.java
View File

@ -1,43 +1,49 @@
package com.taosdata.taosdemo.dao; package com.taosdata.taosdemo.dao;
import com.taosdata.taosdemo.dao.TableMapper;
import com.taosdata.taosdemo.domain.TableMeta; import com.taosdata.taosdemo.domain.TableMeta;
import com.taosdata.taosdemo.domain.TableValue; import com.taosdata.taosdemo.domain.TableValue;
import com.taosdata.taosdemo.utils.SqlSpeller; import com.taosdata.taosdemo.utils.SqlSpeller;
import org.apache.log4j.Logger;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import java.util.List; import java.util.List;
public class TableMapperImpl implements TableMapper { public class TableMapperImpl implements TableMapper {
private static final Logger logger = Logger.getLogger(TableMapperImpl.class);
private JdbcTemplate template; private JdbcTemplate template;
@Override @Override
public void create(TableMeta tableMeta) { public void create(TableMeta tableMeta) {
String sql = SqlSpeller.createTable(tableMeta); String sql = SqlSpeller.createTable(tableMeta);
logger.debug("SQL >>> " + sql);
template.execute(sql); template.execute(sql);
} }
@Override @Override
public int insertOneTableMultiValues(TableValue values) { public int insertOneTableMultiValues(TableValue values) {
String sql = SqlSpeller.insertOneTableMultiValues(values); String sql = SqlSpeller.insertOneTableMultiValues(values);
logger.debug("SQL >>> " + sql);
return template.update(sql); return template.update(sql);
} }
@Override @Override
public int insertOneTableMultiValuesWithColumns(TableValue values) { public int insertOneTableMultiValuesWithColumns(TableValue values) {
String sql = SqlSpeller.insertOneTableMultiValuesWithColumns(values); String sql = SqlSpeller.insertOneTableMultiValuesWithColumns(values);
logger.debug("SQL >>> " + sql);
return template.update(sql); return template.update(sql);
} }
@Override @Override
public int insertMultiTableMultiValues(List<TableValue> tables) { public int insertMultiTableMultiValues(List<TableValue> tables) {
String sql = SqlSpeller.insertMultiTableMultiValues(tables); String sql = SqlSpeller.insertMultiTableMultiValues(tables);
logger.debug("SQL >>> " + sql);
return template.update(sql); return template.update(sql);
} }
@Override @Override
public int insertMultiTableMultiValuesWithColumns(List<TableValue> tables) { public int insertMultiTableMultiValuesWithColumns(List<TableValue> tables) {
String sql = SqlSpeller.insertMultiTableMultiValuesWithColumns(tables); String sql = SqlSpeller.insertMultiTableMultiValuesWithColumns(tables);
logger.debug("SQL >>> " + sql);
return template.update(sql); return template.update(sql);
} }
} }

2
tests/examples/JDBC/taosdemo/src/main/resources/log4j.properties
View File

@ -1,5 +1,5 @@
### 设置### ### 设置###
log4j.rootLogger=error,stdout log4j.rootLogger=info,stdout
### 输出信息到控制抬 ### ### 输出信息到控制抬 ###
log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out log4j.appender.stdout.Target=System.out