Merge pull request #6369 from taosdata/feature/m2d2

merge from master

src/client/src/tscSQLParser.c

@@ -5828,11 +5828,17 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
     tVariantListItem* p0 = taosArrayGet(pKeep, 0);
     switch (s) {
       case 1: {
+        if ((int32_t)p0->pVar.i64 <= 0) {
+          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
+        }
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
       }
         break;
       case 2: {
         tVariantListItem* p1 = taosArrayGet(pKeep, 1);
+        if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0) {
+          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
+        }        
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
         pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
         break;
@@ -5841,6 +5847,10 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
         tVariantListItem* p1 = taosArrayGet(pKeep, 1);
         tVariantListItem* p2 = taosArrayGet(pKeep, 2);
 
+        if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0 || (int32_t)p2->pVar.i64 <= 0) {
+          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
+        } 
+
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
         pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
         pMsg->daysToKeep2 = htonl((int32_t)p2->pVar.i64);

src/client/src/tscStream.c

@@ -110,7 +110,8 @@ static void doLaunchQuery(void* param, TAOS_RES* tres, int32_t code) {
   // failed to get table Meta or vgroup list, retry in 10sec.
   if (code == TSDB_CODE_SUCCESS) {
     tscTansformFuncForSTableQuery(pQueryInfo);
-    tscDebug("0x%"PRIx64" stream:%p started to query table:%s", pSql->self, pStream, tNameGetTableName(&pTableMetaInfo->name));
+
+    tscDebug("0x%"PRIx64" stream:%p, start stream query on:%s QueryInfo->skey=%"PRId64" ekey=%"PRId64" ", pSql->self, pStream, tNameGetTableName(&pTableMetaInfo->name), pQueryInfo->window.skey, pQueryInfo->window.ekey);
 
     pQueryInfo->command = TSDB_SQL_SELECT;
 
@@ -164,7 +165,11 @@ static void tscProcessStreamTimer(void *handle, void *tmrId) {
     if (etime > pStream->etime) {
       etime = pStream->etime;
     } else if (pStream->interval.intervalUnit != 'y' && pStream->interval.intervalUnit != 'n') {
+      if(pStream->stime == INT64_MIN) {
+        etime = taosTimeTruncate(etime, &pStream->interval, pStream->precision);
+      } else {
         etime = pStream->stime + (etime - pStream->stime) / pStream->interval.interval * pStream->interval.interval;
+      }
     } else {
       etime = taosTimeTruncate(etime, &pStream->interval, pStream->precision);
     }
@@ -353,8 +358,8 @@ static void tscSetRetryTimer(SSqlStream *pStream, SSqlObj *pSql, int64_t timer)
     tscDebug("0x%"PRIx64" stream:%p, next start at %" PRId64 "(ts window ekey), in %" PRId64 " ms. delay:%" PRId64 "ms qrange %" PRId64 "-%" PRId64, pStream->pSql->self, pStream,
              now + timer, timer, delay, pStream->stime, etime);
   } else {
-    tscDebug("0x%"PRIx64" stream:%p, next start at %" PRId64 "(ts window ekey), in %" PRId64 " ms. delay:%" PRId64 "ms qrange %" PRId64 "-%" PRId64, pStream->pSql->self, pStream,
-             pStream->stime, timer, delay, pStream->stime - pStream->interval.interval, pStream->stime - 1);
+    tscDebug("0x%"PRIx64" stream:%p, next start at %" PRId64 " - %" PRId64 " end, in %" PRId64 "ms. delay:%" PRId64 "ms qrange %" PRId64 "-%" PRId64, pStream->pSql->self, pStream,
+             pStream->stime, pStream->etime, timer, delay, pStream->stime - pStream->interval.interval, pStream->stime - 1);
   }
 
   pSql->cmd.command = TSDB_SQL_SELECT;
@@ -663,6 +668,11 @@ TAOS_STREAM *taos_open_stream_withname(TAOS *taos, const char* dstTable, const c
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) return NULL;
 
+  if(fp == NULL){
+    tscError(" taos_open_stream api fp param must not NULL.");
+    return NULL;
+  }
+
   SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
   if (pSql == NULL) {
     return NULL;

src/mnode/src/mnodeDnode.c

@@ -799,7 +799,7 @@ static int32_t mnodeGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
-  pShow->bytes[cols] = 40 + VARSTR_HEADER_SIZE;
+  pShow->bytes[cols] = TSDB_EP_LEN + VARSTR_HEADER_SIZE;
   pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
   strcpy(pSchema[cols].name, "end_point");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);

src/mnode/src/mnodeMnode.c

@@ -485,7 +485,7 @@ static int32_t mnodeGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
-  pShow->bytes[cols] = 40 + VARSTR_HEADER_SIZE;
+  pShow->bytes[cols] = TSDB_EP_LEN + VARSTR_HEADER_SIZE;
   pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
   strcpy(pSchema[cols].name, "end_point");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);

tests/pytest/alter/alter_keep_exception.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 -*-
+
+#TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.error('alter database keep db 0')
+        tdSql.error('alter database keep db -10')
+        tdSql.error('alter database keep db -2147483648')
+        
+        #this is the test case problem for keep overflow
+        #the error is caught, but type is wrong.
+        #TODO: can be solved in the future, but improvement is minimal
+        tdSql.error('alter database keep db -2147483649')   
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/pytest/fulltest.sh

@@ -339,4 +339,5 @@ python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
 python3 ./test.py -f tag_lite/drop_auto_create.py
 python3 test.py -f insert/insert_before_use_db.py
 python3 test.py -f alter/alter_cacheLastRow.py
+python3 test.py -f alter/alter_keep_exception.py
 #======================p4-end===============

tests/pytest/query/queryJoin.py

@@ -176,7 +176,15 @@ class TDTestCase:
         tdSql.error("select count(join_mt0.c1), first(join_mt0.c1), first(join_mt1.c9) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts interval(10a) group by join_mt0.t1, join_mt0.t2 order by join_mt0.t1 desc slimit 3")
         tdSql.error("select count(join_mt0.c1), first(join_mt0.c1) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts interval(10a) group by join_mt0.t1, join_mt0.t2, join_mt1.t1 order by join_mt0.ts desc, join_mt1.ts asc limit 10;")
         tdSql.error("select join_mt1.c1,join_mt0.c1 from join_mt1,join_mt0 where join_mt1.ts = join_mt0.ts and join_mt1.t1 = join_mt0.t1 order by t")
-
+        #TD-4458 join on database which using precision us 
+        tdSql.execute("create database test_join_us precision 'us'")
+        tdSql.execute("use test_join_us")
+        ts = 1538548685000000
+        for i in range(2):
+            tdSql.execute("create table t%d (ts timestamp, i int)"%i)
+            tdSql.execute("insert into t%d values(%d,11)(%d,12)"%(i,ts,ts+1))
+        tdSql.query("select t1.ts from t0,t1 where t0.ts = t1.ts")
+        tdSql.checkData(0,0,'2018-10-03 14:38:05.000000')
 
     def stop(self):
         tdSql.close()

tests/pytest/tools/taosdemoAllTest/insert-drop-exist-auto-N00.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,                   
+    "thread_count_create_tbl": 4,        
+    "result_file": "./insert_res.txt",   
+    "confirm_parameter_prompt": "no",    
+    "insert_interval": 0,         
+    "interlace_rows": 100,        
+    "num_of_records_per_req": 100,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "no",                
+            "replica": 1,
+            "days": 10,
+            "cache": 16,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 3650,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb",
+            "child_table_exists":"no",
+            "auto_create_table": "123",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NN123_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"no",
+            "auto_create_table": "no",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NNN_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"no",
+            "auto_create_table": "yes",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NNY_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"yes",
+            "auto_create_table": "123",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NY123_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"yes",
+            "auto_create_table": "no",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NYN_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"yes",
+            "auto_create_table": "yes",   
+            "childtable_count": 20,   
+            "childtable_prefix": "NYY_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        }
+    ]
+    }]
+}
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/insert-drop-exist-auto-Y00.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,                   
+    "thread_count_create_tbl": 4,        
+    "result_file": "./insert_res.txt",   
+    "confirm_parameter_prompt": "no",    
+    "insert_interval": 0,         
+    "interlace_rows": 100,        
+    "num_of_records_per_req": 100,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",                
+            "replica": 1,
+            "days": 10,
+            "cache": 16,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 3650,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb",
+            "child_table_exists":"no",
+            "auto_create_table": "123",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YN123_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"no",
+            "auto_create_table": "no",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YNN_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"no",
+            "auto_create_table": "yes",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YNY_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"yes",
+            "auto_create_table": "123",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YY123_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"yes",
+            "auto_create_table": "no",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YYN_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        },{
+            "name": "stb",
+            "child_table_exists":"yes",
+            "auto_create_table": "yes",   
+            "childtable_count": 20,   
+            "childtable_prefix": "YYY_",    
+            "batch_create_tbl_num": 100,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 5,       
+            "childtable_limit": 40,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 10,         
+            "start_timestamp": "now",  
+            "sample_format": "csv",       
+            "sample_file": "./sample.csv",   
+            "tags_file": "",              
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        }
+    ]
+    }]
+}
\ No newline at end of file

tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py

@@ -238,10 +238,12 @@ class TDTestCase:
         tdSql.execute("use dbtest123")
         tdSql.query("select col2 from stb0")
         tdSql.checkData(0, 0, 2147483647)
-        tdSql.query("select t1 from stb1")
-        tdSql.checkData(0, 0, -127)
-        tdSql.query("select t2 from stb1")
-        tdSql.checkData(1, 0, 126)
+        tdSql.query("select * from stb1 where t1=-127")
+        tdSql.checkRows(20)
+        tdSql.query("select * from stb1 where t2=127")
+        tdSql.checkRows(10)
+        tdSql.query("select * from stb1 where t2=126")
+        tdSql.checkRows(10)
 
         # insert: test interlace parament 
         os.system("%staosdemo -f tools/taosdemoAllTest/insert-interlace-row.json -y " % binPath)
@@ -252,6 +254,42 @@ class TDTestCase:
         tdSql.checkData(0, 0, 15000)        
 
 
+        # # insert: auto_create
+
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+        os.system("%staosdemo -y -f tools/taosdemoAllTest/insert-drop-exist-auto-N00.json " % binPath) # drop = no, child_table_exists, auto_create_table varies
+        tdSql.execute('use db')
+        tdSql.query('show tables like \'NN123%\'')  #child_table_exists = no, auto_create_table varies = 123
+        tdSql.checkRows(20)
+        tdSql.query('show tables like \'NNN%\'')    #child_table_exists = no, auto_create_table varies = no
+        tdSql.checkRows(20)
+        tdSql.query('show tables like \'NNY%\'')    #child_table_exists = no, auto_create_table varies = yes
+        tdSql.checkRows(20)
+        tdSql.query('show tables like \'NYN%\'')    #child_table_exists = yes, auto_create_table varies = no
+        tdSql.checkRows(0)
+        tdSql.query('show tables like \'NY123%\'')  #child_table_exists = yes, auto_create_table varies = 123
+        tdSql.checkRows(0)
+        tdSql.query('show tables like \'NYY%\'')    #child_table_exists = yes, auto_create_table varies = yes
+        tdSql.checkRows(0)
+
+        tdSql.execute('drop database if exists db')
+        os.system("%staosdemo -y -f tools/taosdemoAllTest/insert-drop-exist-auto-Y00.json " % binPath) # drop = yes, child_table_exists, auto_create_table varies
+        tdSql.execute('use db')
+        tdSql.query('show tables like \'YN123%\'')  #child_table_exists = no, auto_create_table varies = 123
+        tdSql.checkRows(20)
+        tdSql.query('show tables like \'YNN%\'')    #child_table_exists = no, auto_create_table varies = no
+        tdSql.checkRows(20)
+        tdSql.query('show tables like \'YNY%\'')    #child_table_exists = no, auto_create_table varies = yes
+        tdSql.checkRows(20)
+        tdSql.query('show tables like \'YYN%\'')    #child_table_exists = yes, auto_create_table varies = no
+        tdSql.checkRows(20)
+        tdSql.query('show tables like \'YY123%\'')  #child_table_exists = yes, auto_create_table varies = 123
+        tdSql.checkRows(20)
+        tdSql.query('show tables like \'YYY%\'')    #child_table_exists = yes, auto_create_table varies = yes
+        tdSql.checkRows(20)
+
         os.system("rm -rf ./insert_res.txt")
         os.system("rm -rf tools/taosdemoAllTest/taosdemoTestInsertWithJson.py.sql")        
         

