Merge pull request #14365 from taosdata/fix/TS-1601-V26

fix:  resolve arithmetic issues of first/last/last_row with keepColumnName enabled.

src/client/src/tscSQLParser.c

@@ -2685,7 +2685,8 @@ static int32_t setExprInfoForFunctions(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SS
   return TSDB_CODE_SUCCESS;
 }
 
-void setResultColName(char* name, tSqlExprItem* pItem, int32_t functionId, SStrToken* pToken, bool multiCols) {
+void setResultColName(char* name, bool finalResult, tSqlExprItem* pItem, int32_t functionId, SStrToken* pToken,
+                      bool multiCols) {
   if (pItem->aliasName != NULL) {
     tstrncpy(name, pItem->aliasName, TSDB_COL_NAME_LEN);
   } else {
@@ -2693,7 +2694,7 @@ void setResultColName(char* name, tSqlExprItem* pItem, int32_t functionId, SStrT
     int32_t len = MIN(pToken->n + 1, TSDB_COL_NAME_LEN);
     tstrncpy(uname, pToken->z, len);
 
-    if (tsKeepOriginalColumnName) { // keep the original column name
+    if (finalResult && tsKeepOriginalColumnName) {  // keep the original column name
       tstrncpy(name, uname, TSDB_COL_NAME_LEN);
     } else if (multiCols) {
       if (!TSDB_FUNC_IS_SCALAR(functionId)) {
@@ -3183,7 +3184,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
             for (int32_t j = 0; j < tscGetNumOfColumns(pTableMetaInfo->pTableMeta); ++j) {
               index.columnIndex = j;
               SStrToken t = {.z = pSchema[j].name, .n = (uint32_t)strnlen(pSchema[j].name, TSDB_COL_NAME_LEN)};
-              setResultColName(name, pItem, cvtFunc.originFuncId, &t, true);
+              setResultColName(name, finalResult, pItem, cvtFunc.originFuncId, &t, true);
 
               if (setExprInfoForFunctions(pCmd, pQueryInfo, &pSchema[j], cvtFunc, name, colIndex++, &index, finalResult,
                                           pUdfInfo) != 0) {
@@ -3212,7 +3213,8 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
             SSchema* pSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, index.columnIndex);
 
             bool multiColOutput = taosArrayGetSize(pItem->pNode->Expr.paramList) > 1;
-            setResultColName(name, pItem, cvtFunc.originFuncId, &pParamElem->pNode->columnName, multiColOutput);
+            setResultColName(name, finalResult, pItem, cvtFunc.originFuncId, &pParamElem->pNode->columnName,
+                             multiColOutput);
 
             if (setExprInfoForFunctions(pCmd, pQueryInfo, pSchema, cvtFunc, name, colIndex++, &index, finalResult,
                                         pUdfInfo) != 0) {
@@ -3238,7 +3240,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
 
             char      name[TSDB_COL_NAME_LEN] = {0};
             SStrToken t = {.z = pSchema[i].name, .n = (uint32_t)strnlen(pSchema[i].name, TSDB_COL_NAME_LEN)};
-            setResultColName(name, pItem, cvtFunc.originFuncId, &t, true);
+            setResultColName(name, finalResult, pItem, cvtFunc.originFuncId, &t, true);
 
             if (setExprInfoForFunctions(pCmd, pQueryInfo, &pSchema[index.columnIndex], cvtFunc, name, colIndex, &index,
                                         finalResult, pUdfInfo) != 0) {
@@ -10950,17 +10952,7 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
       *pExpr = calloc(1, sizeof(tExprNode));
       (*pExpr)->nodeType = TSQL_NODE_COL;
       (*pExpr)->pSchema = calloc(1, sizeof(SSchema));
-      if (tsKeepOriginalColumnName &&   // TD-14196, tsKeepOriginalColumnName params makes logic special
-          (pSqlExpr->functionId == TSDB_FUNC_FIRST ||
-           pSqlExpr->functionId == TSDB_FUNC_LAST ||
-           pSqlExpr->functionId == TSDB_FUNC_SPREAD ||
-           pSqlExpr->functionId == TSDB_FUNC_LAST_ROW ||
-           pSqlExpr->functionId == TSDB_FUNC_INTERP)) {
-        tSqlExprItem* pParamElem = taosArrayGet(pSqlExpr->Expr.paramList, 0);
-        strncpy((*pExpr)->pSchema->name, pParamElem->pNode->columnName.z, pParamElem->pNode->columnName.n);
-      }else{
       strncpy((*pExpr)->pSchema->name, pSqlExpr->exprToken.z, pSqlExpr->exprToken.n);
-      }
 
       // set the input column data byte and type.
       size_t size = taosArrayGetSize(pQueryInfo->exprList);

tests/pytest/functions/function_first.py

@@ -17,6 +17,7 @@ from util.log import *
 from util.cases import *
 from util.sql import *
 import numpy as np
+import re
 
 
 class TDTestCase:
@@ -143,6 +144,29 @@ class TDTestCase:
         tdSql.query("select first(*),last(*) from test1 where ts < 23 interval(1s)")
         tdSql.checkRows(0)
 
+        # TS-1601
+        tdSql.execute("create database test")
+        tdSql.execute("use test")
+        tdSql.execute("create table tb01(ts timestamp, c1 double, c2 int)")
+        tdSql.execute("insert into tb01 values(now, 2.3987401, 20)(now + 2s, 4.58123, 11)")
+        
+        r = os.popen("taos -s 'select first(c1) + last(c1) from test.tb01'")
+        text = r.read()
+        r.close()
+        result = float(re.split('\n |\|', text)[3])
+
+        tdSql.query("select first(c1) + last(c1) from tb01")
+        tdSql.checkData(0, 0, result)   
+
+        r = os.popen("taos -s 'select first(c1) - last(c1) from test.tb01'")
+        text = r.read()
+        r.close()
+        result = float(re.split('\n |\|', text)[3])
+        tdSql.query("select first(c1) - last(c1) from tb01")
+        tdSql.checkData(0, 0, result)
+
+                
+                
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/functions/function_last.py

@@ -127,6 +127,10 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, 9.1)
 
+        tdSql.query("select last(col6)/10 from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0.91)
+
         tdSql.query("select last(col7) from test1")
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, True)