Merge pull request #13857 from taosdata/feature/3.0_debug_wxy

fix: use 'duration' instead of 'days' for create database

include/common/tmsg.h

@@ -1134,11 +1134,11 @@ void    tFreeSMAlterStbRsp(SMAlterStbRsp* pRsp);
 int32_t tSerializeSTableMetaRsp(void* buf, int32_t bufLen, STableMetaRsp* pRsp);
 int32_t tDeserializeSTableMetaRsp(void* buf, int32_t bufLen, STableMetaRsp* pRsp);
 void    tFreeSTableMetaRsp(STableMetaRsp* pRsp);
-void tFreeSTableIndexRsp(void *info);
+void    tFreeSTableIndexRsp(void* info);
 
 typedef struct {
-  SArray*         pMetaRsp;  // Array of STableMetaRsp
-  SArray*         pIndexRsp;  // Array of STableIndexRsp;
+  SArray* pMetaRsp;   // Array of STableMetaRsp
+  SArray* pIndexRsp;  // Array of STableIndexRsp;
 } SSTbHbRsp;
 
 int32_t tSerializeSSTbHbRsp(void* buf, int32_t bufLen, SSTbHbRsp* pRsp);
@@ -1305,8 +1305,9 @@ int32_t tSerializeSSetStandbyReq(void* buf, int32_t bufLen, SSetStandbyReq* pReq
 int32_t tDeserializeSSetStandbyReq(void* buf, int32_t bufLen, SSetStandbyReq* pReq);
 
 typedef struct {
-  int32_t connId;
-  int32_t queryId;
+  int32_t connId;   // todo remove
+  int32_t queryId;  // todo remove
+  char    queryStrId[TSDB_QUERY_ID_LEN];
 } SKillQueryReq;
 
 int32_t tSerializeSKillQueryReq(void* buf, int32_t bufLen, SKillQueryReq* pReq);

include/common/ttokendef.h

@@ -78,7 +78,7 @@
 #define TK_BUFFER        60
 #define TK_CACHELAST     61
 #define TK_COMP          62
-#define TK_DAYS          63
+#define TK_DURATION      63
 #define TK_NK_VARIABLE   64
 #define TK_FSYNC         65
 #define TK_MAXROWS       66

include/libs/nodes/cmdnodes.h

@@ -89,6 +89,7 @@ typedef struct STableOptions {
   ENodeType  type;
   char       comment[TSDB_TB_COMMENT_LEN];
   double     filesFactor;
+  int32_t    delay;
   SNodeList* pRollupFuncs;
   int32_t    ttl;
   SNodeList* pSma;
@@ -286,6 +287,11 @@ typedef struct SKillStmt {
   int32_t   targetId;
 } SKillStmt;
 
+typedef struct SKillQueryStmt {
+  ENodeType type;
+  char      queryId[TSDB_QUERY_ID_LEN];
+} SKillQueryStmt;
+
 typedef struct SStreamOptions {
   ENodeType type;
   int8_t    triggerType;

include/libs/nodes/nodes.h

@@ -204,6 +204,7 @@ typedef enum ENodeType {
   QUERY_NODE_PHYSICAL_PLAN_TAG_SCAN,
   QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN,
   QUERY_NODE_PHYSICAL_PLAN_TABLE_SEQ_SCAN,
+  QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN,
   QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN,
   QUERY_NODE_PHYSICAL_PLAN_SYSTABLE_SCAN,
   QUERY_NODE_PHYSICAL_PLAN_PROJECT,

include/libs/nodes/plannodes.h

@@ -34,7 +34,13 @@ typedef struct SLogicNode {
   uint8_t            precision;
 } SLogicNode;
 
-typedef enum EScanType { SCAN_TYPE_TAG = 1, SCAN_TYPE_TABLE, SCAN_TYPE_SYSTEM_TABLE, SCAN_TYPE_STREAM } EScanType;
+typedef enum EScanType {
+  SCAN_TYPE_TAG = 1,
+  SCAN_TYPE_TABLE,
+  SCAN_TYPE_SYSTEM_TABLE,
+  SCAN_TYPE_STREAM,
+  SCAN_TYPE_TABLE_MERGE
+} EScanType;
 
 typedef struct SScanLogicNode {
   SLogicNode    node;
@@ -262,6 +268,7 @@ typedef struct STableScanPhysiNode {
 } STableScanPhysiNode;
 
 typedef STableScanPhysiNode STableSeqScanPhysiNode;
+typedef STableScanPhysiNode STableMergeScanPhysiNode;
 typedef STableScanPhysiNode SStreamScanPhysiNode;
 
 typedef struct SProjectPhysiNode {

include/util/tdef.h

@@ -222,6 +222,8 @@ typedef enum ELogicConditionType {
 #define TSDB_APP_NAME_LEN   TSDB_UNI_LEN
 #define TSDB_TB_COMMENT_LEN 1025
 
+#define TSDB_QUERY_ID_LEN 26
+
 /**
  *  In some scenarios uint16_t (0~65535) is used to store the row len.
  *  - Firstly, we use 65531(65535 - 4), as the SDataRow/SKVRow contains 4 bits header.
@@ -341,6 +343,9 @@ typedef enum ELogicConditionType {
 #define TSDB_DB_SCHEMALESS_OFF          0
 #define TSDB_DEFAULT_DB_SCHEMALESS      TSDB_DB_SCHEMALESS_OFF
 
+// #define TSDB_MIN_ROLLUP_DELAY     1
+// #define TSDB_MAX_ROLLUP_DELAY     10
+// #define TSDB_DEFAULT_ROLLUP_DELAY 1
 #define TSDB_MIN_ROLLUP_FILE_FACTOR     0
 #define TSDB_MAX_ROLLUP_FILE_FACTOR     10
 #define TSDB_DEFAULT_ROLLUP_FILE_FACTOR 0.1

source/common/src/tmsg.c

@@ -3369,8 +3369,7 @@ int32_t tSerializeSKillQueryReq(void *buf, int32_t bufLen, SKillQueryReq *pReq)
   tEncoderInit(&encoder, buf, bufLen);
 
   if (tStartEncode(&encoder) < 0) return -1;
-  if (tEncodeI32(&encoder, pReq->connId) < 0) return -1;
-  if (tEncodeI32(&encoder, pReq->queryId) < 0) return -1;
+  if (tEncodeCStr(&encoder, pReq->queryStrId) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
@@ -3383,8 +3382,7 @@ int32_t tDeserializeSKillQueryReq(void *buf, int32_t bufLen, SKillQueryReq *pReq
   tDecoderInit(&decoder, buf, bufLen);
 
   if (tStartDecode(&decoder) < 0) return -1;
-  if (tDecodeI32(&decoder, &pReq->connId) < 0) return -1;
-  if (tDecodeI32(&decoder, &pReq->queryId) < 0) return -1;
+  if (tDecodeCStrTo(&decoder, pReq->queryStrId) < 0) return -1;
   tEndDecode(&decoder);
 
   tDecoderClear(&decoder);

source/libs/nodes/src/nodesCodeFuncs.c

@@ -1480,14 +1480,6 @@ static int32_t jsonToPhysiTableScanNode(const SJson* pJson, void* pObj) {
   return code;
 }
 
-static int32_t physiStreamScanNodeToJson(const void* pObj, SJson* pJson) {
-  return physiTableScanNodeToJson(pObj, pJson);
-}
-
-static int32_t jsonToPhysiStreamScanNode(const SJson* pJson, void* pObj) {
-  return jsonToPhysiTableScanNode(pJson, pObj);
-}
-
 static const char* jkSysTableScanPhysiPlanMnodeEpSet = "MnodeEpSet";
 static const char* jkSysTableScanPhysiPlanShowRewrite = "ShowRewrite";
 static const char* jkSysTableScanPhysiPlanAccountId = "AccountId";
@@ -3964,9 +3956,9 @@ static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
     case QUERY_NODE_PHYSICAL_PLAN_TAG_SCAN:
       return physiTagScanNodeToJson(pObj, pJson);
     case QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN:
-      return physiTableScanNodeToJson(pObj, pJson);
+    case QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN:
     case QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN:
-      return physiStreamScanNodeToJson(pObj, pJson);
+      return physiTableScanNodeToJson(pObj, pJson);
     case QUERY_NODE_PHYSICAL_PLAN_SYSTABLE_SCAN:
       return physiSysTableScanNodeToJson(pObj, pJson);
     case QUERY_NODE_PHYSICAL_PLAN_PROJECT:
@@ -4097,9 +4089,9 @@ static int32_t jsonToSpecificNode(const SJson* pJson, void* pObj) {
     case QUERY_NODE_PHYSICAL_PLAN_TAG_SCAN:
       return jsonToPhysiTagScanNode(pJson, pObj);
     case QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN:
-      return jsonToPhysiTableScanNode(pJson, pObj);
+    case QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN:
     case QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN:
-      return jsonToPhysiStreamScanNode(pJson, pObj);
+      return jsonToPhysiTableScanNode(pJson, pObj);
     case QUERY_NODE_PHYSICAL_PLAN_SYSTABLE_SCAN:
       return jsonToPhysiSysTableScanNode(pJson, pObj);
     case QUERY_NODE_PHYSICAL_PLAN_PROJECT:

source/libs/nodes/src/nodesUtilFuncs.c

@@ -209,9 +209,10 @@ SNode* nodesMakeNode(ENodeType type) {
     case QUERY_NODE_SHOW_CREATE_STABLE_STMT:
     case QUERY_NODE_SHOW_TRANSACTIONS_STMT:
       return makeNode(type, sizeof(SShowStmt));
-    case QUERY_NODE_KILL_CONNECTION_STMT:
     case QUERY_NODE_KILL_QUERY_STMT:
+      return makeNode(type, sizeof(SKillQueryStmt));
     case QUERY_NODE_KILL_TRANSACTION_STMT:
+    case QUERY_NODE_KILL_CONNECTION_STMT:
       return makeNode(type, sizeof(SKillStmt));
     case QUERY_NODE_DELETE_STMT:
       return makeNode(type, sizeof(SDeleteStmt));
@@ -251,6 +252,8 @@ SNode* nodesMakeNode(ENodeType type) {
       return makeNode(type, sizeof(STableScanPhysiNode));
     case QUERY_NODE_PHYSICAL_PLAN_TABLE_SEQ_SCAN:
       return makeNode(type, sizeof(STableSeqScanPhysiNode));
+    case QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN:
+      return makeNode(type, sizeof(STableMergeScanPhysiNode));
     case QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN:
       return makeNode(type, sizeof(SStreamScanPhysiNode));
     case QUERY_NODE_PHYSICAL_PLAN_SYSTABLE_SCAN:

source/libs/parser/inc/parAst.h

@@ -60,6 +60,7 @@ typedef enum EDatabaseOptionType {
 typedef enum ETableOptionType {
   TABLE_OPTION_COMMENT = 1,
   TABLE_OPTION_FILE_FACTOR,
+  TABLE_OPTION_DELAY,
   TABLE_OPTION_ROLLUP,
   TABLE_OPTION_TTL,
   TABLE_OPTION_SMA
@@ -187,6 +188,7 @@ SNode* createCreateStreamStmt(SAstCreateContext* pCxt, bool ignoreExists, const
                               SNode* pOptions, SNode* pQuery);
 SNode* createDropStreamStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pStreamName);
 SNode* createKillStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pId);
+SNode* createKillQueryStmt(SAstCreateContext* pCxt, const SToken* pQueryId);
 SNode* createBalanceVgroupStmt(SAstCreateContext* pCxt);
 SNode* createMergeVgroupStmt(SAstCreateContext* pCxt, const SToken* pVgId1, const SToken* pVgId2);
 SNode* createRedistributeVgroupStmt(SAstCreateContext* pCxt, const SToken* pVgId, SNodeList* pDnodes);

source/libs/parser/inc/sql.y

@@ -168,8 +168,8 @@ db_options(A) ::= .
 db_options(A) ::= db_options(B) BUFFER NK_INTEGER(C).                             { A = setDatabaseOption(pCxt, B, DB_OPTION_BUFFER, &C); }
 db_options(A) ::= db_options(B) CACHELAST NK_INTEGER(C).                          { A = setDatabaseOption(pCxt, B, DB_OPTION_CACHELAST, &C); }
 db_options(A) ::= db_options(B) COMP NK_INTEGER(C).                               { A = setDatabaseOption(pCxt, B, DB_OPTION_COMP, &C); }
-db_options(A) ::= db_options(B) DAYS NK_INTEGER(C).                               { A = setDatabaseOption(pCxt, B, DB_OPTION_DAYS, &C); }
-db_options(A) ::= db_options(B) DAYS NK_VARIABLE(C).                              { A = setDatabaseOption(pCxt, B, DB_OPTION_DAYS, &C); }
+db_options(A) ::= db_options(B) DURATION NK_INTEGER(C).                           { A = setDatabaseOption(pCxt, B, DB_OPTION_DAYS, &C); }
+db_options(A) ::= db_options(B) DURATION NK_VARIABLE(C).                          { A = setDatabaseOption(pCxt, B, DB_OPTION_DAYS, &C); }
 db_options(A) ::= db_options(B) FSYNC NK_INTEGER(C).                              { A = setDatabaseOption(pCxt, B, DB_OPTION_FSYNC, &C); }
 db_options(A) ::= db_options(B) MAXROWS NK_INTEGER(C).                            { A = setDatabaseOption(pCxt, B, DB_OPTION_MAXROWS, &C); }
 db_options(A) ::= db_options(B) MINROWS NK_INTEGER(C).                            { A = setDatabaseOption(pCxt, B, DB_OPTION_MINROWS, &C); }
@@ -317,8 +317,9 @@ tags_def(A) ::= TAGS NK_LP column_def_list(B) NK_RP.
 
 table_options(A) ::= .                                                            { A = createDefaultTableOptions(pCxt); }
 table_options(A) ::= table_options(B) COMMENT NK_STRING(C).                       { A = setTableOption(pCxt, B, TABLE_OPTION_COMMENT, &C); }
+//table_options(A) ::= table_options(B) DELAY NK_INTEGER(C).                        { A = setTableOption(pCxt, B, TABLE_OPTION_DELAY, &C); }
 table_options(A) ::= table_options(B) FILE_FACTOR NK_FLOAT(C).                    { A = setTableOption(pCxt, B, TABLE_OPTION_FILE_FACTOR, &C); }
-table_options(A) ::= table_options(B) ROLLUP NK_LP func_name_list(C) NK_RP.       { A = setTableOption(pCxt, B, TABLE_OPTION_ROLLUP, C); }
+table_options(A) ::= table_options(B) ROLLUP NK_LP rollup_func_list(C) NK_RP.     { A = setTableOption(pCxt, B, TABLE_OPTION_ROLLUP, C); }
 table_options(A) ::= table_options(B) TTL NK_INTEGER(C).                          { A = setTableOption(pCxt, B, TABLE_OPTION_TTL, &C); }
 table_options(A) ::= table_options(B) SMA NK_LP col_name_list(C) NK_RP.           { A = setTableOption(pCxt, B, TABLE_OPTION_SMA, C); }
 
@@ -330,6 +331,15 @@ alter_table_options(A) ::= alter_table_options(B) alter_table_option(C).
 alter_table_option(A) ::= COMMENT NK_STRING(B).                                   { A.type = TABLE_OPTION_COMMENT; A.val = B; }
 alter_table_option(A) ::= TTL NK_INTEGER(B).                                      { A.type = TABLE_OPTION_TTL; A.val = B; }
 
+%type rollup_func_list                                                            { SNodeList* }
+%destructor rollup_func_list                                                      { nodesDestroyList($$); }
+rollup_func_list(A) ::= rollup_func_name(B).                                      { A = createNodeList(pCxt, B); }
+rollup_func_list(A) ::= rollup_func_list(B) NK_COMMA rollup_func_name(C).         { A = addNodeToList(pCxt, B, C); }
+
+rollup_func_name(A) ::= function_name(B).                                         { A = createFunctionNode(pCxt, &B, NULL); }
+rollup_func_name(A) ::= FIRST(B).                                                 { A = createFunctionNode(pCxt, &B, NULL); }
+rollup_func_name(A) ::= LAST(B).                                                  { A = createFunctionNode(pCxt, &B, NULL); }
+
 %type col_name_list                                                               { SNodeList* }
 %destructor col_name_list                                                         { nodesDestroyList($$); }
 col_name_list(A) ::= col_name(B).                                                 { A = createNodeList(pCxt, B); }
@@ -378,13 +388,6 @@ table_name_cond(A) ::= table_name(B).
 from_db_opt(A) ::= .                                                              { A = createDefaultDatabaseCondValue(pCxt); }
 from_db_opt(A) ::= FROM db_name(B).                                               { A = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B); }
 
-%type func_name_list                                                              { SNodeList* }
-%destructor func_name_list                                                        { nodesDestroyList($$); }
-func_name_list(A) ::= func_name(B).                                               { A = createNodeList(pCxt, B); }
-func_name_list(A) ::= func_name_list(B) NK_COMMA func_name(C).                    { A = addNodeToList(pCxt, B, C); }
-
-func_name(A) ::= function_name(B).                                                { A = createFunctionNode(pCxt, &B, NULL); }
-
 /************************************************ create index ********************************************************/
 cmd ::= CREATE SMA INDEX not_exists_opt(D) 
   index_name(A) ON table_name(B) index_options(C).                                { pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, D, &A, &B, NULL, C); }
@@ -466,7 +469,7 @@ stream_options(A) ::= stream_options(B) WATERMARK duration_literal(C).
 
 /************************************************ kill connection/query ***********************************************/
 cmd ::= KILL CONNECTION NK_INTEGER(A).                                            { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &A); }
-cmd ::= KILL QUERY NK_INTEGER(A).                                                 { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_QUERY_STMT, &A); }
+cmd ::= KILL QUERY NK_STRING(A).                                                  { pCxt->pRootNode = createKillQueryStmt(pCxt, &A); }
 cmd ::= KILL TRANSACTION NK_INTEGER(A).                                           { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_TRANSACTION_STMT, &A); }
 
 /************************************************ merge/redistribute/ vgroup ******************************************/

source/libs/parser/src/parAstCreater.c

@@ -804,10 +804,10 @@ SNode* setDatabaseOption(SAstCreateContext* pCxt, SNode* pOptions, EDatabaseOpti
     case DB_OPTION_RETENTIONS:
       ((SDatabaseOptions*)pOptions)->pRetentions = pVal;
       break;
-//    case DB_OPTION_SCHEMALESS:
-//      ((SDatabaseOptions*)pOptions)->schemaless = taosStr2Int8(((SToken*)pVal)->z, NULL, 10);
-//      ((SDatabaseOptions*)pOptions)->schemaless = 0;
-//      break;
+      //    case DB_OPTION_SCHEMALESS:
+      //      ((SDatabaseOptions*)pOptions)->schemaless = taosStr2Int8(((SToken*)pVal)->z, NULL, 10);
+      //      ((SDatabaseOptions*)pOptions)->schemaless = 0;
+      //      break;
     default:
       break;
   }
@@ -867,6 +867,7 @@ SNode* createDefaultTableOptions(SAstCreateContext* pCxt) {
   CHECK_PARSER_STATUS(pCxt);
   STableOptions* pOptions = (STableOptions*)nodesMakeNode(QUERY_NODE_TABLE_OPTIONS);
   CHECK_OUT_OF_MEM(pOptions);
+  // pOptions->delay = TSDB_DEFAULT_ROLLUP_DELAY;
   pOptions->filesFactor = TSDB_DEFAULT_ROLLUP_FILE_FACTOR;
   pOptions->ttl = TSDB_DEFAULT_TABLE_TTL;
   return (SNode*)pOptions;
@@ -876,7 +877,7 @@ SNode* createAlterTableOptions(SAstCreateContext* pCxt) {
   CHECK_PARSER_STATUS(pCxt);
   STableOptions* pOptions = (STableOptions*)nodesMakeNode(QUERY_NODE_TABLE_OPTIONS);
   CHECK_OUT_OF_MEM(pOptions);
-  pOptions->filesFactor = -1;
+  pOptions->delay = -1;
   pOptions->ttl = -1;
   return (SNode*)pOptions;
 }
@@ -890,8 +891,8 @@ SNode* setTableOption(SAstCreateContext* pCxt, SNode* pOptions, ETableOptionType
                                   sizeof(((STableOptions*)pOptions)->comment));
       }
       break;
-    case TABLE_OPTION_FILE_FACTOR:
-      ((STableOptions*)pOptions)->filesFactor = taosStr2Double(((SToken*)pVal)->z, NULL);
+    case TABLE_OPTION_DELAY:
+      ((STableOptions*)pOptions)->delay = taosStr2Int32(((SToken*)pVal)->z, NULL, 10);
       break;
     case TABLE_OPTION_ROLLUP:
       ((STableOptions*)pOptions)->pRollupFuncs = pVal;
@@ -1431,7 +1432,7 @@ SNode* createDropStreamStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const
   CHECK_PARSER_STATUS(pCxt);
   SDropStreamStmt* pStmt = (SDropStreamStmt*)nodesMakeNode(QUERY_NODE_DROP_STREAM_STMT);
   CHECK_OUT_OF_MEM(pStmt);
-  strncpy(pStmt->streamName, pStreamName->z, pStreamName->n);
+  strncpy(pStmt->streamName, pStreamName->z, TMIN(pStreamName->n, sizeof(pStmt->streamName) - 1));
   pStmt->ignoreNotExists = ignoreNotExists;
   return (SNode*)pStmt;
 }
@@ -1444,6 +1445,14 @@ SNode* createKillStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pId
   return (SNode*)pStmt;
 }
 
+SNode* createKillQueryStmt(SAstCreateContext* pCxt, const SToken* pQueryId) {
+  CHECK_PARSER_STATUS(pCxt);
+  SKillQueryStmt* pStmt = (SKillQueryStmt*)nodesMakeNode(QUERY_NODE_KILL_QUERY_STMT);
+  CHECK_OUT_OF_MEM(pStmt);
+  strncpy(pStmt->queryId, pQueryId->z, TMIN(pQueryId->n, sizeof(pStmt->queryId) - 1));
+  return (SNode*)pStmt;
+}
+
 SNode* createBalanceVgroupStmt(SAstCreateContext* pCxt) {
   CHECK_PARSER_STATUS(pCxt);
   SBalanceVgroupStmt* pStmt = (SBalanceVgroupStmt*)nodesMakeNode(QUERY_NODE_BALANCE_VGROUP_STMT);

source/libs/parser/src/parTokenizer.c

@@ -68,7 +68,7 @@ static SKeyword keywordTable[] = {
     {"CONTAINS",      TK_CONTAINS}, 
     {"DATABASE",      TK_DATABASE},
     {"DATABASES",     TK_DATABASES},
-    {"DAYS",          TK_DAYS},
+    // {"DAYS",          TK_DAYS},
     {"DBS",           TK_DBS},
     {"DELETE",        TK_DELETE},
     {"DESC",          TK_DESC},
@@ -78,6 +78,7 @@ static SKeyword keywordTable[] = {
     {"DNODES",        TK_DNODES},
     {"DOUBLE",        TK_DOUBLE},
     {"DROP",          TK_DROP},
+    {"DURATION",      TK_DURATION},
     {"EXISTS",        TK_EXISTS},
     {"EXPLAIN",       TK_EXPLAIN},
     {"FILE_FACTOR",   TK_FILE_FACTOR},

source/libs/parser/src/parTranslater.c

@@ -2839,6 +2839,9 @@ static int32_t checkCreateTable(STranslateContext* pCxt, SCreateTableStmt* pStmt
   if (TSDB_CODE_SUCCESS == code) {
     code = checTableFactorOption(pCxt, pStmt->pOptions->filesFactor);
   }
+  // if (TSDB_CODE_SUCCESS == code) {
+  //   code = checkRangeOption(pCxt, "delay", pStmt->pOptions->delay, TSDB_MIN_ROLLUP_DELAY, TSDB_MAX_ROLLUP_DELAY);
+  // }
   if (TSDB_CODE_SUCCESS == code) {
     code = checkTableRollupOption(pCxt, pStmt->pOptions->pRollupFuncs);
   }
@@ -3081,6 +3084,7 @@ static int32_t buildRollupAst(STranslateContext* pCxt, SCreateTableStmt* pStmt,
 
 static int32_t buildCreateStbReq(STranslateContext* pCxt, SCreateTableStmt* pStmt, SMCreateStbReq* pReq) {
   pReq->igExists = pStmt->ignoreExists;
+  // pReq->delay = pStmt->pOptions->delay;
   pReq->xFilesFactor = pStmt->pOptions->filesFactor;
   pReq->ttl = pStmt->pOptions->ttl;
   columnDefNodeToField(pStmt->pCols, &pReq->pColumns);
@@ -3626,9 +3630,9 @@ static int32_t translateKillConnection(STranslateContext* pCxt, SKillStmt* pStmt
   return buildCmdMsg(pCxt, TDMT_MND_KILL_CONN, (FSerializeFunc)tSerializeSKillQueryReq, &killReq);
 }
 
-static int32_t translateKillQuery(STranslateContext* pCxt, SKillStmt* pStmt) {
+static int32_t translateKillQuery(STranslateContext* pCxt, SKillQueryStmt* pStmt) {
   SKillQueryReq killReq = {0};
-  killReq.queryId = pStmt->targetId;
+  strcpy(killReq.queryStrId, pStmt->queryId);
   return buildCmdMsg(pCxt, TDMT_MND_KILL_QUERY, (FSerializeFunc)tSerializeSKillQueryReq, &killReq);
 }
 
@@ -3970,7 +3974,7 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
       code = translateKillConnection(pCxt, (SKillStmt*)pNode);
       break;
     case QUERY_NODE_KILL_QUERY_STMT:
-      code = translateKillQuery(pCxt, (SKillStmt*)pNode);
+      code = translateKillQuery(pCxt, (SKillQueryStmt*)pNode);
       break;
     case QUERY_NODE_KILL_TRANSACTION_STMT:
       code = translateKillTransaction(pCxt, (SKillStmt*)pNode);

source/libs/parser/src/sql.c

@@ -564,7 +564,7 @@ static const YYCODETYPE yy_lookahead[] = {
  /*  1260 */     0,    0,   40,    0,  271,   72,    0,   47,  175,  175,
  /*  1270 */    47,   47,  279,  310,   47,    0,  313,  314,  315,  316,
  /*  1280 */   317,  318,  289,  320,   47,   47,  293,  243,  175,    0,
- /*  1290 */   175,    0,   47,    0,   47,    0,  243,   47,    0,   81,
+ /*  1290 */   175,    0,   47,    0,   22,    0,  243,   47,    0,   81,
  /*  1300 */   113,  160,  156,  310,  159,    0,  313,  314,  315,  316,
  /*  1310 */   317,  318,    0,  320,  152,  271,  323,  151,    0,  356,
  /*  1320 */   357,  328,    0,  279,  271,   44,    0,    0,    0,    0,
@@ -693,7 +693,7 @@ static const unsigned short int yy_shift_ofst[] = {
  /*   310 */   929,  931,  826,  875,  934,  952,  962,  965,  974,  976,
  /*   320 */   859,  935, 1260, 1261, 1222, 1263, 1193, 1266, 1220, 1093,
  /*   330 */  1223, 1224, 1227, 1094, 1275, 1237, 1238, 1113, 1289, 1115,
- /*   340 */  1291, 1245, 1293, 1247, 1295, 1250, 1298, 1218, 1141, 1145,
+ /*   340 */  1291, 1245, 1293, 1272, 1295, 1250, 1298, 1218, 1141, 1145,
  /*   350 */  1187, 1146, 1305, 1312, 1162, 1166, 1318, 1322, 1281, 1326,
  /*   360 */  1327, 1328, 1329, 1330, 1331, 1334, 1335, 1336, 1338, 1339,
  /*   370 */  1340, 1341, 1343, 1344, 1345, 1347, 1348, 1309, 1351, 1352,
@@ -898,7 +898,7 @@ static const YYCODETYPE yyFallback[] = {
     0,  /*     BUFFER => nothing */
     0,  /*  CACHELAST => nothing */
     0,  /*       COMP => nothing */
-    0,  /*       DAYS => nothing */
+    0,  /*   DURATION => nothing */
     0,  /* NK_VARIABLE => nothing */
     0,  /*      FSYNC => nothing */
     0,  /*    MAXROWS => nothing */
@@ -1225,7 +1225,7 @@ static const char *const yyTokenName[] = {
   /*   60 */ "BUFFER",
   /*   61 */ "CACHELAST",
   /*   62 */ "COMP",
-  /*   63 */ "DAYS",
+  /*   63 */ "DURATION",
   /*   64 */ "NK_VARIABLE",
   /*   65 */ "FSYNC",
   /*   66 */ "MAXROWS",
@@ -1600,8 +1600,8 @@ static const char *const yyRuleName[] = {
  /*  68 */ "db_options ::= db_options BUFFER NK_INTEGER",
  /*  69 */ "db_options ::= db_options CACHELAST NK_INTEGER",
  /*  70 */ "db_options ::= db_options COMP NK_INTEGER",
- /*  71 */ "db_options ::= db_options DAYS NK_INTEGER",
- /*  72 */ "db_options ::= db_options DAYS NK_VARIABLE",
+ /*  71 */ "db_options ::= db_options DURATION NK_INTEGER",
+ /*  72 */ "db_options ::= db_options DURATION NK_VARIABLE",
  /*  73 */ "db_options ::= db_options FSYNC NK_INTEGER",
  /*  74 */ "db_options ::= db_options MAXROWS NK_INTEGER",
  /*  75 */ "db_options ::= db_options MINROWS NK_INTEGER",
@@ -1783,7 +1783,7 @@ static const char *const yyRuleName[] = {
  /* 251 */ "stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal",
  /* 252 */ "stream_options ::= stream_options WATERMARK duration_literal",
  /* 253 */ "cmd ::= KILL CONNECTION NK_INTEGER",
- /* 254 */ "cmd ::= KILL QUERY NK_INTEGER",
+ /* 254 */ "cmd ::= KILL QUERY NK_STRING",
  /* 255 */ "cmd ::= KILL TRANSACTION NK_INTEGER",
  /* 256 */ "cmd ::= BALANCE VGROUP",
  /* 257 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER",
@@ -2646,8 +2646,8 @@ static const struct {
   {  254,   -3 }, /* (68) db_options ::= db_options BUFFER NK_INTEGER */
   {  254,   -3 }, /* (69) db_options ::= db_options CACHELAST NK_INTEGER */
   {  254,   -3 }, /* (70) db_options ::= db_options COMP NK_INTEGER */
-  {  254,   -3 }, /* (71) db_options ::= db_options DAYS NK_INTEGER */
-  {  254,   -3 }, /* (72) db_options ::= db_options DAYS NK_VARIABLE */
+  {  254,   -3 }, /* (71) db_options ::= db_options DURATION NK_INTEGER */
+  {  254,   -3 }, /* (72) db_options ::= db_options DURATION NK_VARIABLE */
   {  254,   -3 }, /* (73) db_options ::= db_options FSYNC NK_INTEGER */
   {  254,   -3 }, /* (74) db_options ::= db_options MAXROWS NK_INTEGER */
   {  254,   -3 }, /* (75) db_options ::= db_options MINROWS NK_INTEGER */
@@ -2829,7 +2829,7 @@ static const struct {
   {  305,   -4 }, /* (251) stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */
   {  305,   -3 }, /* (252) stream_options ::= stream_options WATERMARK duration_literal */
   {  240,   -3 }, /* (253) cmd ::= KILL CONNECTION NK_INTEGER */
-  {  240,   -3 }, /* (254) cmd ::= KILL QUERY NK_INTEGER */
+  {  240,   -3 }, /* (254) cmd ::= KILL QUERY NK_STRING */
   {  240,   -3 }, /* (255) cmd ::= KILL TRANSACTION NK_INTEGER */
   {  240,   -2 }, /* (256) cmd ::= BALANCE VGROUP */
   {  240,   -4 }, /* (257) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
@@ -3326,8 +3326,8 @@ static YYACTIONTYPE yy_reduce(
 { yylhsminor.yy632 = setDatabaseOption(pCxt, yymsp[-2].minor.yy632, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
   yymsp[-2].minor.yy632 = yylhsminor.yy632;
         break;
-      case 71: /* db_options ::= db_options DAYS NK_INTEGER */
-      case 72: /* db_options ::= db_options DAYS NK_VARIABLE */ yytestcase(yyruleno==72);
+      case 71: /* db_options ::= db_options DURATION NK_INTEGER */
+      case 72: /* db_options ::= db_options DURATION NK_VARIABLE */ yytestcase(yyruleno==72);
 { yylhsminor.yy632 = setDatabaseOption(pCxt, yymsp[-2].minor.yy632, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
   yymsp[-2].minor.yy632 = yylhsminor.yy632;
         break;
@@ -3907,8 +3907,8 @@ static YYACTIONTYPE yy_reduce(
       case 253: /* cmd ::= KILL CONNECTION NK_INTEGER */
 { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &yymsp[0].minor.yy0); }
         break;
-      case 254: /* cmd ::= KILL QUERY NK_INTEGER */
-{ pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_QUERY_STMT, &yymsp[0].minor.yy0); }
+      case 254: /* cmd ::= KILL QUERY NK_STRING */
+{ pCxt->pRootNode = createKillQueryStmt(pCxt, &yymsp[0].minor.yy0); }
         break;
       case 255: /* cmd ::= KILL TRANSACTION NK_INTEGER */
 { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_TRANSACTION_STMT, &yymsp[0].minor.yy0); }

source/libs/parser/test/parInitialCTest.cpp

@@ -46,7 +46,7 @@ TEST_F(ParserInitialCTest, createBnode) {
  *     BUFFER value
  *   | CACHELAST value
  *   | COMP {0 | 1 | 2}
- *   | DAYS value
+ *   | DURATION value
  *   | FSYNC value
  *   | MAXROWS value
  *   | MINROWS value
@@ -155,7 +155,7 @@ TEST_F(ParserInitialCTest, createDatabase) {
     ASSERT_EQ(req.replications, expect.replications);
     ASSERT_EQ(req.strict, expect.strict);
     ASSERT_EQ(req.cacheLastRow, expect.cacheLastRow);
-    //ASSERT_EQ(req.schemaless, expect.schemaless);
+    // ASSERT_EQ(req.schemaless, expect.schemaless);
     ASSERT_EQ(req.ignoreExist, expect.ignoreExist);
     ASSERT_EQ(req.numOfRetensions, expect.numOfRetensions);
     if (expect.numOfRetensions > 0) {
@@ -202,7 +202,7 @@ TEST_F(ParserInitialCTest, createDatabase) {
       "BUFFER 64 "
       "CACHELAST 2 "
       "COMP 1 "
-      "DAYS 100 "
+      "DURATION 100 "
       "FSYNC 100 "
       "MAXROWS 1000 "
       "MINROWS 100 "
@@ -223,7 +223,7 @@ TEST_F(ParserInitialCTest, createDatabase) {
   setDbDaysFunc(100);
   setDbKeepFunc(1440, 300 * 60, 400 * 1440);
   run("CREATE DATABASE IF NOT EXISTS wxy_db "
-      "DAYS 100m "
+      "DURATION 100m "
       "KEEP 1440m,300h,400d ");
   clearCreateDbReq();
 }

source/libs/planner/src/planPhysiCreater.c

@@ -181,7 +181,7 @@ static int16_t getUnsetSlotId(const SArray* pSlotIdsInfo) {
 }
 
 static int32_t addDataBlockSlotsImpl(SPhysiPlanContext* pCxt, SNodeList* pList, SDataBlockDescNode* pDataBlockDesc,
-                                     const char* pStmtName, bool output,  bool reserve) {
+                                     const char* pStmtName, bool output, bool reserve) {
   if (NULL == pList) {
     return TSDB_CODE_SUCCESS;
   }
@@ -463,10 +463,25 @@ static int32_t createTagScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubpla
   return createScanPhysiNodeFinalize(pCxt, pSubplan, pScanLogicNode, (SScanPhysiNode*)pTagScan, pPhyNode);
 }
 
+static ENodeType getScanOperatorType(EScanType scanType) {
+  switch (scanType) {
+    case SCAN_TYPE_TABLE:
+      return QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN;
+    case SCAN_TYPE_STREAM:
+      return QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN;
+    case SCAN_TYPE_TABLE_MERGE:
+      return QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN;
+      // return QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN;
+    default:
+      break;
+  }
+  return QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN;
+}
+
 static int32_t createTableScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubplan, SScanLogicNode* pScanLogicNode,
                                         SPhysiNode** pPhyNode) {
-  STableScanPhysiNode* pTableScan =
-      (STableScanPhysiNode*)makePhysiNode(pCxt, (SLogicNode*)pScanLogicNode, QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN);
+  STableScanPhysiNode* pTableScan = (STableScanPhysiNode*)makePhysiNode(pCxt, (SLogicNode*)pScanLogicNode,
+                                                                        getScanOperatorType(pScanLogicNode->scanType));
   if (NULL == pTableScan) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
@@ -528,12 +543,12 @@ static int32_t createSystemTableScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan*
 
 static int32_t createStreamScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubplan, SScanLogicNode* pScanLogicNode,
                                          SPhysiNode** pPhyNode) {
-  int32_t res = createTableScanPhysiNode(pCxt, pSubplan, pScanLogicNode, pPhyNode);
-  if (res == TSDB_CODE_SUCCESS) {
-    ENodeType type = QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN;
-    setNodeType(*pPhyNode, type);
-  }
-  return res;
+  return createTableScanPhysiNode(pCxt, pSubplan, pScanLogicNode, pPhyNode);
+}
+
+static int32_t createTableMergeScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubplan,
+                                             SScanLogicNode* pScanLogicNode, SPhysiNode** pPhyNode) {
+  return createTableScanPhysiNode(pCxt, pSubplan, pScanLogicNode, pPhyNode);
 }
 
 static int32_t createScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubplan, SScanLogicNode* pScanLogicNode,
@@ -547,6 +562,8 @@ static int32_t createScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubplan,
       return createSystemTableScanPhysiNode(pCxt, pSubplan, pScanLogicNode, pPhyNode);
     case SCAN_TYPE_STREAM:
       return createStreamScanPhysiNode(pCxt, pSubplan, pScanLogicNode, pPhyNode);
+    case SCAN_TYPE_TABLE_MERGE:
+      return createTableMergeScanPhysiNode(pCxt, pSubplan, pScanLogicNode, pPhyNode);
     default:
       break;
   }

source/libs/planner/src/planSpliter.c

@@ -170,8 +170,8 @@ static bool stbSplNeedSplit(bool streamQuery, SLogicNode* pNode) {
   switch (nodeType(pNode)) {
     case QUERY_NODE_LOGIC_PLAN_SCAN:
       return stbSplIsMultiTbScan(streamQuery, (SScanLogicNode*)pNode);
-    // case QUERY_NODE_LOGIC_PLAN_JOIN:
-    //   return !(((SJoinLogicNode*)pNode)->isSingleTableJoin);
+    case QUERY_NODE_LOGIC_PLAN_JOIN:
+      return !(((SJoinLogicNode*)pNode)->isSingleTableJoin);
     case QUERY_NODE_LOGIC_PLAN_AGG:
       return !stbSplHasGatherExecFunc(((SAggLogicNode*)pNode)->pAggFuncs) && stbSplHasMultiTbScan(streamQuery, pNode);
     case QUERY_NODE_LOGIC_PLAN_WINDOW: {
@@ -392,6 +392,7 @@ static int32_t stbSplSplitIntervalForBatch(SSplitContext* pCxt, SStableSplitInfo
                                      (SNode*)splCreateScanSubplan(pCxt, pPartWindow, SPLIT_FLAG_STABLE_SPLIT));
   }
   pInfo->pSubplan->subplanType = SUBPLAN_TYPE_MERGE;
+  ++(pCxt->groupId);
   return code;
 }
 
@@ -408,6 +409,7 @@ static int32_t stbSplSplitIntervalForStream(SSplitContext* pCxt, SStableSplitInf
                                      (SNode*)splCreateScanSubplan(pCxt, pPartWindow, SPLIT_FLAG_STABLE_SPLIT));
   }
   pInfo->pSubplan->subplanType = SUBPLAN_TYPE_MERGE;
+  ++(pCxt->groupId);
   return code;
 }
 
@@ -496,6 +498,7 @@ static int32_t stbSplSplitAggNode(SSplitContext* pCxt, SStableSplitInfo* pInfo)
                                      (SNode*)splCreateScanSubplan(pCxt, pPartAgg, SPLIT_FLAG_STABLE_SPLIT));
   }
   pInfo->pSubplan->subplanType = SUBPLAN_TYPE_MERGE;
+  ++(pCxt->groupId);
   return code;
 }
 
@@ -610,6 +613,7 @@ static int32_t stbSplSplitSortNode(SSplitContext* pCxt, SStableSplitInfo* pInfo)
                                      (SNode*)splCreateScanSubplan(pCxt, pPartSort, SPLIT_FLAG_STABLE_SPLIT));
   }
   pInfo->pSubplan->subplanType = SUBPLAN_TYPE_MERGE;
+  ++(pCxt->groupId);
   return code;
 }
 
@@ -619,6 +623,7 @@ static int32_t stbSplSplitScanNode(SSplitContext* pCxt, SStableSplitInfo* pInfo)
     code = nodesListMakeStrictAppend(&pInfo->pSubplan->pChildren,
                                      (SNode*)splCreateScanSubplan(pCxt, pInfo->pSplitNode, SPLIT_FLAG_STABLE_SPLIT));
   }
+  ++(pCxt->groupId);
   return code;
 }
 
@@ -642,6 +647,8 @@ static int32_t stbSplSplitScanNodeForJoin(SSplitContext* pCxt, SLogicSubplan* pS
     code = nodesListMakeStrictAppend(&pSubplan->pChildren,
                                      (SNode*)splCreateScanSubplan(pCxt, (SLogicNode*)pScan, SPLIT_FLAG_STABLE_SPLIT));
   }
+  pScan->scanType = SCAN_TYPE_TABLE_MERGE;
+  ++(pCxt->groupId);
   return code;
 }
 
@@ -703,7 +710,6 @@ static int32_t stableSplit(SSplitContext* pCxt, SLogicSubplan* pSubplan) {
       break;
   }
 
-  ++(pCxt->groupId);
   pCxt->split = true;
   return code;
 }

tests/pytest/alter/alter_replica.py

@@ -42,7 +42,7 @@ class TDTestCase:
         tdDnodes.start(3)
 
     def run(self):
-        tdSql.execute('create database db replica 3 days 7')
+        tdSql.execute('create database db replica 3 duration 7')
         tdSql.execute('use db')
         for tid in range(1, 11):
             tdSql.execute('create table tb%d(ts timestamp, i int)' % tid)

tests/pytest/functions/function_max.py

@@ -83,7 +83,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, np.max(floatData))
 
         # test case: https://jira.taosdata.com:18080/browse/TD-2583
-        tdSql.execute("create database test days 2")
+        tdSql.execute("create database test duration 2")
         tdSql.execute("create table car(ts timestamp, speed int)")
         tdSql.execute("insert into car values(now, -1)")
         tdSql.execute("insert into car values(now-10d, null)")

tests/pytest/functions/function_min.py

@@ -83,7 +83,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, np.min(floatData))
 
         # test case: https://jira.taosdata.com:18080/browse/TD-2583
-        tdSql.execute("create database test days 2")
+        tdSql.execute("create database test duration 2")
         tdSql.execute("create table car(ts timestamp, speed int)")
         tdSql.execute("insert into car values(now, 1)")
         tdSql.execute("insert into car values(now-10d, null)")

tests/pytest/functions/queryTestCases.py

@@ -264,7 +264,7 @@ class TDTestCase:
 
     def td4288(self):
         tdLog.printNoPrefix("==========TD-4288==========")
-        # keep ~ [days,365000]
+        # keep ~ [duration,365000]
         tdSql.execute("drop database if exists db")
         tdSql.execute("create database  if not exists db")
         tdSql.query("show variables")

tests/pytest/insert/before_1970.py

@@ -32,7 +32,7 @@ class TDTestCase:
 
         print("==============step1")
         tdSql.execute("create database if not exists demo keep 36500;");
-        print("==============create db demo keep 365000 days")
+        print("==============create db demo keep 365000 duration")
         tdSql.execute("use demo;")
         tdSql.execute("CREATE table if not exists test (ts timestamp, f1 int);")
         print("==============create table test")

tests/pytest/insert/retentionpolicy.py

@@ -51,7 +51,7 @@ class TDTestRetetion:
     def run(self):
         
         tdLog.info("=============== step1")
-        tdSql.execute('create database test keep 3 days 1;')
+        tdSql.execute('create database test keep 3 duration 1;')
         tdSql.execute('use test;')
         tdSql.execute('create table test(ts timestamp,i int);')
 

tests/pytest/multilevel/fileDistributionSameLevel.py

@@ -66,7 +66,7 @@ class TDTestCase:
         tdDnodes.deploy(1,cfg)
         tdDnodes.startWithoutSleep(1)
 
-        tdSql.execute("create database test days 1")
+        tdSql.execute("create database test duration 1")
         tdSql.execute("use test")
 
         tdSql.execute("create table stb(ts timestamp, c int) tags(t int)")
@@ -85,7 +85,7 @@ class TDTestCase:
         tdLog.info("================= step3")
         tdSql.execute('drop database test')
         for i in range(50):
-            tdSql.execute("create database test%d days 1" %(i))
+            tdSql.execute("create database test%d duration 1" %(i))
             tdSql.execute("use test%d" %(i))
             tdSql.execute("create table tb (ts timestamp,i int)") 
             for j in range(10):           

tests/pytest/multilevel/retentionTest.py

@@ -56,7 +56,7 @@ class TDTestCase:
         tdDnodes.deploy(1,cfg)
         tdDnodes.startWithoutSleep(1)
         
-        tdSql.execute("create database test days 1 keep 15,5,10")
+        tdSql.execute("create database test duration 1 keep 15,5,10")
         tdSql.execute("use test")
 
         tdSql.execute("create table tb(ts timestamp, c int)")

tests/pytest/perfbenchmark/bug3433.py

@@ -66,7 +66,7 @@ class TDTestCase:
             "name": "db",
             "drop": "yes",
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 8,
             "precision": "ms",

tests/pytest/perfbenchmark/joinPerformance.py

@@ -81,7 +81,7 @@ class JoinPerf:
             "name": self.dbname,
             "drop": self.drop,
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 8,
             "precision": "ms",

tests/pytest/perfbenchmark/taosdemoInsert.py

@@ -75,7 +75,7 @@ class Taosdemo:
             "name": self.dbname,
             "drop": self.drop,
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 8,
             "precision": "ms",

tests/pytest/query/query1970YearsAf.py

@@ -57,7 +57,7 @@ class TDTestCase:
             "name": "db",
             "drop": "yes",
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 8,
             "precision": "ms",

tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py

@@ -138,7 +138,7 @@ class TDTestCase:
 
         sqls_ls = [
             'drop database  if exists nsdbsql;',
-            'create database nsdbsql precision "ns" keep 3600 days 6 update 1;',
+            'create database nsdbsql precision "ns" keep 3600 duration 6 update 1;',
             'use nsdbsql;',
             'CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupdId int);',
             'CREATE TABLE d1001 USING meters TAGS ("Beijing.Chaoyang", 2);',

tests/pytest/tools/taosdemoAllTest/taosdemoTestSupportNanoInsert.py

@@ -125,7 +125,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, 600)
         # check taosdemo -s
 
-        sqls_ls = ['drop database  if exists nsdbsql;','create database nsdbsql precision "ns" keep 36 days 6 update 1;',
+        sqls_ls = ['drop database  if exists nsdbsql;','create database nsdbsql precision "ns" keep 36 duration 6 update 1;',
                 'use nsdbsql;','CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupdId int);',
                 'CREATE TABLE d1001 USING meters TAGS ("Beijing.Chaoyang", 2);',
                 'INSERT INTO d1001 USING METERS TAGS ("Beijng.Chaoyang", 2) VALUES (now, 10.2, 219, 0.32);',

tests/pytest/tools/taosdumpTest.py

@@ -60,8 +60,8 @@ class TDTestCase:
         if not os.path.exists("./taosdumptest/tmp2"):
             os.makedirs("./taosdumptest/tmp2")
         tdSql.execute("drop database if exists db")
-        tdSql.execute("create database db  days 11 keep 3649 blocks 8 ")
-        tdSql.execute("create database db1  days 12 keep 3640 blocks 7 ")
+        tdSql.execute("create database db  duration 11 keep 3649 blocks 8 ")
+        tdSql.execute("create database db1  duration 12 keep 3640 blocks 7 ")
         tdSql.execute("use db")
         tdSql.execute(
             "create table st(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
@@ -102,7 +102,7 @@ class TDTestCase:
         tdSql.query("show databases")
         tdSql.checkRows(2)
         dbresult = tdSql.queryResult
-        # 6--days,7--keep0,keep1,keep, 12--block,
+        # 6--duration,7--keep0,keep1,keep, 12--block,
 
         isCommunity = self.checkCommunity()
         print("iscommunity: %d" % isCommunity)

tests/pytest/tools/taosdumpTestNanoSupport.py

@@ -60,7 +60,7 @@ class TDTestCase:
         def build_db(precision, start_time):
             tdSql.execute("drop database if exists timedb1")
             tdSql.execute(
-                "create database timedb1 days 10 keep 365 blocks 8 precision "+"\""+precision+"\"")
+                "create database timedb1 duration 10 keep 365 blocks 8 precision "+"\""+precision+"\"")
 
             tdSql.execute("use timedb1")
             tdSql.execute(

tests/pytest/update/merge_commit_data-0.py

@@ -30,7 +30,7 @@ class TDTestCase:
         tdSql.execute(s)
         s = 'drop database if exists db'
         tdSql.execute(s)
-        s = 'create database db days 30'
+        s = 'create database db duration 30'
         tdSql.execute(s)
         s = 'use db'
         tdSql.execute(s)

tests/pytest/update/merge_commit_data.py

@@ -30,7 +30,7 @@ class TDTestCase:
         tdSql.execute(s)
         s = 'drop database if exists db'
         tdSql.execute(s)
-        s = 'create database db update 1 days 30'
+        s = 'create database db update 1 duration 30'
         tdSql.execute(s)
         s = 'use db'
         tdSql.execute(s)

tests/pytest/update/merge_commit_data2.py

@@ -50,7 +50,7 @@ class TDTestCase:
         tdSql.execute(sql)
         sql = 'drop database if exists db'
         tdSql.execute(sql)
-        sql = 'create database db update 1 days 30;'
+        sql = 'create database db update 1 duration 30;'
         tdSql.execute(sql)
         sql = 'use db;'
         tdSql.execute(sql)

tests/pytest/update/merge_commit_data2_update0.py

@@ -49,7 +49,7 @@ class TDTestCase:
         tdSql.execute(sql)
         sql = 'drop database if exists db'
         tdSql.execute(sql)
-        sql = 'create database db update 0 days 30;'
+        sql = 'create database db update 0 duration 30;'
         tdSql.execute(sql)
         sql = 'use db;'
         tdSql.execute(sql)

tests/pytest/update/merge_commit_last.py

@@ -34,7 +34,7 @@ class TDTestCase:
     def run(self):              
         tdSql.prepare()
 
-        tdSql.execute("create database udb update 1 days 30")   
+        tdSql.execute("create database udb update 1 duration 30")   
         tdSql.execute("use udb")
 
         print("==============step 1: UPDATE THE LAST RECORD REPEATEDLY")                     

tests/pytest/util/sql.py

@@ -57,7 +57,7 @@ class TDSql:
             tdLog.notice("'reset query cache' is not supported")
         s = 'drop database if exists db'
         self.cursor.execute(s)
-        s = 'create database db days 300'
+        s = 'create database db duration 300'
         self.cursor.execute(s)
         s = 'use db'
         self.cursor.execute(s)

tests/pytest/util/taosdemoCfg.py

@@ -63,7 +63,7 @@ class TDTaosdemoCfg:
             "name": 'db',
             "drop": 'yes',
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 6,
             "precision": "ms",

tests/script/general/db/alter_option.sim

@@ -9,7 +9,7 @@ sleep 2000
 sql connect
 
 print ============= create database
-sql create database db cache 2 blocks 4 days 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
+sql create database db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
 sql show databases
 if $data00 != db then 
   return -1
@@ -87,13 +87,13 @@ sql_error alter database db quorum 4
 sql_error alter database db quorum 5
 sql_error alter database db quorum -1
 
-print ============== step days
-sql_error alter database db days 0
-sql_error alter database db days 1
-sql_error alter database db days 2
-sql_error alter database db days 10
-sql_error alter database db days 50
-sql_error alter database db days 100
+print ============== step duration
+sql_error alter database db duration 0
+sql_error alter database db duration 1
+sql_error alter database db duration 2
+sql_error alter database db duration 10
+sql_error alter database db duration 50
+sql_error alter database db duration 100
 
 print ============== step keep
 sql show databases

tests/script/general/db/backup/keep.sim

@@ -26,7 +26,7 @@ system sh/exec.sh -n dnode2 -s start
 sleep 2000
 
 print ======== step1 create db
-sql create database keepdb replica 1 keep 30 days 7
+sql create database keepdb replica 1 keep 30 duration 7
 sql use keepdb
 sql create table tb (ts timestamp, i int)
 
@@ -201,7 +201,7 @@ sql alter database keepdb keep 0 -x error2
   return -1
 error2:
 
-sql alter database keepdb days 1 -x error3
+sql alter database keepdb duration 1 -x error3
   return -1
 error3:
 

tests/script/general/db/topic1.sim

@@ -171,7 +171,7 @@ sql_error create topic t1 partitions -1;
 sql_error create topic t1 partitions 10001;
 
 print =============step3 create with db para
-sql create topic db cache 2 blocks 4 days 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
+sql create topic db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
 sql show databases
 if $data00 != db then 
   return -1
@@ -199,7 +199,7 @@ if $data09 != 4 then
 endi
 sql drop topic db;
 
-sql create topic db cache 2 blocks 4 days 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1 partitions 7
+sql create topic db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1 partitions 7
 sql show databases
 if $data00 != db then 
   return -1
@@ -334,19 +334,19 @@ sql_error alter topic db quorum 4
 sql_error alter topic db quorum 5
 sql_error alter topic db quorum -1
 
-print ============== step days
-sql_error alter database db days 0
-sql_error alter database db days 1
-sql_error alter database db days 2
-sql_error alter database db days 10
-sql_error alter database db days 50
-sql_error alter database db days 100
-sql_error alter topic db days 0
-sql_error alter topic db days 1
-sql_error alter topic db days 2
-sql_error alter topic db days 10
-sql_error alter topic db days 50
-sql_error alter topic db days 100
+print ============== step duration
+sql_error alter database db duration 0
+sql_error alter database db duration 1
+sql_error alter database db duration 2
+sql_error alter database db duration 10
+sql_error alter database db duration 50
+sql_error alter database db duration 100
+sql_error alter topic db duration 0
+sql_error alter topic db duration 1
+sql_error alter topic db duration 2
+sql_error alter topic db duration 10
+sql_error alter topic db duration 50
+sql_error alter topic db duration 100
 
 print ============== step keep
 sql show databases

tests/script/general/import/commit.sim

@@ -30,7 +30,7 @@ sleep 2000
 sql connect
 
 print ========= step1
-sql create database ic1db days 7;
+sql create database ic1db duration 7;
 sql create table ic1db.tb(ts timestamp, s int);
 sql insert into ic1db.tb values(now-30d, -30);
 sql insert into ic1db.tb values(now-20d, -20);
@@ -50,7 +50,7 @@ if $rows != 12 then
 endi
 
 print ========= step2
-sql create database ic2db days 7;
+sql create database ic2db duration 7;
 sql create table ic2db.tb(ts timestamp, s int);
 sql insert into ic2db.tb values(now, 0);
 sql import into ic2db.tb values(now-30d, -30);

tests/script/general/import/replica1.sim

@@ -30,7 +30,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 2000
 sql connect
 
-sql create database ir1db days 7
+sql create database ir1db duration 7
 sql use ir1db
 sql create table tb(ts timestamp, i bigint)
 

tests/script/general/parser/alter.sim

@@ -20,7 +20,7 @@ $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
 sql drop database if exists $db
-sql create database $db days 10 keep 20,20,20
+sql create database $db duration 10 keep 20,20,20
 sql use $db
 
 sql_error alter database $db keep "20"

tests/script/general/parser/alter__for_community_version.sim

@@ -20,7 +20,7 @@ $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
 sql drop database if exists $db
-sql create database $db days 10 keep 20
+sql create database $db duration 10 keep 20
 sql use $db
 sql show databases
 if $rows != 1 then

tests/script/general/parser/create_db.sim

@@ -101,7 +101,7 @@ print db_already_exists test passed
 print create_db.sim case5: db_meta_data test
 # cfg params
 $replica = 1 # max=3
-$days = 10
+$duration = 10
 $keep = 365,365,365
 $rows_db = 1000
 $cache = 16 # 16MB
@@ -111,7 +111,7 @@ $ctime = 36000 # 10 hours
 $wal = 1 # valid value is 1, 2
 $comp = 1 # max=32, automatically trimmed when exceeding
 
-sql create database $db replica $replica days $days keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
+sql create database $db replica $replica duration $duration keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
 sql show databases
 if $rows != 1 then
   return -1
@@ -122,7 +122,7 @@ endi
 if $data04 != $replica then 
  return -1
 endi
-if $data06 != $days then 
+if $data06 != $duration then 
  return -1
 endi
 if $data07 != 365,365,365 then 

tests/script/general/parser/create_db__for_community_version.sim

@@ -101,7 +101,7 @@ print db_already_exists test passed
 print create_db.sim case5: db_meta_data test
 # cfg params
 $replica = 1 # max=3
-$days = 10
+$duration = 10
 $keep = 365
 $rows_db = 1000
 $cache = 16 # 16MB
@@ -111,7 +111,7 @@ $ctime = 36000 # 10 hours
 $wal = 1 # valid value is 1, 2
 $comp = 1 # max=32, automatically trimmed when exceeding
 
-sql create database $db replica $replica days $days keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
+sql create database $db replica $replica duration $duration keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
 sql show databases
 if $rows != 1 then
   return -1
@@ -122,7 +122,7 @@ endi
 if $data04 != $replica then 
  return -1
 endi
-if $data06 != $days then 
+if $data06 != $duration then 
  return -1
 endi
 if $data07 != 365 then 

tests/script/tsim/db/alter_option.sim

@@ -62,11 +62,11 @@ print ============= create database
 #  | PAGES value        [64~16384, default: 256]
 #  | CACHELAST value    [0, 1, 2, 3]
 #  | FSYNC value        [0 ~ 180000 ms]
-#  | KEEP value         [days, 365000]
+#  | KEEP value         [duration, 365000]
 #  | REPLICA value      [1 | 3]
 #  | WAL value          [1 | 2]
 
-sql create database db CACHELAST 3 COMP 0 DAYS 240 FSYNC 1000 MAXROWS 8000 MINROWS 10 KEEP 1000 PRECISION 'ns' REPLICA 3 WAL 2 VGROUPS 6 SINGLE_STABLE 1
+sql create database db CACHELAST 3 COMP 0 DURATION 240 FSYNC 1000 MAXROWS 8000 MINROWS 10 KEEP 1000 PRECISION 'ns' REPLICA 3 WAL 2 VGROUPS 6 SINGLE_STABLE 1
 sql show databases
 print rows: $rows
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
@@ -92,7 +92,7 @@ endi
 if $data5_db != no_strict then  # strict
   return -1
 endi
-if $data6_db != 345600 then  # days
+if $data6_db != 345600 then  # duration
   return -1
 endi
 if $data7_db != 1440000m,1440000m,1440000m then # keep
@@ -222,11 +222,11 @@ sql_error alter database db replica 0
 #sql_error alter database db quorum 4
 #sql_error alter database db quorum 5
 
-#print ============== modify days
-sql_error alter database db days 480
-sql_error alter database db days 360
-sql_error alter database db days 0
-sql_error alter database db days 14400  # set over than keep
+#print ============== modify duration
+sql_error alter database db duration 480
+sql_error alter database db duration 360
+sql_error alter database db duration 0
+sql_error alter database db duration 14400  # set over than keep
 
 print ============== modify keep
 sql alter database db keep 2400

tests/script/tsim/db/basic6.sim

@@ -15,7 +15,7 @@ $tb = $tbPrefix . $i
 
 print =============== step1
 # quorum  presicion 
-sql create database $db vgroups 8 replica 1 days 2 keep 10 minrows 80 maxrows 10000 wal 2 fsync 1000 comp 0 cachelast 2 precision 'us'
+sql create database $db vgroups 8 replica 1 duration 2 keep 10 minrows 80 maxrows 10000 wal 2 fsync 1000 comp 0 cachelast 2 precision 'us'
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 
@@ -66,7 +66,7 @@ print =============== step4
 sql_error drop database $db
 
 print =============== step5
-sql create database $db replica 1 days 15 keep 1500
+sql create database $db replica 1 duration 15 keep 1500
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
 if $data20 != $db then

tests/script/tsim/db/create_all_options.sim

@@ -63,7 +63,7 @@ print ============= create database with all options
 #  | PAGESIZE value     [1~16384, default: 4]
 #  | CACHELAST value    [0, 1, 2, 3, default: 0]
 #  | COMP               [0 | 1 | 2, default: 2]
-#  | DAYS value         [60m ~ min(3650d,keep), default: 10d, unit may be minut/hour/day]
+#  | DURATION value         [60m ~ min(3650d,keep), default: 10d, unit may be minut/hour/day]
 #  | FSYNC value        [0 ~ 180000 ms, default: 3000]
 #  | MAXROWS value      [200~10000, default: 4096]
 #  | MINROWS value      [10~1000, default: 100]
@@ -79,7 +79,7 @@ print ============= create database with all options
 #$data2_db  : vgroups
 #$data3_db  : ntables
 #$data4_db  : replica
-#$data6_db  : days
+#$data6_db  : duration
 #$data7_db  : keep
 #$data10_db : minrows
 #$data11_db : maxrows
@@ -113,7 +113,7 @@ endi
 if $data5_db != no_strict then  # strict
   return -1
 endi
-if $data6_db != 14400 then  # days
+if $data6_db != 14400 then  # duration
   return -1
 endi
 if $data7_db != 5256000m,5256000m,5256000m then # keep
@@ -234,9 +234,9 @@ sql drop database db
 sql_error create database db COMP 3
 sql_error create database db COMP -1
 
-#print ====> DAYS value [60m ~ min(3650d,keep), default: 10d, unit may be minut/hour/day]
+#print ====> DURATION value [60m ~ min(3650d,keep), default: 10d, unit may be minut/hour/day]
 #print ====> KEEP value [max(1d ~ 365000d), default: 1d, unit may be minut/hour/day]
-#sql create database db DAYS 60m KEEP 60m
+#sql create database db DURATION 60m KEEP 60m
 #sql show databases
 #print $data0_db $data1_db $data2_db $data3_db $data4_db $data5_db $data6_db $data7_db $data8_db $data9_db $data10_db $data11_db $data12_db $data13_db $data14_db $data15_db $data16_db $data17_db
 #if $data6_db != 60 then
@@ -246,7 +246,7 @@ sql_error create database db COMP -1
 #  return -1
 #endi
 #sql drop database db
-#sql create database db DAYS 60m KEEP 1d
+#sql create database db DURATION 60m KEEP 1d
 #sql show databases
 #print $data0_db $data1_db $data2_db $data3_db $data4_db $data5_db $data6_db $data7_db $data8_db $data9_db $data10_db $data11_db $data12_db $data13_db $data14_db $data15_db $data16_db $data17_db
 #if $data6_db != 60 then
@@ -255,7 +255,7 @@ sql_error create database db COMP -1
 #if $data7_db != 1440,1440,1440 then
 #  return -1
 #endi
-#sql create database db DAYS 3650d KEEP 365000d
+#sql create database db DURATION 3650d KEEP 365000d
 #sql show databases
 #print $data0_db $data1_db $data2_db $data3_db $data4_db $data5_db $data6_db $data7_db $data8_db $data9_db $data10_db $data11_db $data12_db $data13_db $data14_db $data15_db $data16_db $data17_db
 #if $data6_db != 5256000 then
@@ -265,10 +265,10 @@ sql_error create database db COMP -1
 #  return -1
 #endi
 #sql drop database db
-#sql_error create database db DAYS -59m
-#sql_error create database db DAYS 59m
-#sql_error create database db DAYS 5256001m
-#sql_error create database db DAYS 3651d
+#sql_error create database db DURATION -59m
+#sql_error create database db DURATION 59m
+#sql_error create database db DURATION 5256001m
+#sql_error create database db DURATION 3651d
 #sql_error create database db KEEP -59m
 #sql_error create database db KEEP 14399m
 #sql_error create database db KEEP 525600001m

tests/script/tsim/insert/commit-merge0.sim

@@ -5,7 +5,7 @@ sleep 50
 sql connect
 
 print =============== create database
-sql create database db  days 300 keep 365000d,365000d,365000d
+sql create database db  duration 300 keep 365000d,365000d,365000d
 sql show databases
 if $rows != 3 then
   return -1

tests/script/tsim/query/interval-offset.sim

@@ -5,7 +5,7 @@ sleep 500
 sql connect
 
 print =============== create database
-sql create database d0 days 300
+sql create database d0 duration 300
 sql use d0
 
 print =============== create super table and child table

tests/script/tsim/stable/alter_count.sim

@@ -6,7 +6,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 
 print ======== step1 
-sql create database d1 replica 1 days 7 keep 50 
+sql create database d1 replica 1 duration 7 keep 50 
 sql use d1
 sql create table tb (ts timestamp, a int)
 sql insert into tb values(now-28d, -28)

tests/script/tsim/stable/alter_import.sim

@@ -6,7 +6,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 
 print ======== step1 
-sql create database d1 replica 1 days 7 keep 50
+sql create database d1 replica 1 duration 7 keep 50
 sql use d1
 sql create table tb (ts timestamp, a int)
 sql insert into tb values(now-30d, -28)

tests/script/unique/db/commit.sim

@@ -24,7 +24,7 @@ system sh/exec.sh -n dnode2 -s start
 sleep 2000
 
 print ======== step1 create db
-sql create database commitdb replica 1 days 7 keep 30
+sql create database commitdb replica 1 duration 7 keep 30
 sql use commitdb
 sql create table tb (ts timestamp, i int)
 

tests/script/unique/import/replica2.sim

@@ -52,7 +52,7 @@ if $data4_2 != ready then
   goto step1
 endi
 
-sql create database ir2db replica 2 days 7
+sql create database ir2db replica 2 duration 7
 sql use ir2db
 sql create table tb(ts timestamp, i bigint)
 

tests/script/unique/import/replica3.sim

@@ -58,7 +58,7 @@ if $data4_3 != ready then
   goto step1
 endi
 
-sql create database ir3db replica 3 days 7
+sql create database ir3db replica 3 duration 7
 sql use ir3db
 sql create table tb(ts timestamp, i bigint)
 

tests/script/windows/db/basic.sim

@@ -17,7 +17,7 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
 print =============== step1
-sql create database $db replica 1 days 20 keep 2000 cache 16
+sql create database $db replica 1 duration 20 keep 2000 cache 16
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
 if $data00 != $db then 
@@ -57,7 +57,7 @@ print =============== step4
 sql_error drop database $db
 
 print =============== step5
-sql create database $db replica 1 days 15 keep 1500
+sql create database $db replica 1 duration 15 keep 1500
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
 if $data00 != $db then 

tests/system-test/0-others/udfTest.py

@@ -60,7 +60,7 @@ class TDTestCase:
     def prepare_data(self):
         
         tdSql.execute("drop database if exists db ")
-        tdSql.execute("create database if not exists db  days 300")
+        tdSql.execute("create database if not exists db  duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1

tests/system-test/0-others/udf_cluster.py

@@ -63,7 +63,7 @@ class TDTestCase:
     def prepare_data(self):
     
         tdSql.execute("drop database if exists db")
-        tdSql.execute("create database if not exists db replica 1 days 300")
+        tdSql.execute("create database if not exists db replica 1 duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1

tests/system-test/0-others/udf_create.py

@@ -62,7 +62,7 @@ class TDTestCase:
     def prepare_data(self):
         
         tdSql.execute("drop database if exists db ")
-        tdSql.execute("create database if not exists db  days 300")
+        tdSql.execute("create database if not exists db  duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1

tests/system-test/0-others/udf_restart_taosd.py

@@ -59,7 +59,7 @@ class TDTestCase:
     def prepare_data(self):
         
         tdSql.execute("drop database if exists db ")
-        tdSql.execute("create database if not exists db  days 300")
+        tdSql.execute("create database if not exists db  duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1

tests/system-test/2-query/abs.py

@@ -68,7 +68,7 @@ class TDTestCase:
 
     def prepare_tag_datas(self):
                 # prepare datas
-        tdSql.execute("create database if not exists testdb keep 3650 days 1000")
+        tdSql.execute("create database if not exists testdb keep 3650 duration 1000")
         tdSql.execute(" use testdb ")
         tdSql.execute(
             '''create table stb1

tests/system-test/2-query/sample.py

@@ -628,7 +628,7 @@ class TDTestCase:
 
     def basic_sample_query(self):
         tdSql.execute(" drop database if exists db ")
-        tdSql.execute(" create database if not exists db days 300 ")
+        tdSql.execute(" create database if not exists db duration 300 ")
         tdSql.execute(" use db ")
         tdSql.execute(
             '''create table stb1

tests/system-test/6-cluster/5dnode1mnode.py

@@ -104,7 +104,7 @@ class TDTestCase:
         tdSql.error("drop mnode on dnode 1;")
 
         tdSql.execute("drop database if exists db")
-        tdSql.execute("create database if not exists db replica 1 days 300")
+        tdSql.execute("create database if not exists db replica 1 duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1

tests/system-test/6-cluster/5dnode2mnode.py

@@ -104,7 +104,7 @@ class TDTestCase:
         tdSql.error("drop mnode on dnode 1;")
 
         tdSql.execute("drop database if exists db")
-        tdSql.execute("create database if not exists db replica 1 days 300")
+        tdSql.execute("create database if not exists db replica 1 duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1
@@ -163,7 +163,7 @@ class TDTestCase:
         # fisrt add data : db\stable\childtable\general table
 
         tdSql.execute("drop database if exists db2")
-        tdSql.execute("create database if not exists db2 replica 1 days 300")
+        tdSql.execute("create database if not exists db2 replica 1 duration 300")
         tdSql.execute("use db2")
         tdSql.execute(
         '''create table stb1

tests/system-test/6-cluster/5dnode3mnodeDrop.py

@@ -53,7 +53,7 @@ class TDTestCase:
         # fisrt add data : db\stable\childtable\general table
         for couti in count:
             tdSql.execute("drop database if exists db%d" %couti)
-            tdSql.execute("create database if not exists db%d replica 1 days 300" %couti)
+            tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti)
             tdSql.execute("use db%d" %couti)
             tdSql.execute(
             '''create table stb1

tests/system-test/6-cluster/5dnode3mnodeStop.py

@@ -53,7 +53,7 @@ class TDTestCase:
         # fisrt add data : db\stable\childtable\general table
         for couti in count:
             tdSql.execute("drop database if exists db%d" %couti)
-            tdSql.execute("create database if not exists db%d replica 1 days 300" %couti)
+            tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti)
             tdSql.execute("use db%d" %couti)
             tdSql.execute(
             '''create table stb1

tests/system-test/6-cluster/5dnode3mnodeStopInsert.py

@@ -54,7 +54,7 @@ class TDTestCase:
         # fisrt add data : db\stable\childtable\general table
         for couti in range(countstart,countstop):
             tdSql.execute("drop database if exists db%d" %couti)
-            tdSql.execute("create database if not exists db%d replica 1 days 300" %couti)
+            tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti)
             tdSql.execute("use db%d" %couti)
             tdSql.execute(
             '''create table stb1