[td-225] merge develop.

Jenkinsfile

@@ -46,6 +46,7 @@ def pre_test(){
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
     git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit 0
+    find ${WKC}/tests/pytest -name \'*\'.sql -exec rm -rf {} \\;
     cd ${WK}
     git reset --hard HEAD~10
     git checkout develop
@@ -115,7 +116,6 @@ pipeline {
               sh '''
               date
               cd ${WKC}/tests
-              find pytest -name '*'sql|xargs rm -rf
               ./test-all.sh p1
               date'''
             }
@@ -131,7 +131,6 @@ pipeline {
                 sh '''
                 date
                 cd ${WKC}/tests
-                find pytest -name '*'sql|xargs rm -rf
                 ./test-all.sh p2
                 date'''
             }

src/client/src/tscSQLParser.c

@@ -1592,7 +1592,7 @@ bool isValidDistinctSql(SQueryInfo* pQueryInfo) {
 int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSelection, bool isSTable, bool joinQuery, bool timeWindowQuery) {
   assert(pSelection != NULL && pCmd != NULL);
 
-  const char* msg2 = "functions can not be mixed up";
+  const char* msg2 = "functions or others can not be mixed up";
   const char* msg3 = "not support query expression";
   const char* msg5 = "invalid function name";
   const char* msg6 = "only support distinct one tag";
@@ -2870,6 +2870,23 @@ bool hasUnsupportFunctionsForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo)
   return false;
 }
 
+static bool groupbyTagsOrNull(SQueryInfo* pQueryInfo) {
+  if (pQueryInfo->groupbyExpr.columnInfo == NULL ||
+    taosArrayGetSize(pQueryInfo->groupbyExpr.columnInfo) == 0) {
+    return true;
+  }
+
+  size_t s = taosArrayGetSize(pQueryInfo->groupbyExpr.columnInfo);
+  for (int32_t i = 0; i < s; i++) {
+    SColIndex* colIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, i);
+    if (colIndex->flag != TSDB_COL_TAG) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery, bool twQuery) {
   int32_t startIdx = 0;
 
@@ -2886,7 +2903,7 @@ static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery, bool
 
   int32_t factor = functionCompatList[tscSqlExprGet(pQueryInfo, startIdx)->functionId];
 
-  if (tscSqlExprGet(pQueryInfo, 0)->functionId == TSDB_FUNC_LAST_ROW && (joinQuery || twQuery)) {
+  if (tscSqlExprGet(pQueryInfo, 0)->functionId == TSDB_FUNC_LAST_ROW && (joinQuery || intervalQuery || !groupbyTagsOrNull(pQueryInfo))) {
     return false;
   }
 
@@ -2914,7 +2931,7 @@ static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery, bool
       }
     }
 
-    if (functionId == TSDB_FUNC_LAST_ROW && (joinQuery || twQuery)) {
+    if (functionId == TSDB_FUNC_LAST_ROW && (joinQuery || intervalQuery || !groupbyTagsOrNull(pQueryInfo))) {
       return false;
     }
   }

src/client/src/tscSubquery.c

@@ -1882,6 +1882,13 @@ void doAppendData(SInterResult* pInterResult, TAOS_ROW row, int32_t numOfCols, S
       }
     }
 
+    if (p && taosArrayGetSize(p) > 0) {
+      SResPair *l = taosArrayGetLast(p);
+      if (l->key == key && key == INT64_MIN) {
+        continue;
+      }
+    }
+
     //append a new column
     if (p == NULL) {
       SStddevInterResult t = {.colId = id, .pResult = taosArrayInit(10, sizeof(SResPair)),};

src/connector/python/linux/python2/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.6",
+    version="2.0.7",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/linux/python2/taos/cinterface.py

@@ -22,10 +22,10 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
 
     if num_of_rows > 0:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
 
 
 def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
@@ -145,10 +145,10 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """
     if num_of_rows > 0:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
     else:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
 
 
 def _crow_bigint_unsigned_to_python(
@@ -162,13 +162,13 @@ def _crow_bigint_unsigned_to_python(
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
 
 
@@ -600,7 +600,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_INT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BIGINT):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_FLOAT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_DOUBLE):
@@ -608,7 +608,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BINARY):
     #         return (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char))[0:byte]).rstrip('\x00')
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_TIMESTAMP):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_NCHAR):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 

src/connector/python/linux/python3/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.5",
+    version="2.0.7",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/linux/python3/taos/cinterface.py

@@ -22,10 +22,10 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
 
     if num_of_rows > 0:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
 
 
 def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
@@ -145,10 +145,10 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """
     if num_of_rows > 0:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
     else:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
 
 
 def _crow_bigint_unsigned_to_python(
@@ -162,13 +162,13 @@ def _crow_bigint_unsigned_to_python(
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
 
 
@@ -600,7 +600,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_INT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BIGINT):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_FLOAT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_DOUBLE):
@@ -608,7 +608,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BINARY):
     #         return (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char))[0:byte]).rstrip('\x00')
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_TIMESTAMP):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_NCHAR):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 

src/connector/python/linux/python3/taos/cursor.py

 from .cinterface import CTaosInterface
 from .error import *
 from .constants import FieldType
-import threading
 
 # querySeqNum = 0
 
@@ -38,7 +37,6 @@ class TDengineCursor(object):
         self._block_iter = 0
         self._affected_rows = 0
         self._logfile = ""
-        self._threadId = threading.get_ident()
 
         if connection is not None:
             self._connection = connection
@@ -105,12 +103,6 @@ class TDengineCursor(object):
     def execute(self, operation, params=None):
         """Prepare and execute a database operation (query or command).
         """
-        # if threading.get_ident() != self._threadId:
-        #     info ="Cursor execute:Thread ID not match,creater:"+str(self._threadId)+" caller:"+str(threading.get_ident())
-        #     raise OperationalError(info)
-        # print(info)
-        # return None
-
         if not operation:
             return None
 
@@ -280,12 +272,6 @@ class TDengineCursor(object):
     def _handle_result(self):
         """Handle the return result from query.
         """
-        # if threading.get_ident() != self._threadId:
-        #     info = "Cursor handleresult:Thread ID not match,creater:"+str(self._threadId)+" caller:"+str(threading.get_ident())
-        #     raise OperationalError(info)
-        # print(info)
-        # return None
-
         self._description = []
         for ele in self._fields:
             self._description.append(

src/connector/python/osx/python3/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.5",
+    version="2.0.7",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/osx/python3/taos/cinterface.py

@@ -22,10 +22,10 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
 
     if num_of_rows > 0:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
 
 
 def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
@@ -145,10 +145,10 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """
     if num_of_rows > 0:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
     else:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
 
 
 def _crow_bigint_unsigned_to_python(
@@ -162,13 +162,13 @@ def _crow_bigint_unsigned_to_python(
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
 
 
@@ -600,7 +600,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_INT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BIGINT):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_FLOAT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_DOUBLE):
@@ -608,7 +608,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BINARY):
     #         return (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char))[0:byte]).rstrip('\x00')
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_TIMESTAMP):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_NCHAR):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 

src/connector/python/osx/python3/taos/cursor.py

 from .cinterface import CTaosInterface
 from .error import *
 from .constants import FieldType
-import threading
 
 # querySeqNum = 0
 
@@ -38,7 +37,6 @@ class TDengineCursor(object):
         self._block_iter = 0
         self._affected_rows = 0
         self._logfile = ""
-        self._threadId = threading.get_ident()
 
         if connection is not None:
             self._connection = connection
@@ -105,12 +103,6 @@ class TDengineCursor(object):
     def execute(self, operation, params=None):
         """Prepare and execute a database operation (query or command).
         """
-        # if threading.get_ident() != self._threadId:
-        #     info ="Cursor execute:Thread ID not match,creater:"+str(self._threadId)+" caller:"+str(threading.get_ident())
-        #     raise OperationalError(info)
-        # print(info)
-        # return None
-
         if not operation:
             return None
 
@@ -280,12 +272,6 @@ class TDengineCursor(object):
     def _handle_result(self):
         """Handle the return result from query.
         """
-        # if threading.get_ident() != self._threadId:
-        #     info = "Cursor handleresult:Thread ID not match,creater:"+str(self._threadId)+" caller:"+str(threading.get_ident())
-        #     raise OperationalError(info)
-        # print(info)
-        # return None
-
         self._description = []
         for ele in self._fields:
             self._description.append(

src/connector/python/windows/python2/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.4",
+    version="2.0.7",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/windows/python2/taos/cinterface.py

@@ -22,10 +22,10 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
 
     if num_of_rows > 0:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
 
 
 def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
@@ -145,10 +145,10 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """
     if num_of_rows > 0:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
     else:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
 
 
 def _crow_bigint_unsigned_to_python(
@@ -162,13 +162,13 @@ def _crow_bigint_unsigned_to_python(
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
 
 
@@ -600,7 +600,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_INT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BIGINT):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_FLOAT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_DOUBLE):
@@ -608,7 +608,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BINARY):
     #         return (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char))[0:byte]).rstrip('\x00')
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_TIMESTAMP):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_NCHAR):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 

src/connector/python/windows/python2/taos/cursor.py

 from .cinterface import CTaosInterface
 from .error import *
 from .constants import FieldType
-import threading
 
 # querySeqNum = 0
 
@@ -38,7 +37,6 @@ class TDengineCursor(object):
         self._block_iter = 0
         self._affected_rows = 0
         self._logfile = ""
-        self._threadId = threading.get_ident()
 
         if connection is not None:
             self._connection = connection

src/connector/python/windows/python3/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.4",
+    version="2.0.7",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/windows/python3/taos/cinterface.py

@@ -22,10 +22,10 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
 
     if num_of_rows > 0:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]))
 
 
 def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
