Merge branch 'develop' into hotfix/sangshuduo/TD-2984-combine-taosdemo-and-taosdemox

Jenkinsfile

@@ -174,14 +174,13 @@ pipeline {
                 ./crash_gen.sh -a -p -t 4 -s 2000
                 '''
             }
-            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                sh '''
-                cd ${WKC}/tests/pytest
-                rm -rf /var/lib/taos/*
-                rm -rf /var/log/taos/*
-                ./handle_crash_gen_val_log.sh
-                '''
-            }  
+
+            sh '''
+            cd ${WKC}/tests/pytest
+            rm -rf /var/lib/taos/*
+            rm -rf /var/log/taos/*
+            ./handle_crash_gen_val_log.sh
+            '''
             timeout(time: 45, unit: 'MINUTES'){
                 sh '''
                 date

documentation20/cn/03.architecture/docs.md

@@ -315,7 +315,7 @@ Vnode会保持一个数据版本号(Version)，对内存数据进行持久化存
 3. 在线的虚拟节点数过半，而且有虚拟节点是slave的话，该虚拟节点自动成为master
 4. 对于2和3，如果多个虚拟节点满足成为master的要求，那么虚拟节点组的节点列表里，最前面的选为master
 
-更多的关于数据复制的流程，请见[TDengine 2.0数据复制模块设计](https://www.taosdata.com/cn/documentation/replica/)。
+更多的关于数据复制的流程，请见[TDengine 2.0数据复制模块设计](https://www.taosdata.com/cn/documentation/architecture/replica/)。
 
 ### 同步复制
 

documentation20/cn/08.connector/docs.md

@@ -723,9 +723,9 @@ HTTP请求URL采用`sqlutc`时，返回结果集的时间戳将采用UTC时间
 
 ### 重要配置项
 
-下面仅列出一些与RESTFul接口有关的配置参数，其他系统参数请看配置文件里的说明。注意：配置修改后，需要重启taosd服务才能生效
+下面仅列出一些与RESTful接口有关的配置参数，其他系统参数请看配置文件里的说明。注意：配置修改后，需要重启taosd服务才能生效
 
-- httpPort: 对外提供RESTFul服务的端口号，默认绑定到6041
+- httpPort: 对外提供RESTful服务的端口号，默认绑定到6041
 - httpMaxThreads: 启动的线程数量，默认为2
 - restfulRowLimit: 返回结果集（JSON格式）的最大条数，默认值为10240
 - httpEnableCompress: 是否支持压缩，默认不支持，目前TDengine仅支持gzip压缩格式

src/client/src/tscSQLParser.c

@@ -6404,10 +6404,12 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
       nameSize = taosArrayGetSize(pNameList);
 
       if (valSize != nameSize) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
       }
 
       if (schemaSize < valSize) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
       }
 
@@ -6460,11 +6462,13 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
         }
 
         if (!findColumnIndex) {
+          tdDestroyKVRowBuilder(&kvRowBuilder);
           return tscInvalidSQLErrMsg(pCmd->payload, "invalid tag name", sToken->z);
         }   
       }
     } else {
       if (schemaSize != valSize) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
       }
 

src/client/src/tscServer.c

@@ -330,7 +330,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
     pSql->cmd.submitSchema = 1;
   }
 
-  if ((cmd == TSDB_SQL_SELECT || cmd == TSDB_SQL_FETCH || cmd == TSDB_SQL_UPDATE_TAGS_VAL) &&
+  if ((cmd == TSDB_SQL_SELECT || cmd == TSDB_SQL_UPDATE_TAGS_VAL) &&
       (rpcMsg->code == TSDB_CODE_TDB_INVALID_TABLE_ID ||
        rpcMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID ||
        rpcMsg->code == TSDB_CODE_RPC_NETWORK_UNAVAIL ||

src/client/src/tscSubquery.c

@@ -1848,7 +1848,7 @@ void doAppendData(SInterResult* pInterResult, TAOS_ROW row, int32_t numOfCols, S
   TSKEY key = INT64_MIN;
   for(int32_t i = 0; i < numOfCols; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-    if (TSDB_COL_IS_TAG(pExpr->colInfo.flag)) {
+    if (TSDB_COL_IS_TAG(pExpr->colInfo.flag) || pExpr->functionId == TSDB_FUNC_PRJ) {
       continue;
     }
 
@@ -1981,7 +1981,8 @@ void tscFirstRoundRetrieveCallback(void* param, TAOS_RES* tres, int numOfRows) {
   // set the parameters for the second round query process
   SSqlCmd    *pPCmd   = &pParent->cmd;
   SQueryInfo *pQueryInfo1 = tscGetQueryInfoDetail(pPCmd, 0);
-
+  int32_t resRows = pSup->numOfRows;
+  
   if (pSup->numOfRows > 0) {
     SBufferWriter bw = tbufInitWriter(NULL, false);
     interResToBinary(&bw, pSup->pResult, pSup->tagLen);
@@ -1999,6 +2000,12 @@ void tscFirstRoundRetrieveCallback(void* param, TAOS_RES* tres, int numOfRows) {
 
   taos_free_result(pSql);
 
+  if (resRows == 0) {
+    pParent->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
+    (*pParent->fp)(pParent->param, pParent, 0);
+    return;
+  }
+
   pQueryInfo1->round = 1;
   tscDoQuery(pParent);
 }

src/client/src/tscUtil.c

@@ -2057,6 +2057,8 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   pnCmd->parseFinished = 1;
   pnCmd->pTableNameList = NULL;
   pnCmd->pTableBlockHashList = NULL;
+  pnCmd->tagData.data = NULL;
+  pnCmd->tagData.dataLen = 0;
 
   if (tscAddSubqueryInfo(pnCmd) != TSDB_CODE_SUCCESS) {
     terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;

src/inc/ttokendef.h

@@ -229,6 +229,10 @@
 
 
 
+
+
+
+
 #define TK_SPACE                          300
 #define TK_COMMENT                        301
 #define TK_ILLEGAL                        302

src/kit/shell/src/shellEngine.c

@@ -341,7 +341,7 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
   } else {
     int num_rows_affacted = taos_affected_rows(pSql);
     et = taosGetTimestampUs();
-    printf("Query OK, %d row(s) affected (%.6fs)\n", num_rows_affacted, (et - st) / 1E6);
+    printf("Query OK, %d of %d row(s) in database (%.6fs)\n", num_rows_affacted, num_rows_affacted, (et - st) / 1E6);
   }
 
   printf("\n");

src/plugins/http/src/httpContext.c

@@ -154,7 +154,9 @@ void httpReleaseContext(HttpContext *pContext, bool clearRes) {
   }
 
   if (clearRes) {
-    httpClearParser(pContext->parser);
+    if (pContext->parser) {
+      httpClearParser(pContext->parser);
+    }
     memset(&pContext->singleCmd, 0, sizeof(HttpSqlCmd));
   }
 

src/query/inc/qSqlparser.h

@@ -232,6 +232,8 @@ SArray *tVariantListAppendToken(SArray *pList, SStrToken *pAliasToken, uint8_t s
 
 tSQLExpr *tSqlExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType);
 
+tSQLExpr *tSqlExprClone(tSQLExpr *pSrc);
+
 void tSqlExprDestroy(tSQLExpr *pExpr);
 
 tSQLExprList *tSqlExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pDistinct, SStrToken *pToken);

src/query/inc/sql.y

@@ -674,6 +674,8 @@ expr(A) ::= expr(X) GE expr(Y).      {A = tSqlExprCreate(X, Y, TK_GE);}
 expr(A) ::= expr(X) NE expr(Y).      {A = tSqlExprCreate(X, Y, TK_NE);}
 expr(A) ::= expr(X) EQ expr(Y).      {A = tSqlExprCreate(X, Y, TK_EQ);}
 
+expr(A) ::= expr(X) BETWEEN expr(Y) AND expr(Z).      { tSQLExpr* X2 = tSqlExprClone(X); A = tSqlExprCreate(tSqlExprCreate(X, Y, TK_GE), tSqlExprCreate(X2, Z, TK_LE), TK_AND);}
+
 expr(A) ::= expr(X) AND expr(Y).     {A = tSqlExprCreate(X, Y, TK_AND);}
 expr(A) ::= expr(X) OR  expr(Y).     {A = tSqlExprCreate(X, Y, TK_OR); }
 

src/query/src/qAggMain.c

@@ -3687,6 +3687,14 @@ static void spread_function(SQLFunctionCtx *pCtx) {
     LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, double, pCtx->inputType, numOfElems);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
     LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, float, pCtx->inputType, numOfElems);
+  } else if (pCtx->inputType == TSDB_DATA_TYPE_UTINYINT) {
+    LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, uint8_t, pCtx->inputType, numOfElems);
+  } else if (pCtx->inputType == TSDB_DATA_TYPE_USMALLINT) {
+    LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, uint16_t, pCtx->inputType, numOfElems);
+  } else if (pCtx->inputType == TSDB_DATA_TYPE_UINT) {
+    LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, uint32_t, pCtx->inputType, numOfElems);
+  } else if (pCtx->inputType == TSDB_DATA_TYPE_UBIGINT) {
+    LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, uint64_t, pCtx->inputType, numOfElems);
   }
   
   if (!pCtx->hasNull) {

src/query/src/qExecutor.c

@@ -5162,6 +5162,8 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
       assert(pQuery->prjInfo.vgroupLimit == -1);
     }
 
+    setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
+
     bool hasMoreBlock = true;
     int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
     SQueryCostInfo *summary = &pRuntimeEnv->summary;

src/query/src/qParserImpl.c

@@ -289,6 +289,28 @@ tSQLExpr *tSqlExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
   return pExpr;
 }
 
+
+
+tSQLExpr *tSqlExprClone(tSQLExpr *pSrc) {
+  tSQLExpr *pExpr = calloc(1, sizeof(tSQLExpr));
+
+  memcpy(pExpr, pSrc, sizeof(*pSrc));
+  
+  if (pSrc->pLeft) {
+    pExpr->pLeft = tSqlExprClone(pSrc->pLeft);
+  }
+
+  if (pSrc->pRight) {
+    pExpr->pRight = tSqlExprClone(pSrc->pRight);
+  }
+
+  //we don't clone pParam now because clone is only used for between/and
+  assert(pSrc->pParam == NULL);
+
+  return pExpr;
+}
+
+
 void tSqlExprNodeDestroy(tSQLExpr *pExpr) {
   if (pExpr == NULL) {
     return;
@@ -309,8 +331,9 @@ void tSqlExprDestroy(tSQLExpr *pExpr) {
   }
 
   tSqlExprDestroy(pExpr->pLeft);
+  pExpr->pLeft = NULL;
   tSqlExprDestroy(pExpr->pRight);
-
+  pExpr->pRight = NULL;
   tSqlExprNodeDestroy(pExpr);
 }
 

tests/perftest-scripts/coverage_test.sh

@@ -56,9 +56,9 @@ function runGeneralCaseOneByOne {
 			case=`echo $line | grep sim$ |awk '{print $NF}'`
 
 			if [ -n "$case" ]; then
-				./test.sh -f $case > /dev/null 2>&1 && \
-				echo -e "${GREEN}$case success${NC}" | tee -a $TDENGINE_COVERAGE_REPORT || \
-				echo -e "${RED}$case failed${NC}" | tee -a $TDENGINE_COVERAGE_REPORT
+				date +%F\ %T | tee -a  $TDENGINE_COVERAGE_REPORT  && ./test.sh -f $case > /dev/null 2>&1 && \
+				( grep -q 'script.*success.*m$' ../../sim/tsim/log/taoslog0.0 && echo -e "${GREEN}$case success${NC}" | tee -a  $TDENGINE_COVERAGE_REPORT ) \
+				|| echo -e "${RED}$case failed${NC}" | tee -a  $TDENGINE_COVERAGE_REPORT
 			fi
 		fi
 	done < $1

tests/perftest-scripts/perftest-query.sh

@@ -64,7 +64,7 @@ function runQueryPerfTest {
 	[ -f $PERFORMANCE_TEST_REPORT ] && rm $PERFORMANCE_TEST_REPORT
 	nohup $WORK_DIR/TDengine/debug/build/bin/taosd -c /etc/taosperf/ > /dev/null 2>&1 &
 	echoInfo "Wait TDengine to start"
-	sleep 60
+	sleep 120
 	echoInfo "Run Performance Test"	
 	cd $WORK_DIR/TDengine/tests/pytest
 	
@@ -72,7 +72,7 @@ function runQueryPerfTest {
 
 	python3 insert/insertFromCSVPerformance.py -c $LOCAL_COMMIT | tee -a $PERFORMANCE_TEST_REPORT
 
-	yes | taosdemo -c /etc/taosperf/ -d taosdemo_insert_test -t 1000 -n 1000 > taosdemoperf.txt
+	yes | taosdemo -c /etc/taosperf/ -d taosdemo_insert_test -x > taosdemoperf.txt
 
 	CREATETABLETIME=`grep 'Spent' taosdemoperf.txt | awk 'NR==1{print $2}'`
 	INSERTRECORDSTIME=`grep 'Spent' taosdemoperf.txt | awk 'NR==2{print $2}'`

tests/pytest/concurrent_inquiry.py

@@ -40,7 +40,7 @@ class ConcurrentInquiry:
     #             stableNum = 2,subtableNum = 1000,insertRows = 100):  
     def __init__(self,ts,host,user,password,dbname,
                 stb_prefix,subtb_prefix,n_Therads,r_Therads,probabilities,loop,
-                stableNum ,subtableNum ,insertRows ,mix_table):  
+                stableNum ,subtableNum ,insertRows ,mix_table, replay):  
         self.n_numOfTherads = n_Therads
         self.r_numOfTherads = r_Therads
         self.ts=ts
@@ -65,6 +65,7 @@ class ConcurrentInquiry:
         self.mix_table = mix_table
         self.max_ts = datetime.datetime.now()
         self.min_ts = datetime.datetime.now() - datetime.timedelta(days=5)
+        self.replay = replay
     def SetThreadsNum(self,num):
         self.numOfTherads=num
 
@@ -412,7 +413,7 @@ class ConcurrentInquiry:
             )
         cl = conn.cursor()
         cl.execute("use %s;" % self.dbname)
-        
+        fo = open('bak_sql_n_%d'%threadID,'w+')
         print("Thread %d: starting" % threadID)
         loop = self.loop
         while loop:
@@ -423,6 +424,7 @@ class ConcurrentInquiry:
                     else:
                         sql=self.gen_query_join()
                     print("sql is ",sql)
+                    fo.write(sql+'\n')
                     start = time.time()
                     cl.execute(sql)
                     cl.fetchall()
@@ -438,13 +440,49 @@ class ConcurrentInquiry:
                         exit(-1)
                 loop -= 1
                 if loop == 0: break
-                    
+        fo.close()            
         cl.close()
         conn.close()       
         print("Thread %d: finishing" % threadID)
+
+    def query_thread_nr(self,threadID):                      #使用原生python接口进行重放
+        host = self.host
+        user = self.user
+        password = self.password
+        conn = taos.connect(
+            host,
+            user,
+            password,
+            )
+        cl = conn.cursor()
+        cl.execute("use %s;" % self.dbname)
+        replay_sql = []
+        with  open('bak_sql_n_%d'%threadID,'r') as f:
+            replay_sql = f.readlines()
+        print("Replay Thread %d: starting" % threadID)
+        for sql in replay_sql:
+            try:
+                print("sql is ",sql)
+                start = time.time()
+                cl.execute(sql)
+                cl.fetchall()
+                end = time.time()
+                print("time cost :",end-start)
+            except Exception as e:
+                print('-'*40)
+                print(
+            "Failure thread%d, sql: %s \nexception: %s" %
+            (threadID, str(sql),str(e)))
+                err_uec='Unable to establish connection'
+                if err_uec in str(e) and loop >0:
+                    exit(-1)         
+        cl.close()
+        conn.close()       
+        print("Replay Thread %d: finishing" % threadID)
           
     def query_thread_r(self,threadID):                      #使用rest接口查询
         print("Thread %d: starting" % threadID)
+        fo = open('bak_sql_r_%d'%threadID,'w+')
         loop = self.loop
         while loop:
             try:
@@ -453,6 +491,7 @@ class ConcurrentInquiry:
                 else:
                     sql=self.gen_query_join()
                 print("sql is ",sql)
+                fo.write(sql+'\n')
                 start = time.time()
                 self.rest_query(sql)
                 end = time.time()
@@ -467,20 +506,53 @@ class ConcurrentInquiry:
                     exit(-1)
             loop -= 1    
             if loop == 0: break
-                
-        print("Thread %d: finishing" % threadID)    
+        fo.close()      
+        print("Thread %d: finishing" % threadID)   
+
+    def query_thread_rr(self,threadID):                      #使用rest接口重放
+        print("Replay Thread %d: starting" % threadID)
+        replay_sql = []
+        with  open('bak_sql_r_%d'%threadID,'r') as f:
+            replay_sql = f.readlines()
+
+        for sql in replay_sql:
+            try:
+                print("sql is ",sql)
+                start = time.time()
+                self.rest_query(sql)
+                end = time.time()
+                print("time cost :",end-start)
+            except Exception as e:
+                print('-'*40)
+                print(
+            "Failure thread%d, sql: %s \nexception: %s" %
+            (threadID, str(sql),str(e)))
+                err_uec='Unable to establish connection'
+                if err_uec in str(e) and loop >0:
+                    exit(-1)  
+        print("Replay Thread %d: finishing" % threadID)  
 
     def run(self):
         print(self.n_numOfTherads,self.r_numOfTherads)  
         threads = []
-        for i in range(self.n_numOfTherads):
-            thread = threading.Thread(target=self.query_thread_n, args=(i,))
-            threads.append(thread)
-            thread.start()  
-        for i in range(self.r_numOfTherads):
-            thread = threading.Thread(target=self.query_thread_r, args=(i,))
-            threads.append(thread)
-            thread.start()
+        if self.replay:  #whether replay 
+            for i in range(self.n_numOfTherads):
+                thread = threading.Thread(target=self.query_thread_nr, args=(i,))
+                threads.append(thread)
+                thread.start()  
+            for i in range(self.r_numOfTherads):
+                thread = threading.Thread(target=self.query_thread_rr, args=(i,))
+                threads.append(thread)
+                thread.start()
+        else:
+            for i in range(self.n_numOfTherads):
+                thread = threading.Thread(target=self.query_thread_n, args=(i,))
+                threads.append(thread)
+                thread.start()  
+            for i in range(self.r_numOfTherads):
+                thread = threading.Thread(target=self.query_thread_r, args=(i,))
+                threads.append(thread)
+                thread.start()
  
 parser = argparse.ArgumentParser()
 parser.add_argument(
@@ -595,13 +667,20 @@ parser.add_argument(
     default=0,
     type=int,
     help='0:stable & substable ,1:subtable ,2:stable (default: 0)')
+parser.add_argument(
+    '-R',
+    '--replay',
+    action='store',
+    default=0,
+    type=int,
+    help='0:not replay ,1:replay  (default: 0)')
 
 args = parser.parse_args()
 q = ConcurrentInquiry(
     args.ts,args.host_name,args.user,args.password,args.db_name,
                 args.stb_name_prefix,args.subtb_name_prefix,args.number_of_native_threads,args.number_of_rest_threads,
                 args.probabilities,args.loop_per_thread,args.number_of_stables,args.number_of_tables ,args.number_of_records,
-                args.mix_stable_subtable )
+                args.mix_stable_subtable, args.replay )
 
 if args.create_table: 
     q.gen_data()

tests/pytest/handle_crash_gen_val_log.sh

@@ -16,7 +16,7 @@ TOP_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep -v community|head -n1`
 nohup $TAOSD_DIR >/dev/null &
 cd -
-./crash_gen.sh --valgrind -p -t 10 -s 350 -b 4
+./crash_gen.sh --valgrind -p -t 10 -s 500 -b 4
 pidof taosd|xargs kill -9
 grep 'start to execute\|ERROR SUMMARY' valgrind.err|grep -v 'grep'|uniq|tee crash_gen_mem_err.log
 
@@ -36,11 +36,13 @@ for defiMemError in `grep 'definitely lost:' crash_gen-definitely-lost-out.log |
 do
 defiMemError=(${defiMemError//,/})
 if [ -n "$defiMemError" ]; then
-    if [ "$defiMemError" -gt 3 -a "$defiMemError" -lt 1013 ]; then
-    echo -e "${RED} ## Memory errors number valgrind reports \
-                Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
+    if [ "$defiMemError" -gt 0 -a "$defiMemError" -lt 1013 ]; then
+      cat valgrind.err
+      echo -e "${RED} ## Memory errors number valgrind reports \
+                  Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
       exit 8
     elif [ "$defiMemError" -gt 1013 ];then           #add for azure
+      cat valgrind.err
       echo -e "${RED} ## Memory errors number valgrind reports \
                 Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
       exit 8

tests/pytest/tag_lite/alter_tag.py

@@ -41,7 +41,23 @@ class TDTestCase:
         tdSql.query("select * from ampere")
         tdSql.checkRows(2)
         tdSql.checkData(0, 6, None)
-        tdSql.checkData(1, 6, 'test')        
+        tdSql.checkData(1, 6, 'test')
+
+        # Test case for: https://jira.taosdata.com:18080/browse/TD-2423 
+        tdSql.execute("create table stb(ts timestamp, col1 int, col2 nchar(20)) tags(tg1 int, tg2 binary(20), tg3 nchar(25))")
+        tdSql.execute("insert into tb1 using stb(tg1, tg3) tags(1, 'test1') values(now, 1, 'test1')")        
+        tdSql.query("select *, tg1, tg2, tg3 from tb1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 3, 1)
+        tdSql.checkData(0, 4, None)
+        tdSql.checkData(0, 5, 'test1')
+
+        tdSql.execute("create table tb2 using stb(tg3, tg2) tags('test3', 'test2')")
+        tdSql.query("select tg1, tg2, tg3 from tb2")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+        tdSql.checkData(0, 1, 'test2')
+        tdSql.checkData(0, 2, 'test3')
 
     def stop(self):
         tdSql.close()

tests/script/general/parser/between_and.sim

+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 100
+sql connect
+print ======================== dnode1 start
+
+$db = testdb
+
+sql create database $db
+sql use $db
+
+sql create stable st2 (ts timestamp, f1 int, f2 float, f3 double, f4 bigint, f5 smallint, f6 tinyint, f7 bool, f8 binary(10), f9 nchar(10)) tags (id1 int, id2 float, id3 nchar(10), id4 double, id5 smallint, id6 bigint, id7 binary(10))
+
+sql create table tb1 using st2 tags (1,1.0,"1",1.0,1,1,"1");
+sql create table tb2 using st2 tags (2,2.0,"2",2.0,2,2,"2");
+sql create table tb3 using st2 tags (3,3.0,"3",3.0,3,3,"3");
+sql create table tb4 using st2 tags (4,4.0,"4",4.0,4,4,"4");
+ 
+sql insert into tb1 values (now-200s,1,1.0,1.0,1,1,1,true,"1","1")
+sql insert into tb1 values (now-100s,2,2.0,2.0,2,2,2,true,"2","2")
+sql insert into tb1 values (now,3,3.0,3.0,3,3,3,true,"3","3")
+sql insert into tb1 values (now+100s,4,4.0,4.0,4,4,4,true,"4","4")
+sql insert into tb1 values (now+200s,4,4.0,4.0,4,4,4,true,"4","4")
+sql insert into tb1 values (now+300s,4,4.0,4.0,4,4,4,true,"4","4")
+sql insert into tb1 values (now+400s,4,4.0,4.0,4,4,4,true,"4","4")
+sql insert into tb1 values (now+500s,4,4.0,4.0,4,4,4,true,"4","4")
+
+sql select tbname,id1 from st2;
+
+if $rows != 4 then
+  return -1
+endi
+
+
+sql select * from st2;
+
+if $rows != 8 then
+  return -1
+endi
+
+sql select * from st2 where ts between now-50s and now+450s
+
+if $rows != 5 then
+  return -1
+endi
+
+sql select tbname,id1 from st2 where id1 between 2 and 3;
+
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != tb2 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+if $data10 != tb3 then 
+  return -1
+endi
+if $data11 != 3 then 
+  return -1
+endi
+
+sql select tbname,id2 from st2 where id2 between 2.0 and 3.0;
+
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != tb2 then 
+  return -1
+endi
+if $data01 != 2.00000 then 
+  return -1
+endi
+if $data10 != tb3 then 
+  return -1
+endi
+if $data11 != 3.00000 then 
+  return -1
+endi
+
+
+sql select tbname,id4 from st2 where id4 between 2.0 and 3.0;
+
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != tb2 then 
+  return -1
+endi
+if $data01 != 2.000000000 then 
+  return -1
+endi
+if $data10 != tb3 then 
+  return -1
+endi
+if $data11 != 3.000000000 then 
+  return -1
+endi
+
+
+sql select tbname,id5 from st2 where id5 between 2.0 and 3.0;
+
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != tb2 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+if $data10 != tb3 then 
+  return -1
+endi
+if $data11 != 3 then 
+  return -1
+endi
+
+sql select tbname,id6 from st2 where id6 between 2.0 and 3.0;
+
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != tb2 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+if $data10 != tb3 then 
+  return -1
+endi
+if $data11 != 3 then 
+  return -1
+endi
+
+sql select * from st2 where f1 between 2 and 3 and f2 between 2.0 and 3.0 and f3 between 2.0 and 3.0 and f4 between 2.0 and 3.0 and f5 between 2.0 and 3.0 and f6 between 2.0 and 3.0;
+
+if $rows != 2 then
+  return -1
+endi
+
+if $data01 != 2 then 
+  return -1
+endi
+if $data11 != 3 then 
+  return -1
+endi
+
+sql_error select * from st2 where f7 between 2.0 and 3.0;
+sql_error select * from st2 where f8 between 2.0 and 3.0;
+sql_error select * from st2 where f9 between 2.0 and 3.0;
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/function.sim

@@ -763,3 +763,20 @@ endi
 if $data01 != 1.414213562 then
   return -1
 endi
+
+sql create stable st1 (ts timestamp, f1 int, f2 int) tags (id int);
+sql create table tb1 using st1 tags(1);
+
+sql insert into tb1 values (now, 1, 1);
+
+sql select stddev(f1) from st1 group by f1;
+
+if $rows != 1 then
+  return -1
+endi
+
+
+if $data00 != 0.000000000 then
+  return -1
+endi
+

tests/test-all.sh

@@ -21,8 +21,8 @@ function runSimCaseOneByOne {
     if [[ $line =~ ^./test.sh* ]] || [[ $line =~ ^run* ]]; then
 			case=`echo $line | grep sim$ |awk '{print $NF}'`
       IN_TDINTERNAL="community"
-      start_time=`date +%s`
-       IN_TDINTERNAL="community"
+      start_time=`date +%s`      
+      date +%F\ %T | tee -a out.log
       if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
         echo -n $case
         ./test.sh -f $case > /dev/null 2>&1 && \
@@ -53,6 +53,7 @@ function runSimCaseOneByOnefq {
 
       start_time=`date +%s`
       IN_TDINTERNAL="community"
+      date +%F\ %T | tee -a out.log
       if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
         echo -n $case
         ./test.sh -f $case > /dev/null 2>&1 && \
@@ -94,6 +95,7 @@ function runPyCaseOneByOne {
           case=`echo $line|awk '{print $NF}'`
         fi
         start_time=`date +%s`
+        date +%F\ %T | tee -a pytest-out.log
         echo -n $case
         $line > /dev/null 2>&1 && \
           echo -e "${GREEN} success${NC}" | tee -a pytest-out.log || \
@@ -122,6 +124,7 @@ function runPyCaseOneByOnefq {
           case=`echo $line|awk '{print $NF}'`
         fi
         start_time=`date +%s`
+        date +%F\ %T | tee -a pytest-out.log
         echo -n $case
         $line > /dev/null 2>&1 && \
           echo -e "${GREEN} success${NC}" | tee -a pytest-out.log || \