Merge pull request #16553 from taosdata/fix/TD-16780

fix(query): support timestamp type in max/min function

include/common/ttypes.h

@@ -49,9 +49,6 @@ typedef struct {
 #define varDataCopy(dst, v)    memcpy((dst), (void *)(v), varDataTLen(v))
 #define varDataLenByData(v)    (*(VarDataLenT *)(((char *)(v)) - VARSTR_HEADER_SIZE))
 #define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT)(_len))
-#define IS_VAR_DATA_TYPE(t) \
-  (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_NCHAR) || ((t) == TSDB_DATA_TYPE_JSON))
-#define IS_STR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_NCHAR))
 
 #define varDataNetLen(v)  (htons(((VarDataLenT *)(v))[0]))
 #define varDataNetTLen(v) (sizeof(VarDataLenT) + varDataNetLen(v))
@@ -268,11 +265,16 @@ typedef struct {
 #define IS_UNSIGNED_NUMERIC_TYPE(_t) ((_t) >= TSDB_DATA_TYPE_UTINYINT && (_t) <= TSDB_DATA_TYPE_UBIGINT)
 #define IS_FLOAT_TYPE(_t)            ((_t) == TSDB_DATA_TYPE_FLOAT || (_t) == TSDB_DATA_TYPE_DOUBLE)
 #define IS_INTEGER_TYPE(_t)          ((IS_SIGNED_NUMERIC_TYPE(_t)) || (IS_UNSIGNED_NUMERIC_TYPE(_t)))
+#define IS_TIMESTAMP_TYPE(_t)        ((_t) == TSDB_DATA_TYPE_TIMESTAMP)
 
 #define IS_NUMERIC_TYPE(_t) ((IS_SIGNED_NUMERIC_TYPE(_t)) || (IS_UNSIGNED_NUMERIC_TYPE(_t)) || (IS_FLOAT_TYPE(_t)))
 #define IS_MATHABLE_TYPE(_t) \
   (IS_NUMERIC_TYPE(_t) || (_t) == (TSDB_DATA_TYPE_BOOL) || (_t) == (TSDB_DATA_TYPE_TIMESTAMP))
 
+#define IS_VAR_DATA_TYPE(t) \
+  (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_NCHAR) || ((t) == TSDB_DATA_TYPE_JSON))
+#define IS_STR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_NCHAR))
+
 #define IS_VALID_TINYINT(_t)   ((_t) >= INT8_MIN && (_t) <= INT8_MAX)
 #define IS_VALID_SMALLINT(_t)  ((_t) >= INT16_MIN && (_t) <= INT16_MAX)
 #define IS_VALID_INT(_t)       ((_t) >= INT32_MIN && (_t) <= INT32_MAX)

source/libs/function/src/builtins.c

@@ -311,6 +311,22 @@ static int32_t translateInOutStr(SFunctionNode* pFunc, char* pErrBuf, int32_t le
   return TSDB_CODE_SUCCESS;
 }
 
+static int32_t translateMinMax(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
+  if (1 != LIST_LENGTH(pFunc->pParameterList)) {
+    return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName);
+  }
+
+  uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
+  if (!IS_TIMESTAMP_TYPE(paraType) && !IS_NUMERIC_TYPE(paraType) && !IS_NULL_TYPE(paraType)) {
+    return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
+  } else if (IS_NULL_TYPE(paraType)) {
+    paraType = TSDB_DATA_TYPE_BIGINT;
+  }
+
+  pFunc->node.resType = (SDataType){.bytes = tDataTypes[paraType].bytes, .type = paraType};
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t translateTrimStr(SFunctionNode* pFunc, char* pErrBuf, int32_t len, bool isLtrim) {
   if (1 != LIST_LENGTH(pFunc->pParameterList)) {
     return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName);
@@ -698,7 +714,7 @@ static int32_t translateSpread(SFunctionNode* pFunc, char* pErrBuf, int32_t len)
   }
 
   uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