tests/script/general/db/alter_option.sim

@@ -129,8 +129,8 @@ sql alter database db keep 20
 sql_error alter database db keep 10
 sql_error alter database db keep 9
 sql_error alter database db keep 1
-sql alter database db keep 0
-sql alter database db keep -1
+sql_error alter database db keep 0
+sql_error alter database db keep -1
 sql_error alter database db keep 365001
 
 print ============== step cache

tests/script/general/db/topic1.sim

@@ -385,8 +385,8 @@ sql alter database db keep 20
 sql_error alter database db keep 10
 sql_error alter database db keep 9
 sql_error alter database db keep 1
-sql alter database db keep 0
-sql alter database db keep -1
+sql_error alter database db keep 0
+sql_error alter database db keep -1
 sql_error alter database db keep 365001
 
 sql_error alter topic db keep 40

tests/test-all.sh

@@ -233,6 +233,10 @@ totalExampleFailed=0
 
 if [ "${OS}" == "Linux" ]; then
     corepath=`grep -oP '.*(?=core_)' /proc/sys/kernel/core_pattern||grep -oP '.*(?=core-)' /proc/sys/kernel/core_pattern`
+    if [ -z "$corepath" ];then
+      echo "/coredump/core_%e_%p_%t" > /proc/sys/kernel/core_pattern || echo "Permission denied"
+      corepath="/coredump/"
+    fi
 fi
 
 if [ "$2" != "jdbc" ] && [ "$2" != "python" ] && [ "$2" != "unit" ]  && [ "$2" != "example" ]; then