Merge pull request #2694 from taosdata/hotfix/TD-935

Hotfix/td 935

importSampleData/app/main.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/taosdata/TDengine/importSampleData/import"
 	"hash/crc32"
 	"io"
 	"log"
@@ -18,6 +17,8 @@ import (
 	"sync"
 	"time"
 
+	dataimport "github.com/taosdata/TDengine/importSampleData/import"
+
 	_ "github.com/taosdata/driver-go/taosSql"
 )
 
@@ -41,7 +42,6 @@ const (
 )
 
 var (
-
 	cfg          string
 	cases        string
 	hnum         int
@@ -259,7 +259,7 @@ func main() {
 
 	total := getTotalRows(successRows)
 
-	log.Printf("finished insert %d rows, used %d ms, speed %d rows/s", total, usedTime/1e6, total * 1e9 / int64(usedTime))
+	log.Printf("finished insert %d rows, used %d ms, speed %d rows/s", total, usedTime/1e6, total*1e3/usedTime.Milliseconds())
 
 	if vnum == 0 {
 		// continue waiting for insert data
@@ -484,7 +484,6 @@ func getSuperTableName(stname string) string {
 	return SUPERTABLE_PREFIX + stname
 }
 
-
 /**
 * normalizationData , and return the num of subTables
  */
@@ -556,12 +555,10 @@ func normalizationDataWithSameInterval(fileRows dataRows, avgInterval int64) int
 	return int64(maxRows)
 }
 
-
 func getSubTableName(subTableValue string, superTableName string) string {
 	return SUBTABLE_PREFIX + subTableValue + "_" + superTableName
 }
 
-
 func insertData(threadIndex, start, end int, wg *sync.WaitGroup, successRows []int64) {
 	connection := getConnection()
 	defer connection.Close()
@@ -676,7 +673,7 @@ func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []
 			break
 		}
 
-		if(num == 0){
+		if num == 0 {
 			wg.Done() //finished insert history data
 			num++
 		}
@@ -772,7 +769,6 @@ func getConnection() *sql.DB{
 	return db
 }
 
-
 func getSubTableNameValue(suffix interface{}) string {
 	return fmt.Sprintf("%v", suffix)
 }