@@ -145,10 +145,10 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """
     if num_of_rows > 0:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
     else:
         return [None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(
-            data, ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]]
+            data, ctypes.POINTER(ctypes.c_int64))[:abs(num_of_rows)]]
 
 
 def _crow_bigint_unsigned_to_python(
@@ -162,13 +162,13 @@ def _crow_bigint_unsigned_to_python(
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_ulong))[
+                    ctypes.c_uint64))[
                 :abs(num_of_rows)]]
 
 
@@ -600,7 +600,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_INT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BIGINT):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_FLOAT):
     #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_DOUBLE):
@@ -608,7 +608,7 @@ class CTaosInterface(object):
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_BINARY):
     #         return (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char))[0:byte]).rstrip('\x00')
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_TIMESTAMP):
-    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[0]
+    #         return ctypes.cast(data,  ctypes.POINTER(ctypes.c_int64))[0]
     #     elif (dtype == CTaosInterface.TSDB_DATA_TYPE_NCHAR):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 

src/connector/python/windows/python3/taos/cursor.py

 from .cinterface import CTaosInterface
 from .error import *
 from .constants import FieldType
-import threading
 
 # querySeqNum = 0
 
@@ -38,7 +37,6 @@ class TDengineCursor(object):
         self._block_iter = 0
         self._affected_rows = 0
         self._logfile = ""
-        self._threadId = threading.get_ident()
 
         if connection is not None:
             self._connection = connection

src/kit/taosdemo/insert.json

@@ -11,6 +11,7 @@
     "confirm_parameter_prompt": "no",
     "insert_interval": 0,
     "num_of_records_per_req": 100,
+    "max_sql_len": 1024000,
 	"databases": [{
 		"dbinfo": {
 			"name": "db",
@@ -38,7 +39,9 @@
 			"auto_create_table": "no",
 			"data_source": "rand",
 			"insert_mode": "taosc",
-			"insert_rows": 100000,
+            "childtable_limit": 33,
+            "childtable_offset": 33,
+			"insert_rows": 1000,
 			"multi_thread_write_one_tbl": "no",
 			"number_of_tbl_in_one_sql": 0,
 			"rows_per_tbl": 100,

src/kit/taosdemo/taosdemo.c

@@ -98,6 +98,8 @@ extern char configDir[];
 #define   MAX_DATABASE_COUNT     256
 #define INPUT_BUF_LEN   256
 
+#define DEFAULT_TIMESTAMP_STEP  10
+
 typedef enum CREATE_SUB_TALBE_MOD_EN {
   PRE_CREATE_SUBTBL,
   AUTO_CREATE_SUBTBL,
@@ -196,6 +198,7 @@ typedef struct SArguments_S {
   int      num_of_threads;
   int      insert_interval;
   int      num_of_RPR;
+  int      max_sql_len;
   int      num_of_tables;
   int      num_of_DPT;
   int      abort;
@@ -222,6 +225,8 @@ typedef struct SSuperTable_S {
   char         childTblPrefix[MAX_TB_NAME_SIZE];
   char         dataSource[MAX_TB_NAME_SIZE+1];  // rand_gen or sample
   char         insertMode[MAX_TB_NAME_SIZE];  // taosc, restful
+  int           childTblLimit;
+  int           childTblOffset;
 
   int          multiThreadWriteOneTbl;   // 0: no, 1: yes
   int          numberOfTblInOneSql;      // 0/1: one table, > 1: number of tbl
@@ -230,6 +235,7 @@ typedef struct SSuperTable_S {
   int          disorderRange;            // ms or us by database precision
   int          maxSqlLen;                // 
 
+  int          insertInterval;          // insert interval, will override global insert interval
   int64_t      insertRows;               // 0: no limit
   int          timeStampStep;
   char         startTimestamp[MAX_TB_NAME_SIZE];  // 
@@ -258,7 +264,7 @@ typedef struct SSuperTable_S {
   int          tagUsePos;
 
   // statistics  
-  int64_t    totalRowsInserted;
+  int64_t    totalInsertRows;
   int64_t    totalAffectedRows;
 } SSuperTable;
 
@@ -328,7 +334,7 @@ typedef struct SDbs_S {
   SDataBase    db[MAX_DB_COUNT];
 
   // statistics
-  int64_t    totalRowsInserted;
+  int64_t    totalInsertRows;
   int64_t    totalAffectedRows;
 
 } SDbs;
@@ -399,7 +405,7 @@ typedef struct SThreadInfo_S {
   int64_t  lastTs;
 
   // statistics
-  int64_t totalRowsInserted;
+  int64_t totalInsertRows;
   int64_t totalAffectedRows;
 
   // insert delay statistics
@@ -513,6 +519,7 @@ SArguments g_args = {
                      10,              // num_of_connections/thread
                      0,               // insert_interval
                      100,             // num_of_RPR
+                     TSDB_PAYLOAD_SIZE,  // max_sql_len
                      10000,           // num_of_tables
                      10000,           // num_of_DPT
                      0,               // abort
@@ -739,7 +746,8 @@ void parse_args(int argc, char *argv[], SArguments *arguments) {
     }
   }
 
-  if (arguments->debug_print) {
+  if (((arguments->debug_print) && (arguments->metaFile == NULL))
+          || arguments->verbose_print) {
     printf("###################################################################\n");
     printf("# meta file:                         %s\n", arguments->metaFile);
     printf("# Server IP:                         %s:%hu\n", 
@@ -759,6 +767,8 @@ void parse_args(int argc, char *argv[], SArguments *arguments) {
     }
     printf("# Insertion interval:                %d\n", arguments->insert_interval);
     printf("# Number of records per req:         %d\n", arguments->num_of_RPR);
+    printf("# Max SQL length:                    %d\n", arguments->max_sql_len);
+    printf("# Length of Binary:                  %d\n", arguments->len_of_binary);
     printf("# Number of Threads:                 %d\n", arguments->num_of_threads);
     printf("# Number of Tables:                  %d\n", arguments->num_of_tables);
     printf("# Number of Data per Table:          %d\n", arguments->num_of_DPT);
@@ -772,6 +782,7 @@ void parse_args(int argc, char *argv[], SArguments *arguments) {
     printf("# Delete method:                     %d\n", arguments->method_of_delete);
     printf("# Answer yes when prompt:            %d\n", arguments->answer_yes);
     printf("# Print debug info:                  %d\n", arguments->debug_print);
+    printf("# Print verbose info:                %d\n", arguments->verbose_print);
     printf("###################################################################\n");
     if (!arguments->answer_yes) {
         printf("Press enter key to continue\n\n");
@@ -1004,6 +1015,7 @@ static int printfInsertMeta() {
   printf("thread num of create table: \033[33m%d\033[0m\n", g_Dbs.threadCountByCreateTbl);
   printf("insert interval:            \033[33m%d\033[0m\n", g_args.insert_interval);
   printf("number of records per req:  \033[33m%d\033[0m\n", g_args.num_of_RPR);
+  printf("max sql length:             \033[33m%d\033[0m\n", g_args.max_sql_len);
 
   printf("database count:             \033[33m%d\033[0m\n", g_Dbs.dbCount);
   for (int i = 0; i < g_Dbs.dbCount; i++) {
@@ -1088,6 +1100,12 @@ static int printfInsertMeta() {
       printf("      childTblPrefix:    \033[33m%s\033[0m\n",  g_Dbs.db[i].superTbls[j].childTblPrefix);
       printf("      dataSource:        \033[33m%s\033[0m\n",  g_Dbs.db[i].superTbls[j].dataSource);
       printf("      insertMode:        \033[33m%s\033[0m\n",  g_Dbs.db[i].superTbls[j].insertMode);
+      if (g_Dbs.db[i].superTbls[j].childTblLimit > 0) {
+        printf("      childTblLimit:     \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].childTblLimit);
+      }
+      if (g_Dbs.db[i].superTbls[j].childTblOffset > 0) {
+        printf("      childTblOffset:    \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].childTblOffset);
+      }
       printf("      insertRows:        \033[33m%"PRId64"\033[0m\n", g_Dbs.db[i].superTbls[j].insertRows);
 
       if (0 == g_Dbs.db[i].superTbls[j].multiThreadWriteOneTbl) {
@@ -1095,25 +1113,37 @@ static int printfInsertMeta() {
       }else {
         printf("      multiThreadWriteOneTbl:  \033[33myes\033[0m\n");
       }
-      printf("      numberOfTblInOneSql:     \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].numberOfTblInOneSql);     
-      printf("      rowsPerTbl:        \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].rowsPerTbl);     
-      printf("      disorderRange:     \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].disorderRange);     
-      printf("      disorderRatio:     \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].disorderRatio);
-      printf("      maxSqlLen:         \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].maxSqlLen);     
-      
-      printf("      timeStampStep:     \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].timeStampStep);      
-      printf("      startTimestamp:    \033[33m%s\033[0m\n",  g_Dbs.db[i].superTbls[j].startTimestamp);             
-      printf("      sampleFormat:      \033[33m%s\033[0m\n",  g_Dbs.db[i].superTbls[j].sampleFormat);
-      printf("      sampleFile:        \033[33m%s\033[0m\n",  g_Dbs.db[i].superTbls[j].sampleFile); 
-      printf("      tagsFile:          \033[33m%s\033[0m\n",  g_Dbs.db[i].superTbls[j].tagsFile);   
-    
-      printf("      columnCount:       \033[33m%d\033[0m\n        ",  g_Dbs.db[i].superTbls[j].columnCount);
+      printf("      numberOfTblInOneSql:     \033[33m%d\033[0m\n",
+              g_Dbs.db[i].superTbls[j].numberOfTblInOneSql);
+      printf("      rowsPerTbl:        \033[33m%d\033[0m\n",
+              g_Dbs.db[i].superTbls[j].rowsPerTbl);
+      printf("      disorderRange:     \033[33m%d\033[0m\n",
+              g_Dbs.db[i].superTbls[j].disorderRange);
+      printf("      disorderRatio:     \033[33m%d\033[0m\n",
+              g_Dbs.db[i].superTbls[j].disorderRatio);
+      printf("      maxSqlLen:         \033[33m%d\033[0m\n",
+              g_Dbs.db[i].superTbls[j].maxSqlLen);
+      printf("      timeStampStep:     \033[33m%d\033[0m\n",
+              g_Dbs.db[i].superTbls[j].timeStampStep);
+      printf("      startTimestamp:    \033[33m%s\033[0m\n",
+              g_Dbs.db[i].superTbls[j].startTimestamp);
+      printf("      sampleFormat:      \033[33m%s\033[0m\n",
+              g_Dbs.db[i].superTbls[j].sampleFormat);
+      printf("      sampleFile:        \033[33m%s\033[0m\n",
+              g_Dbs.db[i].superTbls[j].sampleFile);
+      printf("      tagsFile:          \033[33m%s\033[0m\n",
+              g_Dbs.db[i].superTbls[j].tagsFile);
+      printf("      columnCount:       \033[33m%d\033[0m\n        ",
+              g_Dbs.db[i].superTbls[j].columnCount);
       for (int k = 0; k < g_Dbs.db[i].superTbls[j].columnCount; k++) {
         //printf("dataType:%s, dataLen:%d\t", g_Dbs.db[i].superTbls[j].columns[k].dataType, g_Dbs.db[i].superTbls[j].columns[k].dataLen);
-        if ((0 == strncasecmp(g_Dbs.db[i].superTbls[j].columns[k].dataType, "binary", 6))
-                || (0 == strncasecmp(g_Dbs.db[i].superTbls[j].columns[k].dataType, "nchar", 5))) {
+        if ((0 == strncasecmp(g_Dbs.db[i].superTbls[j].columns[k].dataType,
+                       "binary", 6))
+                || (0 == strncasecmp(g_Dbs.db[i].superTbls[j].columns[k].dataType,
+                       "nchar", 5))) {
           printf("column[\033[33m%d\033[0m]:\033[33m%s(%d)\033[0m ", k,
-                  g_Dbs.db[i].superTbls[j].columns[k].dataType, g_Dbs.db[i].superTbls[j].columns[k].dataLen);
+                  g_Dbs.db[i].superTbls[j].columns[k].dataType,
+                  g_Dbs.db[i].superTbls[j].columns[k].dataLen);
         } else {
           printf("column[%d]:\033[33m%s\033[0m ", k,
                   g_Dbs.db[i].superTbls[j].columns[k].dataType);
@@ -1128,7 +1158,8 @@ static int printfInsertMeta() {
         if ((0 == strncasecmp(g_Dbs.db[i].superTbls[j].tags[k].dataType, "binary", 6))
                 || (0 == strncasecmp(g_Dbs.db[i].superTbls[j].tags[k].dataType, "nchar", 5))) {
           printf("tag[%d]:\033[33m%s(%d)\033[0m ", k,
-                  g_Dbs.db[i].superTbls[j].tags[k].dataType, g_Dbs.db[i].superTbls[j].tags[k].dataLen);
+                  g_Dbs.db[i].superTbls[j].tags[k].dataType,
+                  g_Dbs.db[i].superTbls[j].tags[k].dataLen);
         } else {
           printf("tag[%d]:\033[33m%s\033[0m ", k,
                   g_Dbs.db[i].superTbls[j].tags[k].dataType);
@@ -1236,6 +1267,7 @@ static void printfInsertMetaToFile(FILE* fp) {
       fprintf(fp, "      dataSource:        %s\n",  g_Dbs.db[i].superTbls[j].dataSource);      
       fprintf(fp, "      insertMode:        %s\n",  g_Dbs.db[i].superTbls[j].insertMode);      
       fprintf(fp, "      insertRows:        %"PRId64"\n", g_Dbs.db[i].superTbls[j].insertRows); 
+      fprintf(fp, "      insert interval:   %d\n", g_Dbs.db[i].superTbls[j].insertInterval);
 
       if (0 == g_Dbs.db[i].superTbls[j].multiThreadWriteOneTbl) {
         fprintf(fp, "      multiThreadWriteOneTbl:  no\n");     
@@ -1765,8 +1797,7 @@ int postProceSql(char* host, uint16_t port, char* sqlstr)
     return 0;
 }
 
-
-char* getTagValueFromTagSample(        SSuperTable* stbInfo, int tagUsePos) {
+static char* getTagValueFromTagSample(SSuperTable* stbInfo, int tagUsePos) {
   char*  dataBuf = (char*)calloc(TSDB_MAX_SQL_LEN+1, 1);
   if (NULL == dataBuf) {
     printf("calloc failed! size:%d\n", TSDB_MAX_SQL_LEN+1);
@@ -1774,12 +1805,13 @@ char* getTagValueFromTagSample(        SSuperTable* stbInfo, int tagUsePos) {
   }
 
   int    dataLen = 0;
-  dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "(%s)", stbInfo->tagDataBuf + stbInfo->lenOfTagOfOneRow * tagUsePos);
+  dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+          "(%s)", stbInfo->tagDataBuf + stbInfo->lenOfTagOfOneRow * tagUsePos);
 
   return dataBuf;
 }
 
-char* generateTagVaulesForStb(SSuperTable* stbInfo) {
+static char* generateTagVaulesForStb(SSuperTable* stbInfo) {
   char*  dataBuf = (char*)calloc(TSDB_MAX_SQL_LEN+1, 1);
   if (NULL == dataBuf) {
     printf("calloc failed! size:%d\n", TSDB_MAX_SQL_LEN+1);
@@ -1789,9 +1821,11 @@ char* generateTagVaulesForStb(SSuperTable* stbInfo) {
   int    dataLen = 0;
   dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "(");
   for (int i = 0; i < stbInfo->tagCount; i++) {
-    if ((0 == strncasecmp(stbInfo->tags[i].dataType, "binary", 6)) || (0 == strncasecmp(stbInfo->tags[i].dataType, "nchar", 5))) {
+    if ((0 == strncasecmp(stbInfo->tags[i].dataType, "binary", strlen("binary")))
+            || (0 == strncasecmp(stbInfo->tags[i].dataType, "nchar", strlen("nchar")))) {
       if (stbInfo->tags[i].dataLen > TSDB_MAX_BINARY_LEN) {
-        printf("binary or nchar length overflow, max size:%u\n", (uint32_t)TSDB_MAX_BINARY_LEN);
+        printf("binary or nchar length overflow, max size:%u\n",
+                (uint32_t)TSDB_MAX_BINARY_LEN);
         tmfree(dataBuf);
         return NULL;
       }
@@ -1803,30 +1837,48 @@ char* generateTagVaulesForStb(SSuperTable* stbInfo) {
         return NULL;
       }
       rand_string(buf, stbInfo->tags[i].dataLen);
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "\'%s\', ", buf);
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "\'%s\', ", buf);
       tmfree(buf);
-    } else if (0 == strncasecmp(stbInfo->tags[i].dataType, "int", 3)) {
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "%d, ", rand_int());
-    } else if (0 == strncasecmp(stbInfo->tags[i].dataType, "bigint", 6)) {
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "%"PRId64", ", rand_bigint());
-    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType, "float", 5)) {
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "%f, ", rand_float());
-    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType, "double", 6)) {
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "%f, ", rand_double());
-    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType, "smallint", 8)) {
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "%d, ", rand_smallint());
-    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType, "tinyint", 7)) {
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "%d, ", rand_tinyint());
-    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType, "bool", 4)) {
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "%d, ", rand_bool());
-    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType, "timestamp", 4)) {
-      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, "%"PRId64", ", rand_bigint());
+    } else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+                "int", strlen("int"))) {
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "%d, ", rand_int());
+    } else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+                "bigint", strlen("bigint"))) {
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "%"PRId64", ", rand_bigint());
+    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+                "float", strlen("float"))) {
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "%f, ", rand_float());
+    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+                "double", strlen("double"))) {
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "%f, ", rand_double());
+    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+                "smallint", strlen("smallint"))) {
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "%d, ", rand_smallint());
+    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+                "tinyint", strlen("tinyint"))) {
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "%d, ", rand_tinyint());
+    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+                "bool", strlen("bool"))) {
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "%d, ", rand_bool());
+    }  else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+                "timestamp", strlen("timestamp"))) {
+      dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+              "%"PRId64", ", rand_bigint());
     }  else {
       printf("No support data type: %s\n", stbInfo->tags[i].dataType);
       tmfree(dataBuf);
       return NULL;
     }
   }
+
   dataLen -= 2;
   dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen, ")");  
   return dataBuf;
@@ -1902,15 +1954,25 @@ static int calcRowLen(SSuperTable*  superTbls) {
 }
 
 
-static int getAllChildNameOfSuperTable(TAOS * taos, char* dbName, char* sTblName, char** childTblNameOfSuperTbl, int* childTblCountOfSuperTbl) {  
+static int getChildNameOfSuperTableWithLimitAndOffset(TAOS * taos,
+        char* dbName, char* sTblName, char** childTblNameOfSuperTbl,
+        int* childTblCountOfSuperTbl, int limit, int offset) {
+
   char command[BUFFER_SIZE] = "\0";
+  char limitBuf[100] = "\0";
+
   TAOS_RES * res;  
   TAOS_ROW row = NULL;
 
   char* childTblName = *childTblNameOfSuperTbl;
 
+  if (offset >= 0) {
+    snprintf(limitBuf, 100, " limit %d offset %d", limit, offset);
+  }
+
   //get all child table name use cmd: select tbname from superTblName;  
-  snprintf(command, BUFFER_SIZE, "select tbname from %s.%s", dbName, sTblName);
+  snprintf(command, BUFFER_SIZE, "select tbname from %s.%s %s", dbName, sTblName, limitBuf);
+
   res = taos_query(taos, command);  
   int32_t code = taos_errno(res);
   if (code != 0) {
@@ -1920,7 +1982,7 @@ static int getAllChildNameOfSuperTable(TAOS * taos, char* dbName, char* sTblName
     exit(-1);
   }
 
-  int childTblCount = 10000;
+  int childTblCount = (limit < 0)?10000:limit;
   int count = 0;
   childTblName = (char*)calloc(1, childTblCount * TSDB_TABLE_NAME_LEN);
   char* pTblName = childTblName;
@@ -1934,7 +1996,8 @@ static int getAllChildNameOfSuperTable(TAOS * taos, char* dbName, char* sTblName
       if (tmp != NULL) {
         childTblName = tmp;
         childTblCount = (int)(childTblCount*1.5);
-        memset(childTblName + count*TSDB_TABLE_NAME_LEN, 0, (size_t)((childTblCount-count)*TSDB_TABLE_NAME_LEN));
+        memset(childTblName + count*TSDB_TABLE_NAME_LEN, 0,
+                (size_t)((childTblCount-count)*TSDB_TABLE_NAME_LEN));
       } else {
         // exit, if allocate more memory failed
         printf("realloc fail for save child table name of %s.%s\n", dbName, sTblName);
@@ -1954,7 +2017,17 @@ static int getAllChildNameOfSuperTable(TAOS * taos, char* dbName, char* sTblName
   return 0;
 }
 
-static int getSuperTableFromServer(TAOS * taos, char* dbName, SSuperTable*  superTbls) {  
+static int getAllChildNameOfSuperTable(TAOS * taos, char* dbName,
+        char* sTblName, char** childTblNameOfSuperTbl,
+        int* childTblCountOfSuperTbl) {
+
+    return getChildNameOfSuperTableWithLimitAndOffset(taos, dbName, sTblName,
+            childTblNameOfSuperTbl, childTblCountOfSuperTbl,
+            -1, -1);
+}
+
+static int getSuperTableFromServer(TAOS * taos, char* dbName,
+        SSuperTable*  superTbls) {
   char command[BUFFER_SIZE] = "\0";
   TAOS_RES * res;  
   TAOS_ROW row = NULL;
@@ -1980,16 +2053,30 @@ static int getSuperTableFromServer(TAOS * taos, char* dbName, SSuperTable*  supe
     }
 
     if (strcmp((char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX], "TAG") == 0) {
-      tstrncpy(superTbls->tags[tagIndex].field, (char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX], fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
-      tstrncpy(superTbls->tags[tagIndex].dataType, (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX], fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes);
-      superTbls->tags[tagIndex].dataLen = *((int *)row[TSDB_DESCRIBE_METRIC_LENGTH_INDEX]);
-      tstrncpy(superTbls->tags[tagIndex].note, (char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX], fields[TSDB_DESCRIBE_METRIC_NOTE_INDEX].bytes);
+      tstrncpy(superTbls->tags[tagIndex].field,
+              (char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX],
+              fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
+      tstrncpy(superTbls->tags[tagIndex].dataType,
+              (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+              fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes);
+      superTbls->tags[tagIndex].dataLen =
+          *((int *)row[TSDB_DESCRIBE_METRIC_LENGTH_INDEX]);
+      tstrncpy(superTbls->tags[tagIndex].note,
+              (char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX],
+              fields[TSDB_DESCRIBE_METRIC_NOTE_INDEX].bytes);
       tagIndex++;
     } else {
-      tstrncpy(superTbls->columns[columnIndex].field, (char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX], fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
-      tstrncpy(superTbls->columns[columnIndex].dataType, (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX], fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes);
-      superTbls->columns[columnIndex].dataLen = *((int *)row[TSDB_DESCRIBE_METRIC_LENGTH_INDEX]);
-      tstrncpy(superTbls->columns[columnIndex].note, (char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX], fields[TSDB_DESCRIBE_METRIC_NOTE_INDEX].bytes);
+      tstrncpy(superTbls->columns[columnIndex].field,
+              (char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX],
+              fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
+      tstrncpy(superTbls->columns[columnIndex].dataType,
+              (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+              fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes);
+      superTbls->columns[columnIndex].dataLen =
+          *((int *)row[TSDB_DESCRIBE_METRIC_LENGTH_INDEX]);
+      tstrncpy(superTbls->columns[columnIndex].note,
+              (char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX],
+              fields[TSDB_DESCRIBE_METRIC_NOTE_INDEX].bytes);
       columnIndex++;
     }
     count++;
@@ -2003,7 +2090,10 @@ static int getSuperTableFromServer(TAOS * taos, char* dbName, SSuperTable*  supe
 
   if (TBL_ALREADY_EXISTS == superTbls->childTblExists) {
     //get all child table name use cmd: select tbname from superTblName;  
-    getAllChildNameOfSuperTable(taos, dbName, superTbls->sTblName, &superTbls->childTblName, &superTbls->childTblCount);  
+    getAllChildNameOfSuperTable(taos, dbName,
+            superTbls->sTblName,
+            &superTbls->childTblName,
+            &superTbls->childTblCount);
   }
   return 0;
 }
@@ -2084,31 +2174,40 @@ static int createSuperTable(TAOS * taos, char* dbName, SSuperTable*  superTbls,
       char* dataType = superTbls->tags[tagIndex].dataType;
 
       if (strcasecmp(dataType, "BINARY") == 0) {
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s(%d), ", tagIndex, "BINARY", superTbls->tags[tagIndex].dataLen);
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s(%d), ", tagIndex,
+                "BINARY", superTbls->tags[tagIndex].dataLen);
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 3;
       } else if (strcasecmp(dataType, "NCHAR") == 0) {
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s(%d), ", tagIndex, "NCHAR", superTbls->tags[tagIndex].dataLen);
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s(%d), ", tagIndex,
+                "NCHAR", superTbls->tags[tagIndex].dataLen);
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 3;
       } else if (strcasecmp(dataType, "INT") == 0)  {
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex, "INT");
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex,
+                "INT");
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 11;
       } else if (strcasecmp(dataType, "BIGINT") == 0)  {
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex, "BIGINT");
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex,
+                "BIGINT");
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 21;
       } else if (strcasecmp(dataType, "SMALLINT") == 0)  {
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex, "SMALLINT");
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex,
+                "SMALLINT");
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 6;
       } else if (strcasecmp(dataType, "TINYINT") == 0)  {
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex, "TINYINT");
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex,
+                "TINYINT");
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 4;
       } else if (strcasecmp(dataType, "BOOL") == 0)  {
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex, "BOOL");
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex,
+                "BOOL");
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 6;
       } else if (strcasecmp(dataType, "FLOAT") == 0) {
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex, "FLOAT");
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex,
+                "FLOAT");
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 22;
       } else if (strcasecmp(dataType, "DOUBLE") == 0) { 
-        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex, "DOUBLE");
+        len += snprintf(tags + len, STRING_LEN - len, "t%d %s, ", tagIndex,
+                "DOUBLE");
         lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 42;
       } else {
         taos_close(taos);
@@ -2127,7 +2226,8 @@ static int createSuperTable(TAOS * taos, char* dbName, SSuperTable*  superTbls,
     verbosePrint("%s() LN%d: %s\n", __func__, __LINE__, command);
 
     if (0 != queryDbExec(taos, command, NO_INSERT_TYPE)) {
-        fprintf(stderr, "create supertable %s failed!\n\n", superTbls->sTblName);
+        fprintf(stderr, "create supertable %s failed!\n\n",
+                superTbls->sTblName);
         return -1;
     }
     debugPrint("create supertable %s success!\n\n", superTbls->sTblName);
@@ -2135,7 +2235,6 @@ static int createSuperTable(TAOS * taos, char* dbName, SSuperTable*  superTbls,
   return 0;
 }
 
-
 static int createDatabases() {
   TAOS * taos = NULL;
   int    ret = 0;
@@ -2158,31 +2257,35 @@ static int createDatabases() {
 
     int dataLen = 0;
     dataLen += snprintf(command + dataLen, 
-        BUFFER_SIZE - dataLen, "create database if not exists %s ", g_Dbs.db[i].dbName);
+        BUFFER_SIZE - dataLen, "create database if not exists %s", g_Dbs.db[i].dbName);
 
     if (g_Dbs.db[i].dbCfg.blocks > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "blocks %d ", g_Dbs.db[i].dbCfg.blocks);
+          BUFFER_SIZE - dataLen, " blocks %d", g_Dbs.db[i].dbCfg.blocks);
     }
     if (g_Dbs.db[i].dbCfg.cache > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "cache %d ", g_Dbs.db[i].dbCfg.cache);
+          BUFFER_SIZE - dataLen, " cache %d", g_Dbs.db[i].dbCfg.cache);
     }
     if (g_Dbs.db[i].dbCfg.days > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "days %d ", g_Dbs.db[i].dbCfg.days);
+          BUFFER_SIZE - dataLen, " days %d", g_Dbs.db[i].dbCfg.days);
     }
     if (g_Dbs.db[i].dbCfg.keep > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "keep %d ", g_Dbs.db[i].dbCfg.keep);
+          BUFFER_SIZE - dataLen, " keep %d", g_Dbs.db[i].dbCfg.keep);
+    }
+    if (g_Dbs.db[i].dbCfg.quorum > 1) {
+      dataLen += snprintf(command + dataLen,
+          BUFFER_SIZE - dataLen, " quorum %d", g_Dbs.db[i].dbCfg.quorum);
     }
     if (g_Dbs.db[i].dbCfg.replica > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "replica %d ", g_Dbs.db[i].dbCfg.replica);
+          BUFFER_SIZE - dataLen, " replica %d", g_Dbs.db[i].dbCfg.replica);
     }
     if (g_Dbs.db[i].dbCfg.update > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "update %d ", g_Dbs.db[i].dbCfg.update);
+          BUFFER_SIZE - dataLen, " update %d", g_Dbs.db[i].dbCfg.update);
     }
     //if (g_Dbs.db[i].dbCfg.maxtablesPerVnode > 0) {
     //  dataLen += snprintf(command + dataLen,
@@ -2190,31 +2293,32 @@ static int createDatabases() {
     //}
     if (g_Dbs.db[i].dbCfg.minRows > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "minrows %d ", g_Dbs.db[i].dbCfg.minRows);
+          BUFFER_SIZE - dataLen, " minrows %d", g_Dbs.db[i].dbCfg.minRows);
     }
     if (g_Dbs.db[i].dbCfg.maxRows > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "maxrows %d ", g_Dbs.db[i].dbCfg.maxRows);
+          BUFFER_SIZE - dataLen, " maxrows %d", g_Dbs.db[i].dbCfg.maxRows);
     }
     if (g_Dbs.db[i].dbCfg.comp > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "comp %d ", g_Dbs.db[i].dbCfg.comp);
+          BUFFER_SIZE - dataLen, " comp %d", g_Dbs.db[i].dbCfg.comp);
     }
     if (g_Dbs.db[i].dbCfg.walLevel > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "wal %d ", g_Dbs.db[i].dbCfg.walLevel);
+          BUFFER_SIZE - dataLen, " wal %d", g_Dbs.db[i].dbCfg.walLevel);
     }
     if (g_Dbs.db[i].dbCfg.cacheLast > 0) {
       dataLen += snprintf(command + dataLen,
-          BUFFER_SIZE - dataLen, "cachelast %d ", g_Dbs.db[i].dbCfg.cacheLast);
+          BUFFER_SIZE - dataLen, " cachelast %d", g_Dbs.db[i].dbCfg.cacheLast);
     }
     if (g_Dbs.db[i].dbCfg.fsync > 0) {
-      dataLen += snprintf(command + dataLen, BUFFER_SIZE - dataLen, "fsync %d ", g_Dbs.db[i].dbCfg.fsync);
+      dataLen += snprintf(command + dataLen, BUFFER_SIZE - dataLen,
+              " fsync %d", g_Dbs.db[i].dbCfg.fsync);
     }
-    if ((0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "ms", 2))
-            || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "us", 2))) {
+    if ((0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "ms", strlen("ms")))
+            || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "us", strlen("us")))) {
       dataLen += snprintf(command + dataLen, BUFFER_SIZE - dataLen,
-              "precision \'%s\';", g_Dbs.db[i].dbCfg.precision);
+              " precision \'%s\';", g_Dbs.db[i].dbCfg.precision);
     }
 
     debugPrint("%s() %d command: %s\n", __func__, __LINE__, command);
@@ -2344,7 +2448,7 @@ static void* createTable(void *sarg)
 }
 
 int startMultiThreadCreateChildTable(
-        char* cols, int threads, int ntables,
+        char* cols, int threads, int startFrom, int ntables,
         char* db_name, SSuperTable* superTblInfo) {
   pthread_t *pids = malloc(threads * sizeof(pthread_t));
   threadInfo *infos = malloc(threads * sizeof(threadInfo));
@@ -2367,7 +2471,7 @@ int startMultiThreadCreateChildTable(
   int b = 0;
   b = ntables % threads;
  
-  int last = 0;
+  int last = startFrom;
   for (int i = 0; i < threads; i++) {
     threadInfo *t_info = infos + i;
     t_info->threadID = i;
@@ -2426,12 +2530,17 @@ static void createChildTables() {
 
         verbosePrint("%s() LN%d: %s\n", __func__, __LINE__,
                 g_Dbs.db[i].superTbls[j].colsOfCreateChildTable);
+        int startFrom = 0;
+        g_totalChildTables += g_Dbs.db[i].superTbls[j].childTblCount;
+
+        verbosePrint("%s() LN%d: create %d child tables from %d\n", __func__, __LINE__,
+              g_totalChildTables, startFrom);  
         startMultiThreadCreateChildTable(
               g_Dbs.db[i].superTbls[j].colsOfCreateChildTable,
               g_Dbs.threadCountByCreateTbl,
-              g_Dbs.db[i].superTbls[j].childTblCount,
+              startFrom,
+              g_totalChildTables,
               g_Dbs.db[i].dbName, &(g_Dbs.db[i].superTbls[j]));
-        g_totalChildTables += g_Dbs.db[i].superTbls[j].childTblCount;
       }
     } else {
         // normal table
@@ -2439,10 +2548,13 @@ static void createChildTables() {
         int j = 0;
         while (g_args.datatype[j]) {
             if ((strncasecmp(g_args.datatype[j], "BINARY", strlen("BINARY")) == 0)
-                    || (strncasecmp(g_args.datatype[j], "NCHAR", strlen("NCHAR")) == 0)) {
-                len = snprintf(tblColsBuf + len, MAX_SQL_SIZE, ", COL%d %s(60)", j, g_args.datatype[j]);
+                    || (strncasecmp(g_args.datatype[j],
+                        "NCHAR", strlen("NCHAR")) == 0)) {
+                len = snprintf(tblColsBuf + len, MAX_SQL_SIZE,
+                        ", COL%d %s(60)", j, g_args.datatype[j]);
             } else {
-                len = snprintf(tblColsBuf + len, MAX_SQL_SIZE, ", COL%d %s", j, g_args.datatype[j]);
+                len = snprintf(tblColsBuf + len, MAX_SQL_SIZE,
+                        ", COL%d %s", j, g_args.datatype[j]);
             }
             len = strlen(tblColsBuf);
             j++;
@@ -2450,11 +2562,13 @@ static void createChildTables() {
 
         len = snprintf(tblColsBuf + len, MAX_SQL_SIZE - len, ")");
 
-        verbosePrint("%s() LN%d: dbName: %s num of tb: %d schema: %s\n", __func__, __LINE__,
+        verbosePrint("%s() LN%d: dbName: %s num of tb: %d schema: %s\n",
+                __func__, __LINE__,
                 g_Dbs.db[i].dbName, g_args.num_of_tables, tblColsBuf);
         startMultiThreadCreateChildTable(
               tblColsBuf,
               g_Dbs.threadCountByCreateTbl,
+              0,
               g_args.num_of_tables,
               g_Dbs.db[i].dbName,
               NULL);
@@ -2462,30 +2576,6 @@ static void createChildTables() {
   }
 }
 
-/*
-static int taosGetLineNum(const char *fileName)
-{
-  int lineNum = 0;
-  char cmd[1024] = { 0 };
-  char buf[1024] = { 0 };
-  sprintf(cmd, "wc -l %s", fileName);
-
-  FILE *fp = popen(cmd, "r");
-  if (fp == NULL) {
-    fprintf(stderr, "ERROR: failed to execute:%s, error:%s\n", cmd, strerror(errno));
-    return lineNum;
-  }
-
-  if (fgets(buf, sizeof(buf), fp)) {
-    int index = strchr((const char*)buf, ' ') - buf;
-    buf[index] = '\0';
-    lineNum = atoi(buf);
-  }
-  pclose(fp);
-  return lineNum;
-}
-*/
-
 /*
   Read 10000 lines at most. If more than 10000 lines, continue to read after using
 */
@@ -2563,19 +2653,29 @@ int readSampleFromJsonFileToMem(SSuperTable  * superTblInfo) {
 /*
   Read 10000 lines at most. If more than 10000 lines, continue to read after using
 */
-int readSampleFromCsvFileToMem(FILE *fp, SSuperTable* superTblInfo, char* sampleBuf) {
+static int readSampleFromCsvFileToMem(
+        SSuperTable* superTblInfo) {
   size_t  n = 0;
   ssize_t readLen = 0;
   char *  line = NULL;
   int getRows = 0;
  
-  memset(sampleBuf, 0, MAX_SAMPLES_ONCE_FROM_FILE* superTblInfo->lenOfOneRow);
+  FILE*  fp = fopen(superTblInfo->sampleFile, "r");
+  if (fp == NULL) {
+      fprintf(stderr, "Failed to open sample file: %s, reason:%s\n",
+              superTblInfo->sampleFile, strerror(errno));
+      return -1;
+  }
+
+  memset(superTblInfo->sampleDataBuf, 0,
+          MAX_SAMPLES_ONCE_FROM_FILE * superTblInfo->lenOfOneRow);
   while (1) {
     readLen = tgetline(&line, &n, fp);
     if (-1 == readLen) {
       if(0 != fseek(fp, 0, SEEK_SET)) {
-        printf("Failed to fseek file: %s, reason:%s\n",
+        fprintf(stderr, "Failed to fseek file: %s, reason:%s\n",
                 superTblInfo->sampleFile, strerror(errno));
+        fclose(fp);
         return -1;
       }
       continue;
@@ -2595,7 +2695,8 @@ int readSampleFromCsvFileToMem(FILE *fp, SSuperTable* superTblInfo, char* sample
       continue;
     }
 
-    memcpy(sampleBuf + getRows * superTblInfo->lenOfOneRow, line, readLen);
+    memcpy(superTblInfo->sampleDataBuf + getRows * superTblInfo->lenOfOneRow,
+          line, readLen);
     getRows++;
 
     if (getRows == MAX_SAMPLES_ONCE_FROM_FILE) {
@@ -2603,6 +2704,7 @@ int readSampleFromCsvFileToMem(FILE *fp, SSuperTable* superTblInfo, char* sample
     }
   }
 
+  fclose(fp);
   tmfree(line);
   return 0;
 }
@@ -2627,7 +2729,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
   // columns 
   cJSON *columns = cJSON_GetObjectItem(stbInfo, "columns");
   if (columns && columns->type != cJSON_Array) {
-    printf("failed to read json, columns not found\n");
+    printf("ERROR: failed to read json, columns not found\n");
     goto PARSE_OVER;
   } else if (NULL == columns) {
     superTbls->columnCount = 0;
@@ -2637,7 +2739,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
   
   int columnSize = cJSON_GetArraySize(columns);
   if (columnSize > MAX_COLUMN_COUNT) {
-    printf("failed to read json, column size overflow, max column size is %d\n",
+    printf("ERROR: failed to read json, column size overflow, max column size is %d\n",
             MAX_COLUMN_COUNT);
     goto PARSE_OVER;
   }
@@ -2656,7 +2758,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
     if (countObj && countObj->type == cJSON_Number) {
       count = countObj->valueint;    
     } else if (countObj && countObj->type != cJSON_Number) {
-      printf("failed to read json, column count not found");
+      printf("ERROR: failed to read json, column count not found\n");
       goto PARSE_OVER;
     } else {
       count = 1;
@@ -2666,7 +2768,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
     memset(&columnCase, 0, sizeof(StrColumn));
     cJSON *dataType = cJSON_GetObjectItem(column, "type");
     if (!dataType || dataType->type != cJSON_String || dataType->valuestring == NULL) {
-      printf("failed to read json, column type not found");
+      printf("ERROR: failed to read json, column type not found\n");
       goto PARSE_OVER;
     }
     //tstrncpy(superTbls->columns[k].dataType, dataType->valuestring, MAX_TB_NAME_SIZE);
@@ -2676,7 +2778,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
     if (dataLen && dataLen->type == cJSON_Number) {
       columnCase.dataLen = dataLen->valueint;    
     } else if (dataLen && dataLen->type != cJSON_Number) {
-      printf("failed to read json, column len not found");
+      printf("ERROR: failed to read json, column len not found\n");
       goto PARSE_OVER;
     } else {
       columnCase.dataLen = 8;
@@ -2695,13 +2797,13 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
   // tags 
   cJSON *tags = cJSON_GetObjectItem(stbInfo, "tags");
   if (!tags || tags->type != cJSON_Array) {
-    printf("failed to read json, tags not found");
+    printf("ERROR: failed to read json, tags not found\n");
     goto PARSE_OVER;
   }
   
   int tagSize = cJSON_GetArraySize(tags);
   if (tagSize > MAX_TAG_COUNT) {
-    printf("failed to read json, tags size overflow, max tag size is %d\n", MAX_TAG_COUNT);
+    printf("ERROR: failed to read json, tags size overflow, max tag size is %d\n", MAX_TAG_COUNT);
     goto PARSE_OVER;
   }
   
@@ -2715,7 +2817,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
     if (countObj && countObj->type == cJSON_Number) {
       count = countObj->valueint;    
     } else if (countObj && countObj->type != cJSON_Number) {
-      printf("failed to read json, column count not found");
+      printf("ERROR: failed to read json, column count not found\n");
       goto PARSE_OVER;
     } else {
       count = 1;
@@ -2725,7 +2827,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
     memset(&columnCase, 0, sizeof(StrColumn));
     cJSON *dataType = cJSON_GetObjectItem(tag, "type");
     if (!dataType || dataType->type != cJSON_String || dataType->valuestring == NULL) {
-      printf("failed to read json, tag type not found");
+      printf("ERROR: failed to read json, tag type not found\n");
       goto PARSE_OVER;
     }
     tstrncpy(columnCase.dataType, dataType->valuestring, MAX_TB_NAME_SIZE);
@@ -2734,7 +2836,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(cJSON* stbInfo, SSuperTable* s
     if (dataLen && dataLen->type == cJSON_Number) {
       columnCase.dataLen = dataLen->valueint;    
     } else if (dataLen && dataLen->type != cJSON_Number) {
-      printf("failed to read json, column len not found");
+      printf("ERROR: failed to read json, column len not found\n");
       goto PARSE_OVER;
     } else {
       columnCase.dataLen = 0;
@@ -2771,7 +2873,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
   } else if (!host) {
     tstrncpy(g_Dbs.host, "127.0.0.1", MAX_DB_NAME_SIZE);
   } else {
-    printf("failed to read json, host not found\n");
+    printf("ERROR: failed to read json, host not found\n");
     goto PARSE_OVER;
   }
 
@@ -2809,7 +2911,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
   } else if (!threads) {
     g_Dbs.threadCount = 1;
   } else {
-    printf("failed to read json, threads not found");
+    printf("ERROR: failed to read json, threads not found\n");
     goto PARSE_OVER;
   }  
  
@@ -2819,27 +2921,38 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
   } else if (!threads2) {
     g_Dbs.threadCountByCreateTbl = 1;
   } else {
-    printf("failed to read json, threads2 not found");
+    printf("ERROR: failed to read json, threads2 not found\n");
     goto PARSE_OVER;
   } 
 
-      cJSON* insertInterval = cJSON_GetObjectItem(root, "insert_interval");
-      if (insertInterval && insertInterval->type == cJSON_Number) {
-        g_args.insert_interval = insertInterval->valueint;
-      } else if (!insertInterval) {
+      cJSON* gInsertInterval = cJSON_GetObjectItem(root, "insert_interval");
+      if (gInsertInterval && gInsertInterval->type == cJSON_Number) {
+        g_args.insert_interval = gInsertInterval->valueint;
+      } else if (!gInsertInterval) {
         g_args.insert_interval = 0;
       } else {
-        printf("failed to read json, insert_interval not found");
+        fprintf(stderr, "ERROR: failed to read json, insert_interval input mistake\n");
+        goto PARSE_OVER;
+      }
+ 
+      cJSON* maxSqlLen = cJSON_GetObjectItem(root, "max_sql_len");
+      if (maxSqlLen && maxSqlLen->type == cJSON_Number) {
+        g_args.max_sql_len = maxSqlLen->valueint;
+      } else if (!maxSqlLen) {
+        g_args.max_sql_len = TSDB_PAYLOAD_SIZE;
+      } else {
+        fprintf(stderr, "ERROR: failed to read json, max_sql_len input mistake\n");
         goto PARSE_OVER;
       }
  
+
       cJSON* numRecPerReq = cJSON_GetObjectItem(root, "num_of_records_per_req");
       if (numRecPerReq && numRecPerReq->type == cJSON_Number) {
         g_args.num_of_RPR = numRecPerReq->valueint;
       } else if (!numRecPerReq) {
         g_args.num_of_RPR = 100;
       } else {
-        printf("failed to read json, num_of_records_per_req not found");
+        printf("ERROR: failed to read json, num_of_records_per_req not found\n");
         goto PARSE_OVER;
       }
  
@@ -2857,19 +2970,19 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
   } else if (!answerPrompt) {
     g_args.answer_yes = false;
   } else {
-    printf("failed to read json, confirm_parameter_prompt not found");
+    printf("ERROR: failed to read json, confirm_parameter_prompt not found\n");
     goto PARSE_OVER;
   }  
 
   cJSON* dbs = cJSON_GetObjectItem(root, "databases");
   if (!dbs || dbs->type != cJSON_Array) {
-    printf("failed to read json, databases not found\n");
+    printf("ERROR: failed to read json, databases not found\n");
     goto PARSE_OVER;
   }
 
   int dbSize = cJSON_GetArraySize(dbs);
   if (dbSize > MAX_DB_COUNT) {
-    printf("failed to read json, databases size overflow, max database is %d\n", MAX_DB_COUNT);
+    printf("ERROR: failed to read json, databases size overflow, max database is %d\n", MAX_DB_COUNT);
     goto PARSE_OVER;
   }
 
@@ -2881,13 +2994,13 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     // dbinfo 
     cJSON *dbinfo = cJSON_GetObjectItem(dbinfos, "dbinfo");
     if (!dbinfo || dbinfo->type != cJSON_Object) {
-      printf("failed to read json, dbinfo not found");
+      printf("ERROR: failed to read json, dbinfo not found\n");
       goto PARSE_OVER;
     }
     
     cJSON *dbName = cJSON_GetObjectItem(dbinfo, "name");
     if (!dbName || dbName->type != cJSON_String || dbName->valuestring == NULL) {
-      printf("failed to read json, db name not found");
+      printf("ERROR: failed to read json, db name not found\n");
       goto PARSE_OVER;
     }
     tstrncpy(g_Dbs.db[i].dbName, dbName->valuestring, MAX_DB_NAME_SIZE);
@@ -2902,7 +3015,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!drop) {
       g_Dbs.db[i].drop = 0;
     } else {
-      printf("failed to read json, drop not found");
+      printf("ERROR: failed to read json, drop not found\n");
       goto PARSE_OVER;
     }
 
@@ -2913,7 +3026,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       //tstrncpy(g_Dbs.db[i].dbCfg.precision, "ms", MAX_DB_NAME_SIZE);
       memset(g_Dbs.db[i].dbCfg.precision, 0, MAX_DB_NAME_SIZE);
     } else {
-      printf("failed to read json, precision not found");
+      printf("ERROR: failed to read json, precision not found\n");
       goto PARSE_OVER;
     }
 
@@ -2923,7 +3036,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!update) {
       g_Dbs.db[i].dbCfg.update = -1;
     } else {
-      printf("failed to read json, update not found");
+      printf("ERROR: failed to read json, update not found\n");
       goto PARSE_OVER;
     }
 
@@ -2933,7 +3046,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!replica) {
       g_Dbs.db[i].dbCfg.replica = -1;
     } else {
-      printf("failed to read json, replica not found");
+      printf("ERROR: failed to read json, replica not found\n");
       goto PARSE_OVER;
     }
 
@@ -2943,7 +3056,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!keep) {
       g_Dbs.db[i].dbCfg.keep = -1;
     } else {
-     printf("failed to read json, keep not found");
+     printf("ERROR: failed to read json, keep not found\n");
      goto PARSE_OVER;
     }
     
@@ -2953,7 +3066,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!days) {
       g_Dbs.db[i].dbCfg.days = -1;
     } else {
-     printf("failed to read json, days not found");
+     printf("ERROR: failed to read json, days not found\n");
      goto PARSE_OVER;
     }
     
@@ -2963,7 +3076,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!cache) {
       g_Dbs.db[i].dbCfg.cache = -1;
     } else {
-     printf("failed to read json, cache not found");
+     printf("ERROR: failed to read json, cache not found\n");
      goto PARSE_OVER;
     }
         
@@ -2973,7 +3086,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!blocks) {
       g_Dbs.db[i].dbCfg.blocks = -1;
     } else {
-     printf("failed to read json, block not found");
+     printf("ERROR: failed to read json, block not found\n");
      goto PARSE_OVER;
     }
 
@@ -2993,7 +3106,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!minRows) {
       g_Dbs.db[i].dbCfg.minRows = -1;
     } else {
-     printf("failed to read json, minRows not found");
+     printf("ERROR: failed to read json, minRows not found\n");
      goto PARSE_OVER;
     }
 
@@ -3003,7 +3116,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!maxRows) {
       g_Dbs.db[i].dbCfg.maxRows = -1;
     } else {
-     printf("failed to read json, maxRows not found");
+     printf("ERROR: failed to read json, maxRows not found\n");
      goto PARSE_OVER;
     }
 
@@ -3013,7 +3126,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!comp) {
       g_Dbs.db[i].dbCfg.comp = -1;
     } else {
-     printf("failed to read json, comp not found");
+     printf("ERROR: failed to read json, comp not found\n");
      goto PARSE_OVER;
     }
 
@@ -3023,7 +3136,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!walLevel) {
       g_Dbs.db[i].dbCfg.walLevel = -1;
     } else {
-     printf("failed to read json, walLevel not found");
+     printf("ERROR: failed to read json, walLevel not found\n");
      goto PARSE_OVER;
     }
 
@@ -3033,7 +3146,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!cacheLast) {
       g_Dbs.db[i].dbCfg.cacheLast = -1;
     } else {
-     printf("failed to read json, cacheLast not found");
+     printf("ERROR: failed to read json, cacheLast not found\n");
      goto PARSE_OVER;
     }
 
@@ -3041,9 +3154,9 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     if (quorum && quorum->type == cJSON_Number) {
       g_Dbs.db[i].dbCfg.quorum = quorum->valueint;
     } else if (!quorum) {
-      g_Dbs.db[i].dbCfg.quorum = -1;
+      g_Dbs.db[i].dbCfg.quorum = 1;
     } else {
-     printf("failed to read json, walLevel not found");
+     printf("failed to read json, quorum input mistake");
      goto PARSE_OVER;
     }
 
@@ -3053,20 +3166,20 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     } else if (!fsync) {
       g_Dbs.db[i].dbCfg.fsync = -1;
     } else {
-     printf("failed to read json, fsync not found");
+     printf("ERROR: failed to read json, fsync not found\n");
      goto PARSE_OVER;
     }    
 
     // super_talbes 
     cJSON *stables = cJSON_GetObjectItem(dbinfos, "super_tables");
     if (!stables || stables->type != cJSON_Array) {
-      printf("failed to read json, super_tables not found");
+      printf("ERROR: failed to read json, super_tables not found\n");
       goto PARSE_OVER;
     }    
     
     int stbSize = cJSON_GetArraySize(stables);
     if (stbSize > MAX_SUPER_TABLE_COUNT) {
-      printf("failed to read json, databases size overflow, max database is %d\n", MAX_SUPER_TABLE_COUNT);
+      printf("ERROR: failed to read json, databases size overflow, max database is %d\n", MAX_SUPER_TABLE_COUNT);
       goto PARSE_OVER;
     }
 
@@ -3078,14 +3191,14 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       // dbinfo 
       cJSON *stbName = cJSON_GetObjectItem(stbInfo, "name");
       if (!stbName || stbName->type != cJSON_String || stbName->valuestring == NULL) {
-        printf("failed to read json, stb name not found");
+        printf("ERROR: failed to read json, stb name not found\n");
         goto PARSE_OVER;
       }
       tstrncpy(g_Dbs.db[i].superTbls[j].sTblName, stbName->valuestring, MAX_TB_NAME_SIZE);
     
       cJSON *prefix = cJSON_GetObjectItem(stbInfo, "childtable_prefix");
       if (!prefix || prefix->type != cJSON_String || prefix->valuestring == NULL) {
-        printf("failed to read json, childtable_prefix not found");
+        printf("ERROR: failed to read json, childtable_prefix not found\n");
         goto PARSE_OVER;
       }
       tstrncpy(g_Dbs.db[i].superTbls[j].childTblPrefix, prefix->valuestring, MAX_DB_NAME_SIZE);
@@ -3104,7 +3217,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!autoCreateTbl) {
         g_Dbs.db[i].superTbls[j].autoCreateTable = PRE_CREATE_SUBTBL;
       } else {
-        printf("failed to read json, auto_create_table not found");
+        printf("ERROR: failed to read json, auto_create_table not found\n");
         goto PARSE_OVER;
       }
       
@@ -3114,7 +3227,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!batchCreateTbl) {
         g_Dbs.db[i].superTbls[j].batchCreateTableNum = 1000;
       } else {
-        printf("failed to read json, batch_create_tbl_num not found");
+        printf("ERROR: failed to read json, batch_create_tbl_num not found\n");
         goto PARSE_OVER;
       }      
 
@@ -3132,13 +3245,13 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!childTblExists) {
         g_Dbs.db[i].superTbls[j].childTblExists = TBL_NO_EXISTS;
       } else {
-        printf("failed to read json, child_table_exists not found");
+        printf("ERROR: failed to read json, child_table_exists not found\n");
         goto PARSE_OVER;
       }
       
       cJSON* count = cJSON_GetObjectItem(stbInfo, "childtable_count");
       if (!count || count->type != cJSON_Number || 0 >= count->valueint) {
-        printf("failed to read json, childtable_count not found");
+        printf("ERROR: failed to read json, childtable_count not found\n");
         goto PARSE_OVER;
       }
       g_Dbs.db[i].superTbls[j].childTblCount = count->valueint;
@@ -3151,7 +3264,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!dataSource) {
         tstrncpy(g_Dbs.db[i].superTbls[j].dataSource, "rand", MAX_DB_NAME_SIZE);
       } else {
-        printf("failed to read json, data_source not found");
+        printf("ERROR: failed to read json, data_source not found\n");
         goto PARSE_OVER;
       }
 
@@ -3163,17 +3276,39 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!insertMode) {
         tstrncpy(g_Dbs.db[i].superTbls[j].insertMode, "taosc", MAX_DB_NAME_SIZE);
       } else {
-        printf("failed to read json, insert_mode not found");
+        printf("ERROR: failed to read json, insert_mode not found\n");
         goto PARSE_OVER;
       }
 
+      cJSON* childTbl_limit = cJSON_GetObjectItem(stbInfo, "childtable_limit");
+      if (childTbl_limit) {
+        if (childTbl_limit->type != cJSON_Number) {
+            printf("ERROR: failed to read json, childtable_limit\n");
+            goto PARSE_OVER;
+        }
+        g_Dbs.db[i].superTbls[j].childTblLimit = childTbl_limit->valueint;
+      } else {
+        g_Dbs.db[i].superTbls[j].childTblLimit = -1;    // select ... limit -1 means all query result
+      }
+
+      cJSON* childTbl_offset = cJSON_GetObjectItem(stbInfo, "childtable_offset");
+      if (childTbl_offset) {
+        if (childTbl_offset->type != cJSON_Number || 0 > childTbl_offset->valueint) {
+            printf("ERROR: failed to read json, childtable_offset\n");
+            goto PARSE_OVER;
+        }
+        g_Dbs.db[i].superTbls[j].childTblOffset = childTbl_offset->valueint;
+      } else {
+        g_Dbs.db[i].superTbls[j].childTblOffset = 0;
+      }
+
       cJSON *ts = cJSON_GetObjectItem(stbInfo, "start_timestamp");
       if (ts && ts->type == cJSON_String && ts->valuestring != NULL) {
         tstrncpy(g_Dbs.db[i].superTbls[j].startTimestamp, ts->valuestring, MAX_DB_NAME_SIZE);
       } else if (!ts) {
         tstrncpy(g_Dbs.db[i].superTbls[j].startTimestamp, "now", MAX_DB_NAME_SIZE);
       } else {
-        printf("failed to read json, start_timestamp not found");
+        printf("ERROR: failed to read json, start_timestamp not found\n");
         goto PARSE_OVER;
       }
 
@@ -3181,9 +3316,9 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       if (timestampStep && timestampStep->type == cJSON_Number) {
         g_Dbs.db[i].superTbls[j].timeStampStep = timestampStep->valueint;
       } else if (!timestampStep) {
-        g_Dbs.db[i].superTbls[j].timeStampStep = 1000;
+        g_Dbs.db[i].superTbls[j].timeStampStep = DEFAULT_TIMESTAMP_STEP;
       } else {
-        printf("failed to read json, timestamp_step not found");
+        printf("ERROR: failed to read json, timestamp_step not found\n");
         goto PARSE_OVER;
       }
 
@@ -3196,7 +3331,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!sampleDataBufSize) {
         g_Dbs.db[i].superTbls[j].sampleDataBufSize = 1024*1024 + 1024;
       } else {
-        printf("failed to read json, sample_buf_size not found");
+        printf("ERROR: failed to read json, sample_buf_size not found\n");
         goto PARSE_OVER;
       }      
 
@@ -3207,7 +3342,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!sampleFormat) {
         tstrncpy(g_Dbs.db[i].superTbls[j].sampleFormat, "csv", MAX_DB_NAME_SIZE);
       } else {
-        printf("failed to read json, sample_format not found");
+        printf("ERROR: failed to read json, sample_format not found\n");
         goto PARSE_OVER;
       }      
 
@@ -3218,7 +3353,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!sampleFile) {
         memset(g_Dbs.db[i].superTbls[j].sampleFile, 0, MAX_FILE_NAME_LEN);
       } else {
-        printf("failed to read json, sample_file not found");
+        printf("ERROR: failed to read json, sample_file not found\n");
         goto PARSE_OVER;
       }          
 
@@ -3235,7 +3370,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
         memset(g_Dbs.db[i].superTbls[j].tagsFile, 0, MAX_FILE_NAME_LEN);
         g_Dbs.db[i].superTbls[j].tagSource = 0;
       } else {
-        printf("failed to read json, tags_file not found");
+        printf("ERROR: failed to read json, tags_file not found\n");
         goto PARSE_OVER;
       }
 
@@ -3251,7 +3386,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!maxSqlLen) {
         g_Dbs.db[i].superTbls[j].maxSqlLen = TSDB_MAX_SQL_LEN;
       } else {
-        printf("failed to read json, maxSqlLen not found");
+        printf("ERROR: failed to read json, maxSqlLen not found\n");
         goto PARSE_OVER;
       }      
 
@@ -3268,7 +3403,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!multiThreadWriteOneTbl) {
         g_Dbs.db[i].superTbls[j].multiThreadWriteOneTbl = 0;
       } else {
-        printf("failed to read json, multiThreadWriteOneTbl not found");
+        printf("ERROR: failed to read json, multiThreadWriteOneTbl not found\n");
         goto PARSE_OVER;
       }
 
@@ -3278,7 +3413,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!numberOfTblInOneSql) {
         g_Dbs.db[i].superTbls[j].numberOfTblInOneSql = 0;
       } else {
-        printf("failed to read json, numberOfTblInOneSql not found");
+        printf("ERROR: failed to read json, numberOfTblInOneSql not found\n");
         goto PARSE_OVER;
       }      
 
@@ -3288,7 +3423,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!rowsPerTbl) {
         g_Dbs.db[i].superTbls[j].rowsPerTbl = 1;
       } else {
-        printf("failed to read json, rowsPerTbl not found");
+        printf("ERROR: failed to read json, rowsPerTbl not found\n");
         goto PARSE_OVER;
       }      
 
@@ -3298,7 +3433,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!disorderRatio) {
         g_Dbs.db[i].superTbls[j].disorderRatio = 0;
       } else {
-        printf("failed to read json, disorderRatio not found");
+        printf("ERROR: failed to read json, disorderRatio not found\n");
         goto PARSE_OVER;
       }      
 
@@ -3308,20 +3443,29 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       } else if (!disorderRange) {
         g_Dbs.db[i].superTbls[j].disorderRange = 1000;
       } else {
-        printf("failed to read json, disorderRange not found");
+        printf("ERROR: failed to read json, disorderRange not found\n");
         goto PARSE_OVER;
       }
 
       cJSON* insertRows = cJSON_GetObjectItem(stbInfo, "insert_rows");
       if (insertRows && insertRows->type == cJSON_Number) {
         g_Dbs.db[i].superTbls[j].insertRows = insertRows->valueint;
-        //if (0 == g_Dbs.db[i].superTbls[j].insertRows) {
-        //  g_Dbs.db[i].superTbls[j].insertRows = 0x7FFFFFFFFFFFFFFF;
-        //}
       } else if (!insertRows) {
         g_Dbs.db[i].superTbls[j].insertRows = 0x7FFFFFFFFFFFFFFF;
       } else {
-        printf("failed to read json, insert_rows not found");
+        fprintf(stderr, "failed to read json, insert_rows input mistake");
+        goto PARSE_OVER;
+      }
+
+      cJSON* insertInterval = cJSON_GetObjectItem(stbInfo, "insert_interval");
+      if (insertInterval && insertInterval->type == cJSON_Number) {
+        g_Dbs.db[i].superTbls[j].insertInterval = insertInterval->valueint;
+      } else if (!insertInterval) {
+        debugPrint("%s() LN%d: stable insert interval be overrided by global %d.\n",
+                __func__, __LINE__, g_args.insert_interval);
+        g_Dbs.db[i].superTbls[j].insertInterval = g_args.insert_interval;
+      } else {
+        fprintf(stderr, "failed to read json, insert_interval input mistake");
         goto PARSE_OVER;
       }
 
@@ -3360,7 +3504,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
   } else if (!host) {
     tstrncpy(g_queryInfo.host, "127.0.0.1", MAX_DB_NAME_SIZE);
   } else {
-    printf("failed to read json, host not found\n");
+    printf("ERROR: failed to read json, host not found\n");
     goto PARSE_OVER;
   }
 
@@ -3398,7 +3542,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
   } else if (!answerPrompt) {
     g_args.answer_yes = false;
   } else {
-    printf("failed to read json, confirm_parameter_prompt not found");
+    printf("ERROR: failed to read json, confirm_parameter_prompt not found\n");
     goto PARSE_OVER;
   }  
 
@@ -3406,7 +3550,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
   if (dbs && dbs->type == cJSON_String && dbs->valuestring != NULL) {
     tstrncpy(g_queryInfo.dbName, dbs->valuestring, MAX_DB_NAME_SIZE);
   } else if (!dbs) {
-    printf("failed to read json, databases not found\n");
+    printf("ERROR: failed to read json, databases not found\n");
     goto PARSE_OVER;
   }
 
@@ -3416,7 +3560,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
   } else if (!queryMode) {
     tstrncpy(g_queryInfo.queryMode, "taosc", MAX_TB_NAME_SIZE);
   } else {
-    printf("failed to read json, query_mode not found\n");
+    printf("ERROR: failed to read json, query_mode not found\n");
     goto PARSE_OVER;
   }
   
@@ -3426,7 +3570,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
     g_queryInfo.superQueryInfo.concurrent = 0;
     g_queryInfo.superQueryInfo.sqlCount = 0;
   } else if (superQuery->type != cJSON_Object) {
-    printf("failed to read json, super_table_query not found");
+    printf("ERROR: failed to read json, super_table_query not found\n");
     goto PARSE_OVER;
   } else {  
     cJSON* rate = cJSON_GetObjectItem(superQuery, "query_interval");
@@ -3450,7 +3594,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
       } else if (0 == strcmp("async", mode->valuestring)) {      
         g_queryInfo.superQueryInfo.subscribeMode = 1;
       } else {
-        printf("failed to read json, subscribe mod error\n");
+        printf("ERROR: failed to read json, subscribe mod error\n");
         goto PARSE_OVER;
       }
     } else {
@@ -3473,7 +3617,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
       } else if (0 == strcmp("no", restart->valuestring)) {      
         g_queryInfo.superQueryInfo.subscribeRestart = 0;
       } else {
-        printf("failed to read json, subscribe restart error\n");
+        printf("ERROR: failed to read json, subscribe restart error\n");
         goto PARSE_OVER;
       }
     } else {
@@ -3489,7 +3633,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
       } else if (0 == strcmp("no", keepProgress->valuestring)) {      
         g_queryInfo.superQueryInfo.subscribeKeepProgress = 0;
       } else {
-        printf("failed to read json, subscribe keepProgress error\n");
+        printf("ERROR: failed to read json, subscribe keepProgress error\n");
         goto PARSE_OVER;
       }
     } else {
@@ -3501,12 +3645,12 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
     if (!superSqls) {
       g_queryInfo.superQueryInfo.sqlCount = 0;
     } else if (superSqls->type != cJSON_Array) {
-      printf("failed to read json, super sqls not found\n");
+      printf("ERROR: failed to read json, super sqls not found\n");
       goto PARSE_OVER;
     } else {  
       int superSqlSize = cJSON_GetArraySize(superSqls);
       if (superSqlSize > MAX_QUERY_SQL_COUNT) {
-        printf("failed to read json, query sql size overflow, max is %d\n", MAX_QUERY_SQL_COUNT);
+        printf("ERROR: failed to read json, query sql size overflow, max is %d\n", MAX_QUERY_SQL_COUNT);
         goto PARSE_OVER;
       }
 
@@ -3517,7 +3661,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
       
         cJSON *sqlStr = cJSON_GetObjectItem(sql, "sql");
         if (!sqlStr || sqlStr->type != cJSON_String || sqlStr->valuestring == NULL) {
-          printf("failed to read json, sql not found\n");
+          printf("ERROR: failed to read json, sql not found\n");
           goto PARSE_OVER;
         }
         tstrncpy(g_queryInfo.superQueryInfo.sql[j], sqlStr->valuestring, MAX_QUERY_SQL_LENGTH);
@@ -3528,7 +3672,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
         } else if (NULL == result) {
           memset(g_queryInfo.superQueryInfo.result[j], 0, MAX_FILE_NAME_LEN);
         } else {
-          printf("failed to read json, super query result file not found\n");
+          printf("ERROR: failed to read json, super query result file not found\n");
           goto PARSE_OVER;
         } 
       }
@@ -3541,7 +3685,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
     g_queryInfo.subQueryInfo.threadCnt = 0;
     g_queryInfo.subQueryInfo.sqlCount = 0;
   } else if (subQuery->type != cJSON_Object) {
-    printf("failed to read json, sub_table_query not found");
+    printf("ERROR: failed to read json, sub_table_query not found\n");
     ret = true;
     goto PARSE_OVER;
   } else {
@@ -3570,7 +3714,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
     if (stblname && stblname->type == cJSON_String && stblname->valuestring != NULL) {
       tstrncpy(g_queryInfo.subQueryInfo.sTblName, stblname->valuestring, MAX_TB_NAME_SIZE);
     } else {
-      printf("failed to read json, super table name not found\n");
+      printf("ERROR: failed to read json, super table name not found\n");
       goto PARSE_OVER;
     }
 
@@ -3581,7 +3725,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
       } else if (0 == strcmp("async", submode->valuestring)) {      
         g_queryInfo.subQueryInfo.subscribeMode = 1;
       } else {
-        printf("failed to read json, subscribe mod error\n");
+        printf("ERROR: failed to read json, subscribe mod error\n");
         goto PARSE_OVER;
       }
     } else {
@@ -3604,7 +3748,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
       } else if (0 == strcmp("no", subrestart->valuestring)) {      
         g_queryInfo.subQueryInfo.subscribeRestart = 0;
       } else {
-        printf("failed to read json, subscribe restart error\n");
+        printf("ERROR: failed to read json, subscribe restart error\n");
         goto PARSE_OVER;
       }
     } else {
@@ -3618,7 +3762,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
       } else if (0 == strcmp("no", subkeepProgress->valuestring)) {      
         g_queryInfo.subQueryInfo.subscribeKeepProgress = 0;
       } else {
-        printf("failed to read json, subscribe keepProgress error\n");
+        printf("ERROR: failed to read json, subscribe keepProgress error\n");
         goto PARSE_OVER;
       }
     } else {
@@ -3630,12 +3774,12 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
     if (!subsqls) {
       g_queryInfo.subQueryInfo.sqlCount = 0;
     } else if (subsqls->type != cJSON_Array) {
-      printf("failed to read json, super sqls not found\n");
+      printf("ERROR: failed to read json, super sqls not found\n");
       goto PARSE_OVER;
     } else {  
       int superSqlSize = cJSON_GetArraySize(subsqls);
       if (superSqlSize > MAX_QUERY_SQL_COUNT) {
-        printf("failed to read json, query sql size overflow, max is %d\n", MAX_QUERY_SQL_COUNT);
+        printf("ERROR: failed to read json, query sql size overflow, max is %d\n", MAX_QUERY_SQL_COUNT);
         goto PARSE_OVER;
       }
     
@@ -3646,7 +3790,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
         
         cJSON *sqlStr = cJSON_GetObjectItem(sql, "sql");
         if (!sqlStr || sqlStr->type != cJSON_String || sqlStr->valuestring == NULL) {
-          printf("failed to read json, sql not found\n");
+          printf("ERROR: failed to read json, sql not found\n");
           goto PARSE_OVER;
         }
         tstrncpy(g_queryInfo.subQueryInfo.sql[j], sqlStr->valuestring, MAX_QUERY_SQL_LENGTH);
@@ -3657,7 +3801,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
         } else if (NULL == result) {
           memset(g_queryInfo.subQueryInfo.result[j], 0, MAX_FILE_NAME_LEN);
         }  else {
-          printf("failed to read json, sub query result file not found\n");
+          printf("ERROR: failed to read json, sub query result file not found\n");
           goto PARSE_OVER;
         } 
       }
@@ -3696,7 +3840,7 @@ static bool getInfoFromJsonFile(char* file) {
   content[len] = 0;
   cJSON* root = cJSON_Parse(content);
   if (root == NULL) {
-    printf("failed to cjson parse %s, invalid json format", file);
+    printf("ERROR: failed to cjson parse %s, invalid json format\n", file);
     goto PARSE_OVER;
   }
 
@@ -3709,13 +3853,13 @@ static bool getInfoFromJsonFile(char* file) {
     } else if (0 == strcasecmp("subscribe", filetype->valuestring)) {
       g_args.test_mode = SUBSCRIBE_MODE;
     } else {
-      printf("failed to read json, filetype not support\n");
+      printf("ERROR: failed to read json, filetype not support\n");
       goto PARSE_OVER;
     }
   } else if (!filetype) {
     g_args.test_mode = INSERT_MODE;
   } else {
-    printf("failed to read json, filetype not found\n");
+    printf("ERROR: failed to read json, filetype not found\n");
     goto PARSE_OVER;
   }
 
@@ -3726,7 +3870,7 @@ static bool getInfoFromJsonFile(char* file) {
   } else if (SUBSCRIBE_MODE == g_args.test_mode) {
     ret = getMetaFromQueryJsonFile(root);
   } else {
-    printf("input json file type error! please input correct file type: insert or query or subscribe\n");
+    printf("ERROR: input json file type error! please input correct file type: insert or query or subscribe\n");
     goto PARSE_OVER;
   } 
 
@@ -3737,7 +3881,7 @@ PARSE_OVER:
   return ret;
 }
 
-void prePareSampleData() {
+void prepareSampleData() {
   for (int i = 0; i < g_Dbs.dbCount; i++) {    
     for (int j = 0; j < g_Dbs.db[i].superTblCount; j++) {
       //if (0 == strncasecmp(g_Dbs.db[i].superTbls[j].dataSource, "sample", 6)) {
@@ -3775,18 +3919,22 @@ void postFreeResource() {
   }
 }
 
-int getRowDataFromSample(char*  dataBuf, int maxLen, int64_t timestamp, SSuperTable* superTblInfo, int* sampleUsePos, FILE *fp, char* sampleBuf) {
+static int getRowDataFromSample(char*  dataBuf, int maxLen, int64_t timestamp,
+      SSuperTable* superTblInfo, int* sampleUsePos) {
   if ((*sampleUsePos) == MAX_SAMPLES_ONCE_FROM_FILE) {
-    int ret = readSampleFromCsvFileToMem(fp, superTblInfo, sampleBuf);
+    int ret = readSampleFromCsvFileToMem(superTblInfo);
     if (0 != ret) {
+      tmfree(superTblInfo->sampleDataBuf);
       return -1;
     }
     *sampleUsePos = 0;
   }
 
   int    dataLen = 0;
-  dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "(%" PRId64 ", ", timestamp);
-  dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "%s", sampleBuf + superTblInfo->lenOfOneRow * (*sampleUsePos));
+  dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen,
+          "(%" PRId64 ", ", timestamp);
+  dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen,
+          "%s", superTblInfo->sampleDataBuf + superTblInfo->lenOfOneRow * (*sampleUsePos));
   dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, ")");
 
   (*sampleUsePos)++;
@@ -3841,14 +3989,12 @@ int generateRowData(char*  dataBuf, int maxLen, int64_t timestamp, SSuperTable*
 }
 
 static void syncWriteForNumberOfTblInOneSql(
-        threadInfo *winfo, FILE *fp, char* sampleDataBuf) {
+        threadInfo *winfo, char* sampleDataBuf) {
   SSuperTable* superTblInfo = winfo->superTblInfo;
 
   int   samplePos = 0;
 
   //printf("========threadID[%d], table rang: %d - %d \n", winfo->threadID, winfo->start_table_id, winfo->end_table_id);
-  int64_t    totalRowsInserted = 0;
-  int64_t    totalAffectedRows = 0;
   int64_t    lastPrintTime = taosGetTimestampMs();
 
   char* buffer = calloc(superTblInfo->maxSqlLen+1, 1);
@@ -3866,12 +4012,13 @@ static void syncWriteForNumberOfTblInOneSql(
   uint64_t time_counter = winfo->start_time;
   int sampleUsePos;
 
+  int insert_interval = superTblInfo?superTblInfo->insertInterval:g_args.insert_interval;
   int64_t st = 0;
-  int64_t et = 0;
+  int64_t et = 0xffffffff;
   for (int i = 0; i < superTblInfo->insertRows;) {
     int32_t  tbl_id = 0;
-    for (int tID = winfo->start_table_id; tID <= winfo->end_table_id; ) {
-      int64_t tmp_time = 0;
+    for (int tableSeq = winfo->start_table_id; tableSeq <= winfo->end_table_id; ) {
+      int64_t start_time = 0;
       int inserted = i;
 
       for (int k = 0; k < g_args.num_of_RPR;) {
@@ -3879,12 +4026,12 @@ static void syncWriteForNumberOfTblInOneSql(
         memset(buffer, 0, superTblInfo->maxSqlLen);
         char *pstr = buffer;
 
-        int32_t  end_tbl_id = tID + numberOfTblInOneSql;
+        int32_t  end_tbl_id = tableSeq + numberOfTblInOneSql;
         if (end_tbl_id > winfo->end_table_id) {
           end_tbl_id = winfo->end_table_id+1;
         }
 
-        for (tbl_id = tID; tbl_id < end_tbl_id; tbl_id++) {  
+        for (tbl_id = tableSeq ; tbl_id < end_tbl_id; tbl_id++) {  
           sampleUsePos = samplePos;
           if (AUTO_CREATE_SUBTBL == superTblInfo->autoCreateTable) {
             char* tagsValBuf = NULL;
@@ -3952,18 +4099,16 @@ static void syncWriteForNumberOfTblInOneSql(
             }            
           }
 
-          tmp_time = time_counter;
-          for (k = 0; k < superTblInfo->rowsPerTbl;) {
+          start_time = time_counter;
+          for (int j = 0; j < superTblInfo->rowsPerTbl;) {
             int retLen = 0;
             if (0 == strncasecmp(superTblInfo->dataSource, 
                         "sample", strlen("sample"))) {
               retLen = getRowDataFromSample(pstr + len,
                       superTblInfo->maxSqlLen - len,
-                      tmp_time += superTblInfo->timeStampStep, 
+                      start_time += superTblInfo->timeStampStep,
                       superTblInfo,
-                      &sampleUsePos, 
-                      fp, 
-                      sampleDataBuf);
+                      &sampleUsePos);
               if (retLen < 0) {
                 goto free_and_statistics;
               }
@@ -3972,7 +4117,7 @@ static void syncWriteForNumberOfTblInOneSql(
               int rand_num = rand_tinyint() % 100;            
               if (0 != superTblInfo->disorderRatio 
                       && rand_num < superTblInfo->disorderRatio) {
-                int64_t d = tmp_time - rand() % superTblInfo->disorderRange;
+                int64_t d = start_time - rand() % superTblInfo->disorderRange;
                 retLen = generateRowData(pstr + len,
                         superTblInfo->maxSqlLen - len,
                         d,
@@ -3980,7 +4125,7 @@ static void syncWriteForNumberOfTblInOneSql(
               } else {
                 retLen = generateRowData(pstr + len,
                         superTblInfo->maxSqlLen - len,
-                        tmp_time += superTblInfo->timeStampStep,
+                        start_time += superTblInfo->timeStampStep,
                         superTblInfo);
               }
               if (retLen < 0) {
@@ -3989,12 +4134,12 @@ static void syncWriteForNumberOfTblInOneSql(
             }
             len += retLen;
             //inserted++;
-            k++;
-            totalRowsInserted++;
+            j++;
+            winfo->totalInsertRows++;
 
             if (inserted >= superTblInfo->insertRows || 
                     (superTblInfo->maxSqlLen - len) < (superTblInfo->lenOfOneRow + 128)) {
-              tID = tbl_id + 1;
+              tableSeq = tbl_id + 1;
               printf("config rowsPerTbl and numberOfTblInOneSql not match with max_sql_lenth, please reconfig![lenOfOneRow:%d]\n", 
                       superTblInfo->lenOfOneRow);
               goto send_to_server;
@@ -4002,18 +4147,18 @@ static void syncWriteForNumberOfTblInOneSql(
           }
         }
 
-        tID = tbl_id;
+        tableSeq = tbl_id;
         inserted += superTblInfo->rowsPerTbl;
 
 send_to_server:
-        if (g_args.insert_interval && (g_args.insert_interval > (et - st))) {
-            int sleep_time = g_args.insert_interval - (et -st);
-            printf("sleep: %d ms specified by insert_interval\n", sleep_time);
+        if (insert_interval) {
+            st = taosGetTimestampUs();
+
+          if (insert_interval > ((et - st)/1000)) {
+            int sleep_time = insert_interval - (et -st);
+            printf("sleep: %d ms insert interval\n", sleep_time);
             taosMsleep(sleep_time); // ms
           }
-
-        if (g_args.insert_interval) {
-            st = taosGetTimestampMs();
         }
 
         if (0 == strncasecmp(superTblInfo->insertMode, 
@@ -4047,7 +4192,7 @@ send_to_server:
           if (currentPrintTime - lastPrintTime > 30*1000) {
             printf("thread[%d] has currently inserted rows: %"PRId64 ", affected rows: %"PRId64 "\n",
                     winfo->threadID,
-                    winfo->totalRowsInserted,
+                    winfo->totalInsertRows,
                     winfo->totalAffectedRows);
             lastPrintTime = currentPrintTime;
           }
@@ -4064,19 +4209,19 @@ send_to_server:
             goto free_and_statistics;
           }
         }
-        if (g_args.insert_interval) {
-            et = taosGetTimestampMs();
+        if (insert_interval) {
+            et = taosGetTimestampUs();
         }
 
         break;
       }
 
-      if (tID > winfo->end_table_id) {
+      if (tableSeq > winfo->end_table_id) {
         if (0 == strncasecmp(superTblInfo->dataSource, "sample", strlen("sample"))) {
           samplePos = sampleUsePos;
         }
         i = inserted;
-        time_counter = tmp_time;
+        time_counter = start_time;
       }
     }   
     
@@ -4085,14 +4230,13 @@ send_to_server:
 
 free_and_statistics:
   tmfree(buffer);    
-  winfo->totalRowsInserted = totalRowsInserted;
-  winfo->totalAffectedRows = totalAffectedRows;
-  printf("====thread[%d] completed total inserted rows: %"PRId64 ", affected rows: %"PRId64 "====\n", winfo->threadID, totalRowsInserted, totalAffectedRows);
+  printf("====thread[%d] completed total inserted rows: %"PRId64 ", affected rows: %"PRId64 "====\n",
+          winfo->threadID, winfo->totalInsertRows, winfo->totalAffectedRows);
   return;
 }
 
 int32_t generateData(char *res, char **data_type,
-        int num_of_cols, int64_t timestamp, int len_of_binary) {
+        int num_of_cols, int64_t timestamp, int lenOfBinary) {
   memset(res, 0, MAX_DATA_SIZE);
   char *pstr = res;
   pstr += sprintf(pstr, "(%" PRId64, timestamp);
@@ -4127,13 +4271,13 @@ int32_t generateData(char *res, char **data_type,
       bool b = rand() & 1;
       pstr += sprintf(pstr, ", %s", b ? "true" : "false");
     } else if (strcasecmp(data_type[i % c], "binary") == 0) {
-      char *s = malloc(len_of_binary);
-      rand_string(s, len_of_binary);
+      char *s = malloc(lenOfBinary);
+      rand_string(s, lenOfBinary);
       pstr += sprintf(pstr, ", \"%s\"", s);
       free(s);
     }else if (strcasecmp(data_type[i % c], "nchar") == 0) {
-      char *s = malloc(len_of_binary);
-      rand_string(s, len_of_binary);
+      char *s = malloc(lenOfBinary);
+      rand_string(s, lenOfBinary);
       pstr += sprintf(pstr, ", \"%s\"", s);
       free(s);
     }
@@ -4149,143 +4293,8 @@ int32_t generateData(char *res, char **data_type,
   return (int32_t)(pstr - res);
 }
 
-// sync insertion
-/*
-   1 thread: 100 tables * 2000  rows/s
-   1 thread: 10  tables * 20000 rows/s
-   6 thread: 300 tables * 2000  rows/s
-
-   2 taosinsertdata , 1 thread:  10  tables * 20000 rows/s
-*/
-static void* syncWrite(void *sarg) {
-
-  threadInfo *winfo = (threadInfo *)sarg;
-
-  char buffer[BUFFER_SIZE] = "\0";
-  char data[MAX_DATA_SIZE];
-  char **data_type = g_args.datatype;
-  int len_of_binary = g_args.len_of_binary;
-
-  int ncols_per_record = 1; // count first col ts
-  int i = 0;
-  while(g_args.datatype[i]) {
-    i ++;
-    ncols_per_record ++;
-  }
-
-  srand((uint32_t)time(NULL));
-  int64_t time_counter = winfo->start_time;
-
-  uint64_t st = 0;
-  uint64_t et = 0;
-
-  winfo->totalRowsInserted = 0;
-  winfo->totalAffectedRows = 0;
-
-  for (int tID = winfo->start_table_id; tID <= winfo->end_table_id; tID++) {
-    int64_t tmp_time = time_counter;
-
-    for (int i = 0; i < g_args.num_of_DPT;) {
-
-      int tblInserted = i;
-
-      char *pstr = buffer;
-      pstr += sprintf(pstr,
-              "insert into %s.%s%d values ",
-              winfo->db_name, g_args.tb_prefix, tID);
-      int k;
-      for (k = 0; k < g_args.num_of_RPR;) {
-        int rand_num = rand() % 100;
-        int len = -1;
-
-        if ((g_args.disorderRatio != 0)
-                && (rand_num < g_args.disorderRange)) {
-             
-          int64_t d = tmp_time - rand() % 1000000 + rand_num;
-          len = generateData(data, data_type,
-                  ncols_per_record, d, len_of_binary);
-        } else {
-          len = generateData(data, data_type,
-                  ncols_per_record, tmp_time += 1000, len_of_binary);
-        }
-
-        //assert(len + pstr - buffer < BUFFER_SIZE);
-        if (len + pstr - buffer >= BUFFER_SIZE) { // too long
-          break;
-        }
-
-        pstr += sprintf(pstr, " %s", data);
-        tblInserted++;
-        k++;
-        i++;
-
-        if (tblInserted >= g_args.num_of_DPT)
-            break;
-      }
-
-      winfo->totalRowsInserted += k;
-      /* puts(buffer); */
-      int64_t startTs;
-      int64_t endTs;
-      startTs = taosGetTimestampUs();
-      //queryDB(winfo->taos, buffer);
-      if (i > 0 && g_args.insert_interval 
-            && (g_args.insert_interval > (et - st) )) {
-            int sleep_time = g_args.insert_interval - (et -st);
-            printf("sleep: %d ms specified by insert_interval\n", sleep_time);
-            taosMsleep(sleep_time); // ms
-      }
-
-      if (g_args.insert_interval) {
-            st = taosGetTimestampMs();
-      }
-      verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
-      int affectedRows = queryDbExec(winfo->taos, buffer, 1);
-
-      if (0 < affectedRows){
-        endTs = taosGetTimestampUs();
-        int64_t delay = endTs - startTs;
-        if (delay > winfo->maxDelay)
-            winfo->maxDelay = delay;
-        if (delay < winfo->minDelay)
-            winfo->minDelay = delay;
-        winfo->cntDelay++;
-        winfo->totalDelay += delay;
-        winfo->totalAffectedRows += affectedRows;
-        winfo->avgDelay = (double)winfo->totalDelay / winfo->cntDelay;      
-      } else {
-          fprintf(stderr, "queryDbExec() buffer:\n%s\naffected rows is %d", buffer, affectedRows);
-      }
-
-      verbosePrint("%s() LN%d: totalaffectedRows:%"PRId64" tblInserted=%d\n", __func__, __LINE__, winfo->totalAffectedRows, tblInserted);
-      if (g_args.insert_interval) {
-            et = taosGetTimestampMs();
-      }
-
-      if (tblInserted >= g_args.num_of_DPT) {
-            break;
-      }
-    }   // num_of_DPT
-  } // tId
-
-  printf("====thread[%d] completed total inserted rows: %"PRId64 ", total affected rows: %"PRId64 "====\n", 
-          winfo->threadID, 
-          winfo->totalRowsInserted, 
-          winfo->totalAffectedRows);
-
-  return NULL;
-}
-
-
-static void* syncWriteWithStb(void *sarg) {
-  uint64_t    lastPrintTime = taosGetTimestampMs();
-
-  threadInfo *winfo = (threadInfo *)sarg; 
-  SSuperTable* superTblInfo = winfo->superTblInfo;
-
-  FILE *fp = NULL;
+static int prepareSampleDataForSTable(SSuperTable *superTblInfo) {
   char* sampleDataBuf = NULL;
-  int   samplePos     = 0;
 
   // each thread read sample data from csv file 
   if (0 == strncasecmp(superTblInfo->dataSource, 
@@ -4294,82 +4303,100 @@ static void* syncWriteWithStb(void *sarg) {
     sampleDataBuf = calloc(
             superTblInfo->lenOfOneRow * MAX_SAMPLES_ONCE_FROM_FILE, 1);
     if (sampleDataBuf == NULL) {
-      printf("Failed to calloc %d Bytes, reason:%s\n", 
+      fprintf(stderr, "Failed to calloc %d Bytes, reason:%s\n", 
               superTblInfo->lenOfOneRow * MAX_SAMPLES_ONCE_FROM_FILE, 
               strerror(errno));
-      return NULL;
+      return -1;
     }
 
-    fp = fopen(superTblInfo->sampleFile, "r");
-    if (fp == NULL) {
-      printf("Failed to open sample file: %s, reason:%s\n", 
-              superTblInfo->sampleFile, strerror(errno));
-      tmfree(sampleDataBuf);
-      return NULL;
-    }
-    int ret = readSampleFromCsvFileToMem(fp, 
-            superTblInfo, sampleDataBuf);
+    int ret = readSampleFromCsvFileToMem(superTblInfo);
     if (0 != ret) {
-      tmfree(sampleDataBuf);
-      tmfclose(fp);
-      return NULL;
+      tmfree(superTblInfo->sampleDataBuf);
+      return -1;
     }
   }
 
-  if (superTblInfo->numberOfTblInOneSql > 0) {
-    syncWriteForNumberOfTblInOneSql(winfo, fp, sampleDataBuf);
-    tmfree(sampleDataBuf);
-    tmfclose(fp);
-    return NULL;
-  }
+  superTblInfo->sampleDataBuf = sampleDataBuf;
 
-  char* buffer = calloc(superTblInfo->maxSqlLen, 1);
-  if (NULL == buffer) {
-    printf("Failed to calloc %d Bytes, reason:%s\n", 
-              superTblInfo->maxSqlLen,
-              strerror(errno));
-    tmfree(sampleDataBuf);
-    tmfclose(fp);
-    return NULL;
-  }
+  return 0;
+}
 
-  uint64_t st = 0;
-  uint64_t et = 0;
+static int execInsert(threadInfo *winfo, char *buffer, int k)
+{
+  int affectedRows;
+  SSuperTable* superTblInfo = winfo->superTblInfo;
 
-  winfo->totalRowsInserted = 0;
-  winfo->totalAffectedRows = 0;
+  if (superTblInfo) {
+    if (0 == strncasecmp(superTblInfo->insertMode, "taosc", strlen("taosc"))) {
+          verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
+          affectedRows = queryDbExec(winfo->taos, buffer, INSERT_TYPE);
+    } else {
+          verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
+          int retCode = postProceSql(g_Dbs.host, g_Dbs.port, buffer);
 
-  int sampleUsePos;
+          if (0 != retCode) {
+            affectedRows = -1;
+            printf("========restful return fail, threadID[%d]\n", winfo->threadID);
+          } else {
+          affectedRows = k;
+          }
+    }
+  } else {
+        verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
+        affectedRows = queryDbExec(winfo->taos, buffer, 1);
+  }
 
-  verbosePrint("%s() LN%d insertRows=%"PRId64"\n", __func__, __LINE__, superTblInfo->insertRows);
+  if (0 > affectedRows){
+            return affectedRows;
+  }
 
-  for (uint32_t tID = winfo->start_table_id; tID <= winfo->end_table_id;
-        tID++) {
-    int64_t start_time = winfo->start_time;
+  return affectedRows;
+}
 
-    for (int i = 0; i < superTblInfo->insertRows;) {
+static int generateDataBuffer(int32_t tableSeq,
+        threadInfo *pThreadInfo, char *buffer,
+        int64_t insertRows,
+        int64_t startFrom, int64_t startTime, int *pSampleUsePos)
+{
+  SSuperTable* superTblInfo = pThreadInfo->superTblInfo;
 
-      int64_t tblInserted = i;
+  int ncols_per_record = 1; // count first col ts
 
-      if (i > 0 && g_args.insert_interval 
-            && (g_args.insert_interval > (et - st) )) {
-        int sleep_time = g_args.insert_interval - (et -st);
-        printf("sleep: %d ms specified by insert_interval\n", sleep_time);
-        taosMsleep(sleep_time); // ms
+  if (superTblInfo == NULL) {
+    int datatypeSeq = 0;
+    while(g_args.datatype[datatypeSeq]) {
+        datatypeSeq ++;
+        ncols_per_record ++;
     }
-
-      if (g_args.insert_interval) {
-        st = taosGetTimestampMs();
   }
 
-      sampleUsePos = samplePos;
-      verbosePrint("%s() LN%d num_of_RPR=%d\n", __func__, __LINE__, g_args.num_of_RPR);
+  assert(buffer != NULL);
 
-      memset(buffer, 0, superTblInfo->maxSqlLen);
-      int len = 0;
+  char *pChildTblName;
+  int childTblCount;
+
+  if (superTblInfo && (superTblInfo->childTblOffset > 0)) {
+      // TODO
+      // select tbname from stb limit 1 offset tableSeq
+    getChildNameOfSuperTableWithLimitAndOffset(pThreadInfo->taos,
+            pThreadInfo->db_name, superTblInfo->sTblName,
+            &pChildTblName, &childTblCount,
+            1, tableSeq);
+  } else {
+      pChildTblName = calloc(TSDB_TABLE_NAME_LEN, 1);
+      if (NULL == pChildTblName) {
+          fprintf(stderr, "failed to alloc memory %d\n", TSDB_TABLE_NAME_LEN);
+          return -1;
+      }
+      snprintf(pChildTblName, TSDB_TABLE_NAME_LEN, "%s%d",
+        superTblInfo?superTblInfo->childTblPrefix:g_args.tb_prefix, tableSeq);
+  }
+
+  memset(buffer, 0, superTblInfo?superTblInfo->maxSqlLen:g_args.max_sql_len);
 
   char *pstr = buffer;
 
+  if (superTblInfo) {
     if (AUTO_CREATE_SUBTBL == superTblInfo->autoCreateTable) {
       char* tagsValBuf = NULL;
       if (0 == superTblInfo->tagSource) {
@@ -4377,109 +4404,203 @@ static void* syncWriteWithStb(void *sarg) {
       } else {
             tagsValBuf = getTagValueFromTagSample(
                     superTblInfo,
-                    tID % superTblInfo->tagSampleCount);
+                    tableSeq % superTblInfo->tagSampleCount);
       }
       if (NULL == tagsValBuf) {
-            goto free_and_statistics_2;
+         fprintf(stderr, "tag buf failed to allocate  memory\n");
+         free(pChildTblName);
+         return -1;
       }
 
-          len += snprintf(pstr + len, 
-                  superTblInfo->maxSqlLen - len, 
-                  "insert into %s.%s%d using %s.%s tags %s values", 
-                  winfo->db_name, 
-                  superTblInfo->childTblPrefix, 
-                  tID, 
-                  winfo->db_name, 
+      pstr += snprintf(pstr,
+                  superTblInfo->maxSqlLen,
+                  "insert into %s.%s using %s.%s tags %s values",
+                  pThreadInfo->db_name,
+                  pChildTblName,
+                  pThreadInfo->db_name,
                   superTblInfo->sTblName,
                   tagsValBuf);
       tmfree(tagsValBuf);
     } else if (TBL_ALREADY_EXISTS == superTblInfo->childTblExists) {
-          len += snprintf(pstr + len, 
-                  superTblInfo->maxSqlLen - len, 
+      pstr += snprintf(pstr,
+                  superTblInfo->maxSqlLen,
                   "insert into %s.%s values",
-                  winfo->db_name, 
-                  superTblInfo->childTblName + tID * TSDB_TABLE_NAME_LEN);
+                  pThreadInfo->db_name,
+                  superTblInfo->childTblName + tableSeq * TSDB_TABLE_NAME_LEN);
     } else {
-          len += snprintf(pstr + len, 
-                  superTblInfo->maxSqlLen - len, 
-                  "insert into %s.%s%d values", 
-                  winfo->db_name, 
-                  superTblInfo->childTblPrefix, 
-                  tID);
+      pstr += snprintf(pstr,
+                  (superTblInfo?superTblInfo->maxSqlLen:g_args.max_sql_len),
+                  "insert into %s.%s values",
+                  pThreadInfo->db_name,
+                  pChildTblName);
+    }
+  } else {
+      pstr += snprintf(pstr,
+                  (superTblInfo?superTblInfo->maxSqlLen:g_args.max_sql_len),
+                  "insert into %s.%s values",
+                  pThreadInfo->db_name,
+                  pChildTblName);
   }
 
   int k;
+  int len = 0;
+
+  verbosePrint("%s() LN%d num_of_RPR=%d\n", __func__, __LINE__, g_args.num_of_RPR);
   for (k = 0; k < g_args.num_of_RPR;) {
+    if (superTblInfo) {
           int retLen = 0;
-        if (0 == strncasecmp(superTblInfo->dataSource, "sample", strlen("sample"))) {
+
+        if (0 == strncasecmp(superTblInfo->dataSource,
+                    "sample", strlen("sample"))) {
           retLen = getRowDataFromSample(
                     pstr + len, 
                     superTblInfo->maxSqlLen - len, 
-                    start_time + superTblInfo->timeStampStep * i,
+                    startTime + superTblInfo->timeStampStep * startFrom,
                     superTblInfo, 
-                    &sampleUsePos, 
-                    fp, 
-                    sampleDataBuf);
-            if (retLen < 0) {
-              goto free_and_statistics_2;
-            }
-        } else if (0 == strncasecmp(superTblInfo->dataSource, "rand", strlen("rand"))) {
+                    pSampleUsePos);
+       } else if (0 == strncasecmp(superTblInfo->dataSource,
+                   "rand", strlen("rand"))) {
           int rand_num = rand_tinyint() % 100;
           if (0 != superTblInfo->disorderRatio 
                     && rand_num < superTblInfo->disorderRatio) {
-              int64_t d = start_time - rand() % superTblInfo->disorderRange;
+            int64_t d = startTime - rand() % superTblInfo->disorderRange;
             retLen = generateRowData(
                       pstr + len, 
                       superTblInfo->maxSqlLen - len,
                       d, 
                       superTblInfo);
-              //printf("disorder rows, rand_num:%d, last ts:%"PRId64" current ts:%"PRId64"\n", rand_num, tmp_time, d);
+              //printf("disorder rows, rand_num:%d, last ts:%"PRId64" current ts:%"PRId64"\n", rand_num, start_time, d);
         } else {
           retLen = generateRowData(
                       pstr + len, 
                       superTblInfo->maxSqlLen - len, 
-                      start_time + superTblInfo->timeStampStep * i, 
+                      startTime + superTblInfo->timeStampStep * startFrom,
                       superTblInfo);
         }
+
         if (retLen < 0) {
-              goto free_and_statistics_2;
-            }
+          free(pChildTblName);
+          return -1;
         }
 
         len += retLen;
-        verbosePrint("%s() LN%d retLen=%d len=%d k=%d \nbuffer=%s\n", __func__, __LINE__, retLen, len, k, buffer);
+      }
+    } else {
+      int rand_num = rand() % 100;
+          char data[MAX_DATA_SIZE];
+          char **data_type = g_args.datatype;
+          int lenOfBinary = g_args.len_of_binary;
+
+      if ((g_args.disorderRatio != 0)
+                && (rand_num < g_args.disorderRange)) {
+             
+        int64_t d = startTime - rand() % 1000000 + rand_num;
+        len = generateData(data, data_type,
+                  ncols_per_record, d, lenOfBinary);
+      } else {
+            len = generateData(data, data_type,
+                  ncols_per_record,
+                  startTime + DEFAULT_TIMESTAMP_STEP * startFrom,
+                  lenOfBinary);
+      }
+
+      //assert(len + pstr - buffer < BUFFER_SIZE);
+      if (len + pstr - buffer >= g_args.max_sql_len) { // too long
+            break;
+      }
+
+      pstr += sprintf(pstr, " %s", data);
+    }
+
+    verbosePrint("%s() LN%d len=%d k=%d \nbuffer=%s\n", __func__, __LINE__, len, k, buffer);
 
-        tblInserted++;
     k++;
-        i++;
+    startFrom ++;
 
-        if (tblInserted >= superTblInfo->insertRows)
+    if (startFrom >= insertRows)
       break;
   }
 
-      winfo->totalRowsInserted += k;
+  return k;
+}
+
+// sync insertion
+/*
+   1 thread: 100 tables * 2000  rows/s
+   1 thread: 10  tables * 20000 rows/s
+   6 thread: 300 tables * 2000  rows/s
+
+   2 taosinsertdata , 1 thread:  10  tables * 20000 rows/s
+*/
+static void* syncWrite(void *sarg) {
+
+  threadInfo *winfo = (threadInfo *)sarg; 
+  SSuperTable* superTblInfo = winfo->superTblInfo;
+
+
+  if (superTblInfo) {
+    if (0 != prepareSampleDataForSTable(superTblInfo))
+        return NULL;
+
+    if (superTblInfo->numberOfTblInOneSql > 0) {
+      syncWriteForNumberOfTblInOneSql(winfo, superTblInfo->sampleDataBuf);
+      tmfree(superTblInfo->sampleDataBuf);
+      return NULL;
+    }
+  }
+ 
+  int   samplePos     = 0;
+
+  char* buffer = calloc(superTblInfo?superTblInfo->maxSqlLen:g_args.max_sql_len, 1);
+  if (NULL == buffer) {
+    fprintf(stderr, "Failed to alloc %d Bytes, reason:%s\n",
+              superTblInfo->maxSqlLen,
+              strerror(errno));
+    tmfree(superTblInfo->sampleDataBuf);
+    return NULL;
+  }
 
+  int64_t lastPrintTime = taosGetTimestampMs();
   int64_t startTs = taosGetTimestampUs();
   int64_t endTs;
-      int affectedRows;
-      if (0 == strncasecmp(superTblInfo->insertMode, "taosc", strlen("taosc"))) {
-          verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
-          affectedRows = queryDbExec(winfo->taos, buffer, INSERT_TYPE);
 
-          if (0 > affectedRows){
-            goto free_and_statistics_2;
+  int insert_interval = superTblInfo?superTblInfo->insertInterval:
+      g_args.insert_interval;
+  uint64_t st = 0;
+  uint64_t et = 0xffffffff;
+
+  winfo->totalInsertRows = 0;
+  winfo->totalAffectedRows = 0;
+
+  int sampleUsePos;
+
+  for (uint32_t tableSeq = winfo->start_table_id; tableSeq <= winfo->end_table_id;
+        tableSeq ++) {
+    int64_t start_time = winfo->start_time;
+
+    int64_t insertRows = (superTblInfo)?superTblInfo->insertRows:g_args.num_of_DPT;
+    verbosePrint("%s() LN%d insertRows=%"PRId64"\n", __func__, __LINE__, insertRows);
+
+    for (int64_t i = 0; i < insertRows;) {
+      if (insert_interval) {
+            st = taosGetTimestampUs();
       }
-      } else {
-          verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
-          int retCode = postProceSql(g_Dbs.host, g_Dbs.port, buffer);
 
-          if (0 != retCode) {
-            printf("========restful return fail, threadID[%d]\n", winfo->threadID);
+      sampleUsePos = samplePos;
+
+      int generated = generateDataBuffer(tableSeq, winfo, buffer, insertRows,
+            i, start_time, &sampleUsePos);
+      if (generated > 0)
+        i += generated;
+      else
         goto free_and_statistics_2;
-          }
 
-          affectedRows = k;
-      }
+      int affectedRows = execInsert(winfo, buffer, generated);
+      if (affectedRows < 0)
+        goto free_and_statistics_2;
+
+      winfo->totalInsertRows += generated;
+      winfo->totalAffectedRows += affectedRows;
 
       endTs = taosGetTimestampUs();
       int64_t delay = endTs - startTs;
@@ -4488,54 +4609,57 @@ static void* syncWriteWithStb(void *sarg) {
       winfo->cntDelay++;
       winfo->totalDelay += delay;
 
-      winfo->totalAffectedRows += affectedRows;
-
       int64_t  currentPrintTime = taosGetTimestampMs();
       if (currentPrintTime - lastPrintTime > 30*1000) {
         printf("thread[%d] has currently inserted rows: %"PRId64 ", affected rows: %"PRId64 "\n",
                     winfo->threadID,
-                    winfo->totalRowsInserted,
+                    winfo->totalInsertRows,
                     winfo->totalAffectedRows);
         lastPrintTime = currentPrintTime;
       }
 
-      if (g_args.insert_interval) {
-        et = taosGetTimestampMs();
-      }
-
-      if (tblInserted >= superTblInfo->insertRows)
+      if (i >= insertRows)
         break;
-    }   // num_of_DPT
 
-    if (tID == winfo->end_table_id) {
-        if (0 == strncasecmp(
-                    superTblInfo->dataSource, "sample", strlen("sample"))) {
-          samplePos = sampleUsePos;
+      if (insert_interval) {
+        et = taosGetTimestampUs();
+
+        if (insert_interval > ((et - st)/1000) ) {
+            int sleep_time = insert_interval - (et -st)/1000;
+            verbosePrint("%s() LN%d sleep: %d ms for insert interval\n", __func__, __LINE__, sleep_time);
+            taosMsleep(sleep_time); // ms
+        }
       }
+    }   // num_of_DPT
 
+    if ((tableSeq == winfo->end_table_id) && superTblInfo &&
+        (0 == strncasecmp(
+                    superTblInfo->dataSource, "sample", strlen("sample")))) {
+          samplePos = sampleUsePos;
     }
-    //printf("========loop %d childTables duration:%"PRId64 "========inserted rows:%d\n", winfo->end_table_id - winfo->start_table_id, et - st, i);
-  } // tID
+  } // tableSeq
 
 free_and_statistics_2:
   tmfree(buffer);
-  tmfree(sampleDataBuf);
-  tmfclose(fp);
+  if (superTblInfo)
+    tmfree(superTblInfo->sampleDataBuf);
 
   printf("====thread[%d] completed total inserted rows: %"PRId64 ", total affected rows: %"PRId64 "====\n", 
           winfo->threadID, 
-          winfo->totalRowsInserted, 
+          winfo->totalInsertRows, 
           winfo->totalAffectedRows);
   return NULL;
 }
 
 void callBack(void *param, TAOS_RES *res, int code) {
   threadInfo* winfo = (threadInfo*)param; 
+  SSuperTable* superTblInfo = winfo->superTblInfo;
 
-  if (g_args.insert_interval) {
-    winfo->et = taosGetTimestampMs();
-    if (winfo->et - winfo->st < 1000) {
-      taosMsleep(1000 - (winfo->et - winfo->st)); // ms
+  int insert_interval = superTblInfo?superTblInfo->insertInterval:g_args.insert_interval;
+  if (insert_interval) {
+    winfo->et = taosGetTimestampUs();
+    if (((winfo->et - winfo->st)/1000) < insert_interval) {
+      taosMsleep(insert_interval - (winfo->et - winfo->st)/1000); // ms
     }
   }
   
@@ -4564,7 +4688,7 @@ void callBack(void *param, TAOS_RES *res, int code) {
       //generateData(data, datatype, ncols_per_record, d, len_of_binary);
       (void)generateRowData(data, MAX_DATA_SIZE, d, winfo->superTblInfo);
     } else {
-      //generateData(data, datatype, ncols_per_record, tmp_time += 1000, len_of_binary);
+      //generateData(data, datatype, ncols_per_record, start_time += 1000, len_of_binary);
       (void)generateRowData(data, MAX_DATA_SIZE, winfo->lastTs += 1000, winfo->superTblInfo);
     }
     pstr += sprintf(pstr, "%s", data);
@@ -4575,8 +4699,8 @@ void callBack(void *param, TAOS_RES *res, int code) {
     }
   }
   
-  if (g_args.insert_interval) {
-    winfo->st = taosGetTimestampMs();
+  if (insert_interval) {
+    winfo->st = taosGetTimestampUs();
   }
   taos_query_a(winfo->taos, buffer, callBack, winfo);
   free(buffer);
@@ -4587,13 +4711,15 @@ void callBack(void *param, TAOS_RES *res, int code) {
 
 void *asyncWrite(void *sarg) {
   threadInfo *winfo = (threadInfo *)sarg;
+  SSuperTable* superTblInfo = winfo->superTblInfo;
 
   winfo->st = 0;
   winfo->et = 0;
   winfo->lastTs = winfo->start_time;
   
-  if (g_args.insert_interval) {
-    winfo->st = taosGetTimestampMs();
+  int insert_interval = superTblInfo?superTblInfo->insertInterval:g_args.insert_interval;
+  if (insert_interval) {
+    winfo->st = taosGetTimestampUs();
   }
   taos_query_a(winfo->taos, "show databases", callBack, winfo);
 
@@ -4602,16 +4728,23 @@ void *asyncWrite(void *sarg) {
   return NULL;
 }
 
-void startMultiThreadInsertData(int threads, char* db_name, char* precision,
-        SSuperTable* superTblInfo) {
+static void startMultiThreadInsertData(int threads, char* db_name,
+        char* precision,SSuperTable* superTblInfo) {
 
     pthread_t *pids = malloc(threads * sizeof(pthread_t));
+    assert(pids != NULL);
+
     threadInfo *infos = malloc(threads * sizeof(threadInfo));
+    assert(infos != NULL);
+
     memset(pids, 0, threads * sizeof(pthread_t));
     memset(infos, 0, threads * sizeof(threadInfo));
 
     int ntables = 0;
     if (superTblInfo)
+        if (superTblInfo->childTblOffset)
+            ntables = superTblInfo->childTblLimit;
+        else
             ntables = superTblInfo->childTblCount;
     else
         ntables = g_args.num_of_tables;
@@ -4643,7 +4776,7 @@ void startMultiThreadInsertData(int threads, char* db_name, char* precision,
     }  else if (0 == strncasecmp(precision, "us", 2)) {
       timePrec = TSDB_TIME_PRECISION_MICRO;
     }  else {
-      printf("No support precision: %s\n", precision);
+      fprintf(stderr, "No support precision: %s\n", precision);
       exit(-1);
     }
   }
@@ -4668,7 +4801,13 @@ void startMultiThreadInsertData(int threads, char* db_name, char* precision,
 
   double start = getCurrentTime();
  
-  int last = 0;
+  int last;
+
+  if ((superTblInfo) && (superTblInfo->childTblOffset))
+      last = superTblInfo->childTblOffset;
+  else
+      last = 0;
+
   for (int i = 0; i < threads; i++) {
     threadInfo *t_info = infos + i;
     t_info->threadID = i;
@@ -4706,11 +4845,7 @@ void startMultiThreadInsertData(int threads, char* db_name, char* precision,
 
     tsem_init(&(t_info->lock_sem), 0, 0);
     if (SYNC == g_Dbs.queryMode) {
-        if (superTblInfo) {
-            pthread_create(pids + i, NULL, syncWriteWithStb, t_info);
-        } else {
       pthread_create(pids + i, NULL, syncWrite, t_info);
-        }
     } else {
       pthread_create(pids + i, NULL, asyncWrite, t_info);
     }
@@ -4734,7 +4869,7 @@ void startMultiThreadInsertData(int threads, char* db_name, char* precision,
 
     if (superTblInfo) {
         superTblInfo->totalAffectedRows += t_info->totalAffectedRows;
-        superTblInfo->totalRowsInserted += t_info->totalRowsInserted;
+        superTblInfo->totalInsertRows += t_info->totalInsertRows;
     }
 
     totalDelay  += t_info->totalDelay;
@@ -4752,15 +4887,16 @@ void startMultiThreadInsertData(int threads, char* db_name, char* precision,
 
   if (superTblInfo) {
     printf("Spent %.4f seconds to insert rows: %"PRId64", affected rows: %"PRId64" with %d thread(s) into %s.%s. %2.f records/second\n\n",
-          t, superTblInfo->totalRowsInserted,
+          t, superTblInfo->totalInsertRows,
           superTblInfo->totalAffectedRows,
           threads, db_name, superTblInfo->sTblName,
-          superTblInfo->totalRowsInserted / t);
-    fprintf(g_fpOfInsertResult, "Spent %.4f seconds to insert rows: %"PRId64", affected rows: %"PRId64" with %d thread(s) into %s.%s. %2.f records/second\n\n", 
-          t, superTblInfo->totalRowsInserted,
+          superTblInfo->totalInsertRows / t);
+    fprintf(g_fpOfInsertResult,
+          "Spent %.4f seconds to insert rows: %"PRId64", affected rows: %"PRId64" with %d thread(s) into %s.%s. %2.f records/second\n\n",
+          t, superTblInfo->totalInsertRows,
           superTblInfo->totalAffectedRows,
           threads, db_name, superTblInfo->sTblName,
-          superTblInfo->totalRowsInserted / t);
+          superTblInfo->totalInsertRows/ t);
   }
 
   printf("insert delay, avg: %10.6fms, max: %10.6fms, min: %10.6fms\n\n",
@@ -4774,7 +4910,6 @@ void startMultiThreadInsertData(int threads, char* db_name, char* precision,
   free(infos);
 }
 
-
 void *readTable(void *sarg) {
 #if 1  
   threadInfo *rinfo = (threadInfo *)sarg;
@@ -4919,7 +5054,7 @@ void *readMetric(void *sarg) {
 }
 
 
-int insertTestProcess() {
+static int insertTestProcess() {
 
   setupForAnsiEscape();
   int ret = printfInsertMeta();
@@ -4933,10 +5068,10 @@ int insertTestProcess() {
   if (NULL == g_fpOfInsertResult) {
     fprintf(stderr, "Failed to open %s for save result\n", g_Dbs.resultFile);
     return -1;
-  } {
-    printfInsertMetaToFile(g_fpOfInsertResult);
   }
 
+  printfInsertMetaToFile(g_fpOfInsertResult);
+
   if (!g_args.answer_yes) {
     printf("Press enter key to continue\n\n");
     (void)getchar();
@@ -4951,7 +5086,7 @@ int insertTestProcess() {
   }
 
   // pretreatement
-  prePareSampleData();
+  prepareSampleData();
 
   double start;
   double end;
@@ -4995,14 +5130,14 @@ int insertTestProcess() {
   }
   //end = getCurrentTime();
 
-  //int64_t    totalRowsInserted = 0;
+  //int64_t    totalInsertRows = 0;
   //int64_t    totalAffectedRows = 0;
   //for (int i = 0; i < g_Dbs.dbCount; i++) {    
   //  for (int j = 0; j < g_Dbs.db[i].superTblCount; j++) {
-  //  totalRowsInserted += g_Dbs.db[i].superTbls[j].totalRowsInserted;
+  //  totalInsertRows+= g_Dbs.db[i].superTbls[j].totalInsertRows;
   //  totalAffectedRows += g_Dbs.db[i].superTbls[j].totalAffectedRows;
   //}
-  //printf("Spent %.4f seconds to insert rows: %"PRId64", affected rows: %"PRId64" with %d thread(s)\n\n", end - start, totalRowsInserted, totalAffectedRows, g_Dbs.threadCount);
+  //printf("Spent %.4f seconds to insert rows: %"PRId64", affected rows: %"PRId64" with %d thread(s)\n\n", end - start, totalInsertRows, totalAffectedRows, g_Dbs.threadCount);
   postFreeResource();
 
   return 0;
@@ -5023,7 +5158,7 @@ void *superQueryProcess(void *sarg) {
       //printf("========sleep duration:%"PRId64 "========inserted rows:%d, table range:%d - %d\n", (1000 - (et - st)), i, winfo->start_table_id, winfo->end_table_id);
     }
 
-    st = taosGetTimestampMs();
+    st = taosGetTimestampUs();
     for (int i = 0; i < g_queryInfo.superQueryInfo.sqlCount; i++) {
       if (0 == strncasecmp(g_queryInfo.queryMode, "taosc", 5)) {          
         int64_t t1 = taosGetTimestampUs();
@@ -5049,14 +5184,14 @@ void *superQueryProcess(void *sarg) {
         }
       }   
     }
-    et = taosGetTimestampMs();
+    et = taosGetTimestampUs();
     printf("==thread[%"PRId64"] complete all sqls to specify tables once queries duration:%.6fs\n\n", 
             taosGetSelfPthreadId(), (double)(et - st)/1000.0);
   }
   return NULL;
 }
 
-void replaceSubTblName(char* inSql, char* outSql, int tblIndex) {
+static void replaceSubTblName(char* inSql, char* outSql, int tblIndex) {
   char sourceString[32] = "xxxx";
   char subTblName[MAX_TB_NAME_SIZE*3];
   sprintf(subTblName, "%s.%s", 
@@ -5078,7 +5213,7 @@ void replaceSubTblName(char* inSql, char* outSql, int tblIndex) {
   //printf("3: %s\n", outSql); 
 }
 
-void *subQueryProcess(void *sarg) {
+static void *subQueryProcess(void *sarg) {
   char sqlstr[1024];
   threadInfo *winfo = (threadInfo *)sarg; 
   int64_t st = 0;
@@ -5089,7 +5224,7 @@ void *subQueryProcess(void *sarg) {
       //printf("========sleep duration:%"PRId64 "========inserted rows:%d, table range:%d - %d\n", (1000 - (et - st)), i, winfo->start_table_id, winfo->end_table_id);
     }
 
-    st = taosGetTimestampMs();
+    st = taosGetTimestampUs();
     for (int i = winfo->start_table_id; i <= winfo->end_table_id; i++) {
       for (int j = 0; j < g_queryInfo.subQueryInfo.sqlCount; j++) {
         memset(sqlstr,0,sizeof(sqlstr));
@@ -5103,12 +5238,12 @@ void *subQueryProcess(void *sarg) {
         selectAndGetResult(winfo->taos, sqlstr, tmpFile); 
       }
     }
-    et = taosGetTimestampMs();
+    et = taosGetTimestampUs();
     printf("####thread[%"PRId64"] complete all sqls to allocate all sub-tables[%d - %d] once queries duration:%.4fs\n\n", 
             taosGetSelfPthreadId(), 
             winfo->start_table_id, 
             winfo->end_table_id, 
-            (double)(et - st)/1000.0);
+            (double)(et - st)/1000000.0);
   }
   return NULL;
 }
@@ -5126,7 +5261,7 @@ static int queryTestProcess() {
   }
 
   if (0 != g_queryInfo.subQueryInfo.sqlCount) {
-    (void)getAllChildNameOfSuperTable(taos, 
+    getAllChildNameOfSuperTable(taos,
             g_queryInfo.dbName,
             g_queryInfo.subQueryInfo.sTblName,
             &g_queryInfo.subQueryInfo.childTblName,
@@ -5179,7 +5314,8 @@ static int queryTestProcess() {
   pthread_t  *pidsOfSub  = NULL;
   threadInfo *infosOfSub = NULL;
   //==== create sub threads for query from all sub table of the super table
-  if ((g_queryInfo.subQueryInfo.sqlCount > 0) && (g_queryInfo.subQueryInfo.threadCnt > 0)) {
+  if ((g_queryInfo.subQueryInfo.sqlCount > 0)
+          && (g_queryInfo.subQueryInfo.threadCnt > 0)) {
     pidsOfSub  = malloc(g_queryInfo.subQueryInfo.threadCnt * sizeof(pthread_t));
     infosOfSub = malloc(g_queryInfo.subQueryInfo.threadCnt * sizeof(threadInfo));
     if ((NULL == pidsOfSub) || (NULL == infosOfSub)) {
@@ -5423,14 +5559,13 @@ static int subscribeTestProcess() {
   }
 
   if (0 != g_queryInfo.subQueryInfo.sqlCount) {
-    (void)getAllChildNameOfSuperTable(taos, 
+    getAllChildNameOfSuperTable(taos, 
             g_queryInfo.dbName, 
             g_queryInfo.subQueryInfo.sTblName, 
             &g_queryInfo.subQueryInfo.childTblName, 
             &g_queryInfo.subQueryInfo.childTblCount);
   }
 
-
   pthread_t  *pids = NULL;
   threadInfo *infos = NULL;
   //==== create sub threads for query from super table
@@ -5599,7 +5734,7 @@ void setParaFromArg(){
     tstrncpy(g_Dbs.db[0].superTbls[0].insertMode, "taosc", MAX_TB_NAME_SIZE);
     tstrncpy(g_Dbs.db[0].superTbls[0].startTimestamp, 
             "2017-07-14 10:40:00.000", MAX_TB_NAME_SIZE);
-    g_Dbs.db[0].superTbls[0].timeStampStep = 10;
+    g_Dbs.db[0].superTbls[0].timeStampStep = DEFAULT_TIMESTAMP_STEP;
   
     g_Dbs.db[0].superTbls[0].insertRows = g_args.num_of_DPT;
     g_Dbs.db[0].superTbls[0].maxSqlLen = TSDB_PAYLOAD_SIZE;
@@ -5745,14 +5880,7 @@ static void testMetaFile() {
     }
 }
 
-static void testCmdLine() {
-
-    g_args.test_mode = INSERT_MODE;
-    insertTestProcess();
-
-    if (g_Dbs.insert_only)
-      return;
-
+static void queryResult() {
     // select
     if (false == g_Dbs.insert_only) {
       // query data
@@ -5798,6 +5926,17 @@ static void testCmdLine() {
     }
 }
 
+static void testCmdLine() {
+
+    g_args.test_mode = INSERT_MODE;
+    insertTestProcess();
+
+    if (g_Dbs.insert_only)
+      return;
+    else
+        queryResult();
+}
+
 int main(int argc, char *argv[]) {
   parse_args(argc, argv, &g_args);
 

src/plugins/http/inc/httpJson.h

@@ -63,9 +63,11 @@ void httpJsonString(JsonBuf* buf, char* sVal, int32_t len);
 void httpJsonOriginString(JsonBuf* buf, char* sVal, int32_t len);
 void httpJsonStringForTransMean(JsonBuf* buf, char* SVal, int32_t maxLen);
 void httpJsonInt64(JsonBuf* buf, int64_t num);
+void httpJsonUInt64(JsonBuf* buf, uint64_t num);
 void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us);
 void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, bool us);
 void httpJsonInt(JsonBuf* buf, int32_t num);
+void httpJsonUInt(JsonBuf* buf, uint32_t num);
 void httpJsonFloat(JsonBuf* buf, float num);
 void httpJsonDouble(JsonBuf* buf, double num);
 void httpJsonNull(JsonBuf* buf);

src/plugins/http/src/httpJson.c

@@ -256,6 +256,12 @@ void httpJsonInt64(JsonBuf* buf, int64_t num) {
   buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%" PRId64, num);
 }
 
+void httpJsonUInt64(JsonBuf* buf, uint64_t num) {
+  httpJsonItemToken(buf);
+  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
+  buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%" PRIu64, num);
+}
+
 void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us) {
   char       ts[35] = {0};
   struct tm* ptm;
@@ -303,6 +309,12 @@ void httpJsonInt(JsonBuf* buf, int32_t num) {
   buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%d", num);
 }
 
+void httpJsonUInt(JsonBuf* buf, uint32_t num) {
+  httpJsonItemToken(buf);
+  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
+  buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%u", num);
+}
+
 void httpJsonFloat(JsonBuf* buf, float num) {
   httpJsonItemToken(buf);
   httpJsonTestBuf(buf, MAX_NUM_STR_SZ);

src/plugins/http/src/httpRestJson.c

@@ -162,6 +162,18 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
         case TSDB_DATA_TYPE_BIGINT:
           httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
           break;
+        case TSDB_DATA_TYPE_UTINYINT:
+          httpJsonUInt(jsonBuf, *((uint8_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_USMALLINT:
+          httpJsonUInt(jsonBuf, *((uint16_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_UINT:
+          httpJsonUInt(jsonBuf, *((uint32_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_UBIGINT:
+          httpJsonUInt64(jsonBuf, *((uint64_t *)row[i]));
+          break;
         case TSDB_DATA_TYPE_FLOAT:
           httpJsonFloat(jsonBuf, GET_FLOAT_VAL(row[i]));
           break;

tests/pytest/crash_gen/crash_gen_main.py

@@ -1785,7 +1785,7 @@ class TdSuperTable:
                     'top(speed, 50)', # TODO: not supported?
                     'bottom(speed, 50)', # TODO: not supported?
                     'apercentile(speed, 10)', # TODO: TD-1316
-                    'last_row(speed)',
+                    # 'last_row(speed)', # TODO: commented out per TD-3231, we should re-create
                     # Transformation Functions
                     # 'diff(speed)', # TODO: no supported?!
                     'spread(speed)'

tests/pytest/fulltest.sh

@@ -183,6 +183,7 @@ python3 ./test.py -f query/isNullTest.py
 python3 ./test.py -f query/queryWithTaosdKilled.py
 python3 ./test.py -f query/floatCompare.py
 python3 ./test.py -f query/queryGroupbySort.py
+python3 ./test.py -f query/queryBetweenAnd.py
 
 #stream
 python3 ./test.py -f stream/metric_1.py

tests/pytest/functions/function_stddev.py

@@ -26,6 +26,8 @@ class TDTestCase:
 
         self.rowNum = 10
         self.ts = 1537146000000
+        self.stb_prefix = 's'
+        self.subtb_prefix = 't'
         
     def run(self):
         tdSql.prepare()
@@ -86,6 +88,33 @@ class TDTestCase:
         tdSql.query("select stddev(col6) from test1")
         tdSql.checkData(0, 0, np.std(floatData))
 
+        #add for td-3276
+        sql="create table s (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool,c8 binary(20),c9 nchar(20),c11 int unsigned,c12 smallint unsigned,c13 tinyint unsigned,c14 bigint unsigned) \
+            tags(t1 int, t2 float, t3 bigint, t4 smallint, t5 tinyint, t6 double, t7 bool,t8 binary(20),t9 nchar(20), t10 int unsigned , t11 smallint unsigned , t12 tinyint unsigned , t13 bigint unsigned)"
+        tdSql.execute(sql)
+        for j in range(2):
+            if j % 2 == 0:
+                sql = "create table %s using %s tags(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)" % \
+                        (self.subtb_prefix+str(j)+'_'+str(j),self.stb_prefix)
+            else:
+                sql = "create table %s using %s tags(%d,%d,%d,%d,%d,%d,%d,'%s','%s',%d,%d,%d,%d)" % \
+                        (self.subtb_prefix+str(j)+'_'+str(j),self.stb_prefix,j,j/2.0,j%41,j%51,j%53,j*1.0,j%2,'taos'+str(j),'涛思'+str(j), j%43, j%23 , j%17 , j%3167)
+            tdSql.execute(sql)
+            for i in range(10):
+                if i % 5 == 0 :
+                    ret = tdSql.execute(
+                    "insert into %s values (%d , NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)" %
+                    (self.subtb_prefix+str(j)+'_'+str(j), self.ts+i))
+                else:
+                    ret = tdSql.execute(
+                        "insert into %s values (%d , %d,%d,%d,%d,%d,%d,%d,'%s','%s',%d,%d,%d,%d)" %
+                        (self.subtb_prefix+str(j)+'_'+str(j), self.ts+i, i%100, i/2.0, i%41, i%51, i%53, i*1.0, i%2,'taos'+str(i),'涛思'+str(i), i%43, i%23 , i%17 , i%3167))
+        
+        for i in range(13):
+            tdSql.query('select stddev(c4) from s group by t%s' % str(i+1) )
+
+        
+            
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/query/queryBetweenAnd.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import taos
+import sys
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+
+
+
+class TDTestCase:
+
+    def init(self, conn, logSql):
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.printNoPrefix("==========step1:create table")
+        tdSql.execute(
+            '''create table if not exists supt 
+            (ts timestamp, c1 int, c2 float, c3 bigint, c4 double, c5 smallint, c6 tinyint) 
+            tags(location binary(64), type int, isused bool , family nchar(64))'''
+        )
+        tdSql.execute("create table t1 using supt tags('beijing', 1, 1, '自行车')")
+        tdSql.execute("create table t2 using supt tags('shanghai', 2, 0, '拖拉机')")
+
+        tdLog.printNoPrefix("==========step2:insert data")
+        for i in range(10):
+            tdSql.execute(
+                f"insert into t1 values (now+{i}m, {32767+i}, {20.0+i/10}, {2**31+i}, {3.4*10**38+i/10}, {127+i}, {i})"
+            )
+            tdSql.execute(
+                f"insert into t2 values (now-{i}m, {-32767-i}, {20.0-i/10}, {-i-2**31}, {-i/10-3.4*10**38}, {-127-i}, {-i})"
+            )
+        tdSql.execute(
+            f"insert into t1 values (now+11m, {2**31-1}, {pow(10,37)*34}, {pow(2,63)-1}, {1.7*10**308}, 32767, 127)"
+        )
+        tdSql.execute(
+            f"insert into t2 values (now-11m, {1-2**31}, {-3.4*10**38}, {1-2**63}, {-1.7*10**308}, -32767, -127)"
+        )
+        tdSql.execute(
+            f"insert into t2 values (now-12m, null , {-3.4*10**38}, null , {-1.7*10**308}, null , null)"
+        )
+
+        tdLog.printNoPrefix("==========step3:query timestamp type")
+
+        tdSql.query("select * from t1 where ts between now-1m and now+10m")
+        tdSql.checkRows(10)
+        tdSql.query("select * from t1 where ts between '2021-01-01 00:00:00.000' and '2121-01-01 00:00:00.000'")
+        tdSql.checkRows(11)
+        tdSql.query("select * from t1 where ts between '1969-01-01 00:00:00.000' and '1969-12-31 23:59:59.999'")
+        tdSql.checkRows(0)
+        tdSql.query("select * from t1 where ts between -2793600 and 31507199")
+        tdSql.checkRows(0)
+        tdSql.query("select * from t1 where ts between 1609430400000 and 4765104000000")
+        tdSql.checkRows(11)
+
+        tdLog.printNoPrefix("==========step4:query int type")
+
+        tdSql.query("select * from t1 where c1 between 32767 and 32776")
+        tdSql.checkRows(10)
+        tdSql.query("select * from t1 where c1 between 32766.9 and 32776.1")
+        tdSql.checkRows(10)
+        tdSql.query("select * from t1 where c1 between 32776 and 32767")
+        tdSql.checkRows(0)
+        tdSql.error("select * from t1 where c1 between 'a' and 'e'")
+        # tdSql.query("select * from t1 where c1 between 0x64 and 0x69")
+        # tdSql.checkRows(6)
+        tdSql.error("select * from t1 where c1 not between 100 and 106")
+        tdSql.query(f"select * from t1 where c1 between {2**31-2} and {2**31+1}")
+        tdSql.checkRows(1)
+        tdSql.error(f"select * from t2 where c1 between null and {1-2**31}")
+        # tdSql.checkRows(3)
+        tdSql.query(f"select * from t2 where c1 between {-2**31} and {1-2**31}")
+        tdSql.checkRows(1)
+
+        tdLog.printNoPrefix("==========step5:query float type")
+
+        tdSql.query("select * from t1 where c2 between 20.0 and 21.0")
+        tdSql.checkRows(10)
+        tdSql.query(f"select * from t1 where c2 between {-3.4*10**38-1} and {3.4*10**38+1}")
+        tdSql.checkRows(11)
+        tdSql.query("select * from t1 where c2 between 21.0 and 20.0")
+        tdSql.checkRows(0)
+        tdSql.error("select * from t1 where c2 between 'DC3' and 'SYN'")
+        tdSql.error("select * from t1 where c2 not between 0.1 and 0.2")
+        # tdSql.query(f"select * from t1 where c2 between {pow(10,38)*3.4} and {pow(10,38)*3.4+1}")
+        # tdSql.checkRows(1)
+        tdSql.query(f"select * from t2 where c2 between {-3.4*10**38-1} and {-3.4*10**38}")
+        tdSql.checkRows(0)
+        tdSql.error(f"select * from t2 where c2 between null and {-3.4*10**38}")
+        # tdSql.checkRows(3)
+
+        tdLog.printNoPrefix("==========step6:query bigint type")
+
+        tdSql.query(f"select * from t1 where c3 between {2**31} and {2**31+10}")
+        tdSql.checkRows(10)
+        tdSql.error(f"select * from t1 where c3 between {-2**63} and {2**63}")
+        # tdSql.checkRows(11)
+        tdSql.query(f"select * from t1 where c3 between {2**31+10} and {2**31}")
+        tdSql.checkRows(0)
+        tdSql.error("select * from t1 where c3 between 'a' and 'z'")
+        tdSql.error("select * from t1 where c3 not between 1 and 2")
+        tdSql.query(f"select * from t1 where c3 between {2**63-2} and {2**63-1}")
+        tdSql.checkRows(1)
+        tdSql.error(f"select * from t2 where c3 between {-2**63} and {1-2**63}")
+        # tdSql.checkRows(3)
+        tdSql.error(f"select * from t2 where c3 between null and {1-2**63}")
+        # tdSql.checkRows(2)
+
+        tdLog.printNoPrefix("==========step7:query double type")
+
+        tdSql.query(f"select * from t1 where c4 between {3.4*10**38} and {3.4*10**38+10}")
+        tdSql.checkRows(10)
+        tdSql.query(f"select * from t1 where c4 between {1.7*10**308+1} and {1.7*10**308+2}")
+        # 因为精度原因，在超出bigint边界后，数值不能进行准确的判断
+        # tdSql.checkRows(0)
+        tdSql.query(f"select * from t1 where c4 between {3.4*10**38+10} and {3.4*10**38}")
+        # tdSql.checkRows(0)
+        tdSql.error("select * from t1 where c4 between 'a' and 'z'")
+        tdSql.error("select * from t1 where c4 not between 1 and 2")
+        tdSql.query(f"select * from t1 where c4 between {1.7*10**308} and {1.7*10**308+1}")
+        tdSql.checkRows(1)
+        tdSql.query(f"select * from t2 where c4 between {-1.7*10**308-1} and {-1.7*10**308}")
+        # tdSql.checkRows(3)
+        tdSql.error(f"select * from t2 where c4 between null and {-1.7*10**308}")
+        # tdSql.checkRows(3)
+
+        tdLog.printNoPrefix("==========step8:query smallint type")
+
+        tdSql.query("select * from t1 where c5 between 127 and 136")
+        tdSql.checkRows(10)
+        tdSql.query("select * from t1 where c5 between 126.9 and 135.9")
+        tdSql.checkRows(9)
+        tdSql.query("select * from t1 where c5 between 136 and 127")
+        tdSql.checkRows(0)
+        tdSql.error("select * from t1 where c5 between '~' and 'ˆ'")
+        tdSql.error("select * from t1 where c5 not between 1 and 2")
+        tdSql.query("select * from t1 where c5 between 32767 and 32768")
+        tdSql.checkRows(1)
+        tdSql.query("select * from t2 where c5 between -32768 and -32767")
+        tdSql.checkRows(1)
+        tdSql.error("select * from t2 where c5 between null and -32767")
+        # tdSql.checkRows(1)
+
+        tdLog.printNoPrefix("==========step9:query tinyint type")
+
+        tdSql.query("select * from t1 where c6 between 0 and 9")
+        tdSql.checkRows(10)
+        tdSql.query("select * from t1 where c6 between -1.1 and 8.9")
+        tdSql.checkRows(9)
+        tdSql.query("select * from t1 where c6 between 9 and 0")
+        tdSql.checkRows(0)
+        tdSql.error("select * from t1 where c6 between 'NUL' and 'HT'")
+        tdSql.error("select * from t1 where c6 not between 1 and 2")
+        tdSql.query("select * from t1 where c6 between 127 and 128")
+        tdSql.checkRows(1)
+        tdSql.query("select * from t2 where c6 between -128 and -127")
+        tdSql.checkRows(1)
+        tdSql.error("select * from t2 where c6 between null and -127")
+        # tdSql.checkRows(3)
+
+        tdLog.printNoPrefix("==========step10:invalid query type")
+
+        tdSql.query("select * from supt where location between 'beijing' and 'shanghai'")
+        tdSql.checkRows(23)
+        # 非0值均解析为1，因此"between 负值 and o"解析为"between 1 and 0"
+        tdSql.query("select * from supt where isused between 0 and 1")
+        tdSql.checkRows(23)
+        tdSql.query("select * from supt where isused between -1 and 0")
+        tdSql.checkRows(0)
+        tdSql.error("select * from supt where isused between false and true")
+        tdSql.query("select * from supt where family between '拖拉机' and '自行车'")
+        tdSql.checkRows(23)
+
+        tdLog.printNoPrefix("==========step11:query HEX/OCT/BIN type")
+
+        tdSql.error("select * from t1 where c6 between 0x7f and 0x80")      # check filter HEX
+        tdSql.error("select * from t1 where c6 between 0b1 and 0b11111")    # check filter BIN
+        tdSql.error("select * from t1 where c6 between 0b1 and 0x80")
+        tdSql.error("select * from t1 where c6=0b1")
+        tdSql.error("select * from t1 where c6=0x1")
+        # 八进制数据会按照十进制数据进行判定
+        tdSql.query("select * from t1 where c6 between 01 and 0200")        # check filter OCT
+        tdSql.checkRows(10)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
\ No newline at end of file

tests/pytest/tools/taosdemoTestWithoutMetric.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.numberOfTables = 100
+        self.numberOfRecords = 1000
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+
+    def run(self):
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+        os.system("%staosdemo -y -t %d -n %d -x" %
+                  (binPath, self.numberOfTables, self.numberOfRecords))
+
+        tdSql.query("show databases")
+        for i in range(18):
+            print(tdSql.getData(0, i) )
+        tdSql.checkData(0, 2, self.numberOfTables)
+
+        tdSql.execute("use test")
+        tdSql.query(
+            "select count(*) from test.t%d" % (self.numberOfTables -1))
+        tdSql.checkData(0, 0, self.numberOfRecords)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/script/general/db/topic1.sim

@@ -740,11 +740,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-#numofvgroups
-sql show t1.vgroups;
-if $rows != 1 then 
-  return -1
-endi
+
 sql show t1.stables;
 if $rows != 1 then 
   return -1
@@ -773,11 +769,8 @@ endi
 if $data02 != 2 then 
   return -1
 endi
-#numofvgroups
-sql show t1.vgroups;
-if $rows != 2 then 
-  return -1
-endi
+
+
 sql show t1.stables;
 if $rows != 1 then 
   return -1
@@ -806,11 +799,7 @@ endi
 if $data02 != 3 then 
   return -1
 endi
-#numofvgroups
-sql show t1.vgroups;
-if $rows != 3 then 
-  return -1
-endi
+
 sql show t1.stables;
 if $rows != 1 then 
   return -1

tests/script/general/parser/groupby.sim

@@ -610,6 +610,11 @@ print =================>TD-2665
 sql_error create table txx as select avg(c) as t from st;
 sql_error create table txx1 as select avg(c) as t from t1;
 
+sql select stddev(c),stddev(c) from st group by c;
+if $rows != 4 then
+  return -1
+endi
+
 print =================>TD-2236
 sql select first(ts),last(ts) from t1 group by c;
 if $rows != 4 then

tests/script/general/parser/lastrow_query.sim

@@ -16,6 +16,9 @@ $stb = $stbPrefix . $i
 
 sql use $db
 
+print ========>TD-3231 last_row with group by column error
+sql_error select last_row(c1) from $stb group by c1;
+
 ##### select lastrow from STable with two vnodes, timestamp decreases from tables in vnode0 to tables in vnode1
 sql select last_row(*) from $stb
 if $rows != 1 then