-  if (!IS_NUMERIC_TYPE(paraType) && TSDB_DATA_TYPE_TIMESTAMP != paraType) {
+  if (!IS_NUMERIC_TYPE(paraType) && !IS_TIMESTAMP_TYPE(paraType)) {
     return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
   }
 
@@ -713,7 +729,7 @@ static int32_t translateSpreadImpl(SFunctionNode* pFunc, char* pErrBuf, int32_t
 
   uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
   if (isPartial) {
-    if (!IS_NUMERIC_TYPE(paraType) && TSDB_DATA_TYPE_TIMESTAMP != paraType) {
+    if (!IS_NUMERIC_TYPE(paraType) && !IS_TIMESTAMP_TYPE(paraType)) {
       return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
     }
     pFunc->node.resType = (SDataType){.bytes = getSpreadInfoSize() + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY};
@@ -788,7 +804,7 @@ static int32_t translateElapsedImpl(SFunctionNode* pFunc, char* pErrBuf, int32_t
     }
 
     uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
-    if (TSDB_DATA_TYPE_TIMESTAMP != paraType) {
+    if (!IS_TIMESTAMP_TYPE(paraType)) {
       return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
     }
 
@@ -1634,7 +1650,7 @@ static int32_t translateDiff(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
 
   uint8_t colType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
   if (!IS_SIGNED_NUMERIC_TYPE(colType) && !IS_FLOAT_TYPE(colType) && TSDB_DATA_TYPE_BOOL != colType &&
-      TSDB_DATA_TYPE_TIMESTAMP != colType) {
+      !IS_TIMESTAMP_TYPE(colType)) {
     return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
   }
 
@@ -1660,7 +1676,7 @@ static int32_t translateDiff(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
   }
 
   uint8_t resType;
-  if (IS_SIGNED_NUMERIC_TYPE(colType) || TSDB_DATA_TYPE_BOOL == colType || TSDB_DATA_TYPE_TIMESTAMP == colType) {
+  if (IS_SIGNED_NUMERIC_TYPE(colType) || IS_TIMESTAMP_TYPE(colType) || TSDB_DATA_TYPE_BOOL == colType) {
     resType = TSDB_DATA_TYPE_BIGINT;
   } else {
     resType = TSDB_DATA_TYPE_DOUBLE;
@@ -1825,7 +1841,7 @@ static int32_t translateToIso8601(SFunctionNode* pFunc, char* pErrBuf, int32_t l
 
   // param0
   uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
-  if (!IS_INTEGER_TYPE(paraType) && TSDB_DATA_TYPE_TIMESTAMP != paraType) {
+  if (!IS_INTEGER_TYPE(paraType) && !IS_TIMESTAMP_TYPE(paraType)) {
     return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
   }
 
@@ -1878,7 +1894,7 @@ static int32_t translateTimeTruncate(SFunctionNode* pFunc, char* pErrBuf, int32_
 
   uint8_t para1Type = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
   uint8_t para2Type = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 1))->resType.type;
-  if ((!IS_STR_DATA_TYPE(para1Type) && !IS_INTEGER_TYPE(para1Type) && TSDB_DATA_TYPE_TIMESTAMP != para1Type) ||
+  if ((!IS_STR_DATA_TYPE(para1Type) && !IS_INTEGER_TYPE(para1Type) && !IS_TIMESTAMP_TYPE(para1Type)) ||
       !IS_INTEGER_TYPE(para2Type)) {
     return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
   }
@@ -1911,7 +1927,7 @@ static int32_t translateTimeDiff(SFunctionNode* pFunc, char* pErrBuf, int32_t le
 
   for (int32_t i = 0; i < 2; ++i) {
     uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, i))->resType.type;
-    if (!IS_STR_DATA_TYPE(paraType) && !IS_INTEGER_TYPE(paraType) && TSDB_DATA_TYPE_TIMESTAMP != paraType) {
+    if (!IS_STR_DATA_TYPE(paraType) && !IS_INTEGER_TYPE(paraType) && !IS_TIMESTAMP_TYPE(paraType)) {
       return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
     }
   }
@@ -2060,7 +2076,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .name = "min",
     .type = FUNCTION_TYPE_MIN,
     .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_SPECIAL_DATA_REQUIRED | FUNC_MGT_SELECT_FUNC,
-    .translateFunc = translateInOutNum,
+    .translateFunc = translateMinMax,
     .dataRequiredFunc = statisDataRequired,
     .getEnvFunc   = getMinmaxFuncEnv,
     .initFunc     = minmaxFunctionSetup,
@@ -2075,7 +2091,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .name = "max",
     .type = FUNCTION_TYPE_MAX,
     .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_SPECIAL_DATA_REQUIRED | FUNC_MGT_SELECT_FUNC,
-    .translateFunc = translateInOutNum,
+    .translateFunc = translateMinMax,
     .dataRequiredFunc = statisDataRequired,
     .getEnvFunc   = getMinmaxFuncEnv,
     .initFunc     = minmaxFunctionSetup,

source/libs/function/src/builtinsimpl.c

@@ -1204,7 +1204,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
         pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock);
       }
     } else {
-      if (IS_SIGNED_NUMERIC_TYPE(type)) {
+      if (IS_SIGNED_NUMERIC_TYPE(type) || IS_TIMESTAMP_TYPE(type)) {
         int64_t prev = 0;
         GET_TYPED_DATA(prev, int64_t, type, &pBuf->v);
 
@@ -1216,7 +1216,6 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
             pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock);
           }
         }
-
       } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
         uint64_t prev = 0;
         GET_TYPED_DATA(prev, uint64_t, type, &pBuf->v);
@@ -1264,7 +1263,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
   int32_t start = pInput->startRowIndex;
   int32_t numOfRows = pInput->numOfRows;
 
-  if (IS_SIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_BOOL) {
+  if (IS_SIGNED_NUMERIC_TYPE(type) || IS_TIMESTAMP_TYPE(type) || type == TSDB_DATA_TYPE_BOOL) {
     if (type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_BOOL) {
       int8_t* pData = (int8_t*)pCol->pData;
       int8_t* val = (int8_t*)&pBuf->v;
@@ -1358,7 +1357,8 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
 
         numOfElems += 1;
       }
-    } else if (type == TSDB_DATA_TYPE_BIGINT) {
+    } else if (type == TSDB_DATA_TYPE_BIGINT ||
+               type == TSDB_DATA_TYPE_TIMESTAMP) {
       int64_t* pData = (int64_t*)pCol->pData;
       int64_t* val = (int64_t*)&pBuf->v;
 

tests/script/tsim/stable/alter_comment.sim

@@ -95,7 +95,7 @@ sql_error alter table db.stb add tag t1 int
 sql_error alter table db.stb add tag t2 int
 sql_error alter table db.stb add tag t3 int
 sql alter table db.stb add tag t4 bigint
-sql alter table db.stb add tag c1 int  
+sql alter table db.stb add tag c1 int
 sql alter table db.stb add tag t5 binary(12)
 
 sql select * from information_schema.ins_stables where db_name = 'db'

tests/script/tsim/stable/alter_count.sim

@@ -5,8 +5,8 @@ print ========= start dnode1 as master
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
-sql create database d1 replica 1 duration 7 keep 50 
+print ======== step1
+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)
@@ -83,7 +83,7 @@ if $data00 != 3 then
 endi
 
 print ======== step8
-# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float, g double, h binary(10) ) 
+# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float, g double, h binary(10) )
 sql alter table tb add column h binary(10)
 sql insert into tb values(now-7d, -7, 18, 0, 0, 0, 0, 0, '0')
 sql insert into tb values(now-6d, -6, 19, 1, 1, 1, 1, 1, '1')
@@ -260,4 +260,4 @@ if $data00 != 31 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/alter_import.sim

@@ -5,7 +5,7 @@ print ========= start dnode1 as master
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database d1 replica 1 duration 7 keep 50
 sql use d1
 sql create table tb (ts timestamp, a int)
@@ -42,4 +42,4 @@ if $data00 != 6 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/alter_insert1.sim

@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database d3
 sql use d3
 sql create table tb (ts timestamp, a int)
@@ -1137,4 +1137,4 @@ if $data79 != null then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/alter_insert2.sim

@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database d4
 sql use d4
 sql create table tb (ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float, g double, h binary(10))
@@ -662,4 +662,4 @@ if $data62 != null then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/alter_metrics.sim

@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database d2
 sql use d2
 sql create table mt (ts timestamp, a int) TAGS (t int)
@@ -757,8 +757,8 @@ endi
 print ======= over
 sql drop database d2
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/column_add.sim

@@ -116,7 +116,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != NULL then
   return -1
 endi
@@ -153,7 +153,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != NULL then
   return -1
 endi
@@ -299,4 +299,4 @@ if $rows != 10 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/column_modify.sim

@@ -31,7 +31,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 1234 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -92,7 +92,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 1234 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -106,4 +106,4 @@ if $data[1][3] != 101 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/disk.sim

@@ -188,4 +188,4 @@ if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/refcount.sim

@@ -123,4 +123,4 @@ if $rows != 2 then
 endi
 
 print =============== step6
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/tag_add.sim

@@ -139,7 +139,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -170,7 +170,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -190,4 +190,4 @@ if $rows != 7 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/tag_drop.sim

@@ -165,7 +165,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -196,7 +196,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != 201 then
   return -1
 endi
@@ -229,7 +229,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != 201 then
   return -1
 endi
@@ -261,7 +261,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != 301 then
   return -1
 endi
@@ -323,7 +323,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 2 then
   return -1
-endi  
+endi
 if $data[0][3] != 302 then
   return -1
 endi
@@ -334,4 +334,4 @@ if $data[0][5] != 304 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/tag_filter.sim

@@ -27,47 +27,47 @@ sql create table db.ctb6 using db.stb tags(6, "102")
 sql insert into db.ctb6 values(now, 6, "2")
 
 sql select * from db.stb where t1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
-sql select * from db.stb where t1 < 1 
-if $rows != 0 then 
+sql select * from db.stb where t1 < 1
+if $rows != 0 then
   return -=1
 endi
 
-sql select * from db.stb where t1 < 2 
-if $rows != 1 then 
+sql select * from db.stb where t1 < 2
+if $rows != 1 then
   return -1
 endi
 
-sql select * from db.stb where t1 <= 2 
-if $rows != 2 then 
+sql select * from db.stb where t1 <= 2
+if $rows != 2 then
   return -1
 endi
 
-sql select * from db.stb where t1 >= 1 
-if $rows != 6 then 
+sql select * from db.stb where t1 >= 1
+if $rows != 6 then
   return -1
 endi
 
-sql select * from db.stb where t1 > 1 
-if $rows != 5 then 
+sql select * from db.stb where t1 > 1
+if $rows != 5 then
   return -1
 endi
 
-sql select * from db.stb where t1 between 1 and 1 
-if $rows != 1 then 
+sql select * from db.stb where t1 between 1 and 1
+if $rows != 1 then
   return -1
 endi
 
-sql select * from db.stb where t1 between 1 and 6 
-if $rows != 6 then 
+sql select * from db.stb where t1 between 1 and 6
+if $rows != 6 then
   return -1
 endi
 
-sql select * from db.stb where t1 between 1 and 7 
-if $rows != 6 then 
+sql select * from db.stb where t1 between 1 and 7
+if $rows != 6 then
   return -1
 endi
 
@@ -88,25 +88,25 @@ sql insert into db.ctbBin2 values(now, 3, "2")
 sql create table db.ctbBin3 using db.stbBin tags("d")
 sql insert into db.ctbBin3 values(now, 4, "2")
 
-sql select * from db.stbBin where t1 = "a" 
-if $rows != 1 then 
+sql select * from db.stbBin where t1 = "a"
+if $rows != 1 then
   return -1
 endi
 
 
-sql select * from db.stbBin where t1 < "a" 
-if $rows != 0 then 
+sql select * from db.stbBin where t1 < "a"
+if $rows != 0 then
   return -=1
 endi
 
-sql select * from db.stbBin where t1 < "b" 
-if $rows != 1 then 
+sql select * from db.stbBin where t1 < "b"
+if $rows != 1 then
   return -1
 endi
 
 
-sql select * from db.stbBin where t1 between "a" and "e" 
-if $rows != 4 then 
+sql select * from db.stbBin where t1 between "a" and "e"
+if $rows != 4 then
   return -1
 endi
 
@@ -127,25 +127,25 @@ sql insert into db.ctbNc2 values(now, 3, "2")
 sql create table db.ctbNc3 using db.stbNc tags("d")
 sql insert into db.ctbNc3 values(now, 4, "2")
 
-sql select * from db.stbNc where t1 = "a" 
-if $rows != 1 then 
+sql select * from db.stbNc where t1 = "a"
+if $rows != 1 then
   return -1
 endi
 
 
-sql select * from db.stbNc where t1 < "a" 
-if $rows != 0 then 
+sql select * from db.stbNc where t1 < "a"
+if $rows != 0 then
   return -=1
 endi
 
-sql select * from db.stbNc where t1 < "b" 
-if $rows != 1 then 
+sql select * from db.stbNc where t1 < "b"
+if $rows != 1 then
   return -1
 endi
 
 
-sql select * from db.stbNc where t1 between "a" and "e" 
-if $rows != 4 then 
+sql select * from db.stbNc where t1 between "a" and "e"
+if $rows != 4 then
   return -1
 endi
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/tag_modify.sim

@@ -28,7 +28,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 1234 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -55,7 +55,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 1234 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -120,4 +120,4 @@ if $data[4][2] != 5 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stable/tag_rename.sim

@@ -28,7 +28,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 1234 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -52,7 +52,7 @@ if $data[0][1] != 1 then
 endi
 if $data[0][2] != 1234 then
   return -1
-endi  
+endi
 if $data[0][3] != 101 then
   return -1
 endi
@@ -117,4 +117,4 @@ if $data[4][2] != 4 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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

@@ -26,7 +26,7 @@ class TDTestCase:
                           % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
             intData.append(i + 1)
             floatData.append(i + 0.1)
-        for i in ['ts','col11','col12','col13']:
+        for i in ['col11','col12','col13']:
             for j in ['stb','stb_1']:
                 tdSql.error(f'select max({i} from {dbname}.{j} )')
 
@@ -37,6 +37,20 @@ class TDTestCase:
                     tdSql.checkData(0, 0, np.max(intData))
                 elif i>=9:
                     tdSql.checkData(0, 0, np.max(floatData))
+
+        tdSql.query(f"select max(now()) from {dbname}.stb_1")
+        tdSql.checkRows(1)
+
+        tdSql.query(f"select last(ts) from {dbname}.stb_1")
+        lastTs = tdSql.getData(0, 0)
+        tdSql.query(f"select max(ts) from {dbname}.stb_1")
+        tdSql.checkData(0, 0, lastTs)
+
+        tdSql.query(f"select last(ts) from {dbname}.stb")
+        lastTs = tdSql.getData(0, 0)
+        tdSql.query(f"select max(ts) from {dbname}.stb")
+        tdSql.checkData(0, 0, lastTs)
+
         tdSql.query(f"select max(col1) from {dbname}.stb_1 where col2<=5")
         tdSql.checkData(0,0,5)
         tdSql.query(f"select max(col1) from {dbname}.stb where col2<=5")
@@ -53,7 +67,7 @@ class TDTestCase:
                           % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
             intData.append(i + 1)
             floatData.append(i + 0.1)
-        for i in ['ts','col11','col12','col13']:
+        for i in ['col11','col12','col13']:
             for j in ['ntb']:
                 tdSql.error(f'select max({i} from {dbname}.{j} )')
         for i in range(1,11):
@@ -63,6 +77,15 @@ class TDTestCase:
                     tdSql.checkData(0, 0, np.max(intData))
                 elif i>=9:
                     tdSql.checkData(0, 0, np.max(floatData))
+
+        tdSql.query(f"select max(now()) from {dbname}.ntb")
+        tdSql.checkRows(1)
+
+        tdSql.query(f"select last(ts) from {dbname}.ntb")
+        lastTs = tdSql.getData(0, 0)
+        tdSql.query(f"select max(ts) from {dbname}.ntb")
+        tdSql.checkData(0, 0, lastTs)
+
         tdSql.query(f"select max(col1) from {dbname}.ntb where col2<=5")
         tdSql.checkData(0,0,5)
 

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

@@ -37,13 +37,11 @@ class TDTestCase:
             floatData.append(i + 0.1)
 
         # max verifacation
-        tdSql.error(f"select min(ts) from {dbname}.stb_1")
         tdSql.error(f"select min(col7) from {dbname}.stb_1")
         tdSql.error(f"select min(col8) from {dbname}.stb_1")
         tdSql.error(f"select min(col9) from {dbname}.stb_1")
         tdSql.error(f"select min(a) from {dbname}.stb_1")
         tdSql.query(f"select min(1) from {dbname}.stb_1")
-        tdSql.error(f"select min(now()) from {dbname}.stb_1")
         tdSql.error(f"select min(count(c1),count(c2)) from {dbname}.stb_1")
 
         tdSql.query(f"select min(col1) from {dbname}.stb_1")
@@ -69,14 +67,25 @@ class TDTestCase:
         tdSql.query(f"select min(col1) from {dbname}.stb_1 where col2>=5")
         tdSql.checkData(0,0,5)
 
+        tdSql.query(f"select min(now()) from {dbname}.stb_1")
+        tdSql.checkRows(1)
+
+        tdSql.query(f"select first(ts) from {dbname}.stb_1")
+        firstTs = tdSql.getData(0, 0)
+        tdSql.query(f"select min(ts) from {dbname}.stb_1")
+        tdSql.checkData(0, 0, firstTs)
+
+        tdSql.query(f"select first(ts) from {dbname}.stb_1")
+        firstTs = tdSql.getData(0, 0)
+        tdSql.query(f"select min(ts) from {dbname}.stb_1")
+        tdSql.checkData(0, 0, firstTs)
+
 
-        tdSql.error(f"select min(ts) from {dbname}.stb_1")
         tdSql.error(f"select min(col7) from {dbname}.stb_1")
         tdSql.error(f"select min(col8) from {dbname}.stb_1")
         tdSql.error(f"select min(col9) from {dbname}.stb_1")
         tdSql.error(f"select min(a) from {dbname}.stb_1")
         tdSql.query(f"select min(1) from {dbname}.stb_1")
-        tdSql.error(f"select min(now()) from {dbname}.stb_1")
         tdSql.error(f"select min(count(c1),count(c2)) from {dbname}.stb_1")
 
         tdSql.query(f"select min(col1) from {dbname}.stb")
@@ -102,13 +111,24 @@ class TDTestCase:
         tdSql.query(f"select min(col1) from {dbname}.stb where col2>=5")
         tdSql.checkData(0,0,5)
 
-        tdSql.error(f"select min(ts) from {dbname}.ntb")
+        tdSql.query(f"select min(now()) from {dbname}.stb_1")
+        tdSql.checkRows(1)
+
+        tdSql.query(f"select first(ts) from {dbname}.stb_1")
+        firstTs = tdSql.getData(0, 0)
+        tdSql.query(f"select min(ts) from {dbname}.stb_1")
+        tdSql.checkData(0, 0, firstTs)
+
+        tdSql.query(f"select first(ts) from {dbname}.stb_1")
+        firstTs = tdSql.getData(0, 0)
+        tdSql.query(f"select min(ts) from {dbname}.stb_1")
+        tdSql.checkData(0, 0, firstTs)
+
         tdSql.error(f"select min(col7) from {dbname}.ntb")
         tdSql.error(f"select min(col8) from {dbname}.ntb")
         tdSql.error(f"select min(col9) from {dbname}.ntb")
         tdSql.error(f"select min(a) from {dbname}.ntb")
         tdSql.query(f"select min(1) from {dbname}.ntb")
-        tdSql.error(f"select min(now()) from {dbname}.ntb")
         tdSql.error(f"select min(count(c1),count(c2)) from {dbname}.ntb")
 
         tdSql.query(f"select min(col1) from {dbname}.ntb")
@@ -134,6 +154,19 @@ class TDTestCase:
         tdSql.query(f"select min(col1) from {dbname}.ntb where col2>=5")
         tdSql.checkData(0,0,5)
 
+        tdSql.query(f"select min(now()) from {dbname}.stb_1")
+        tdSql.checkRows(1)
+
+        tdSql.query(f"select first(ts) from {dbname}.stb_1")
+        firstTs = tdSql.getData(0, 0)
+        tdSql.query(f"select min(ts) from {dbname}.stb_1")
+        tdSql.checkData(0, 0, firstTs)
+
+        tdSql.query(f"select first(ts) from {dbname}.stb_1")
+        firstTs = tdSql.getData(0, 0)
+        tdSql.query(f"select min(ts) from {dbname}.stb_1")
+        tdSql.checkData(0, 0, firstTs)
+
 
     def stop(self):
         tdSql.close()