From 078ed83e90e50357e9ca2c372f2ab90d2270938f Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Mon, 14 Dec 2020 15:21:10 +0800
Subject: [PATCH] change

---
 .../components/TaosDemoCommandLineRunner.java         | 11 +++++++----
 .../taosdemo/service/data/SubTableValueGenerator.java |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/TaosDemoCommandLineRunner.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/TaosDemoCommandLineRunner.java
index 2dd441bf86..aa904d55f8 100644
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/TaosDemoCommandLineRunner.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/TaosDemoCommandLineRunner.java
@@ -49,9 +49,9 @@ public class TaosDemoCommandLineRunner implements CommandLineRunner {
         // 准备数据
         prepareMetaData(config);
         // 创建数据库
-        createDatabaseTask(config);
+//        createDatabaseTask(config);
         // 建表
-        createTableTask(config);
+//        createTableTask(config);
         // 插入
         insertTask(config);
         // 查询: 1. 生成查询语句, 2. 执行查询
@@ -123,8 +123,10 @@ public class TaosDemoCommandLineRunner implements CommandLineRunner {
                     rowSize = numOfRowsPerTable - rowCnt;
                 }
                 /***********************************************/
-                long startTime = config.startTime + rowCnt * rowSize * config.timeGap;
-//                System.out.println(">>> startTime: " + startTime + ",timeGap: " + config.timeGap);
+                long startTime = config.startTime + rowCnt * config.timeGap;
+//                System.out.print("tableCnt: " + tableCnt + ", tableSize: " + tableSize + ", rowCnt: " + rowCnt + ", rowSize: " + rowSize);
+//                System.out.println(", startTime: " + TimeStampUtil.longToDatetime(startTime) + ",timeGap: " + config.timeGap);
+
                 // 生成数据
                 List<SubTableValue> data = SubTableValueGenerator.generate(subTableMetaList, tableCnt, tableSize, rowSize, startTime, config.timeGap);
                 // 乱序
@@ -143,6 +145,7 @@ public class TaosDemoCommandLineRunner implements CommandLineRunner {
             tableCnt += tableSize;
         }
 
+        /*********************************************************************************/
         // 批量插入，自动建表
 //            dataList.stream().forEach(subTableValues -> {
 //                subTableService.insertAutoCreateTable(subTableValues, config.numOfThreadsForInsert, config.frequency);
diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SubTableValueGenerator.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SubTableValueGenerator.java
index 61b5f27aea..a5dd0fb9f5 100644
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SubTableValueGenerator.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SubTableValueGenerator.java
@@ -77,6 +77,7 @@ public class SubTableValueGenerator {
             TimeStampUtil.TimeTuple tuple = TimeStampUtil.range(startTime, timeGap, rowSize);
             List<RowValue> values = FieldValueGenerator.generate(tuple.start, tuple.end, tuple.timeGap, subTableMeta.getFields());
             subTableValue.setValues(values);
+            subTableValueList.add(subTableValue);
         }
         return subTableValueList;
     }