Merge pull request #9868 from taosdata/fix/TD-12861-2.4

[TD-12861]<fix>(query): taoshell crash : coredump for such as "select first(c1)==max(c1) from st"

src/client/src/tscSQLParser.c

@@ -4665,6 +4665,8 @@ static int32_t validateSQLExprItemArithmeticExpr(SSqlCmd* pCmd, tSqlExpr* pExpr,
   const char* msg1 = "arithmetic expression composed with columns from different tables";
   const char* msg2 = "arithmetic expression composed with functions/columns of different types";
   const char* msg3 = "comparison/logical expression involving string operands is not supported";
+  const char* msg4 = "comparison/logical expression involving function result is not supported";
+
   int32_t leftHeight = 0;
   int32_t  ret = validateSQLExprItem(pCmd, pExpr->pLeft, pQueryInfo, pList, &leftType, &uidLeft, &leftHeight);
   if (ret != TSDB_CODE_SUCCESS) {
@@ -4707,6 +4709,10 @@ static int32_t validateSQLExprItemArithmeticExpr(SSqlCmd* pCmd, tSqlExpr* pExpr,
           (rightType == SQLEXPR_TYPE_VALUE && pExpr->pRight->tokenId == TK_STRING)) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
+      if (leftType == SQLEXPR_TYPE_AGG || leftType == SQLEXPR_TYPE_SCALAR ||
+          rightType == SQLEXPR_TYPE_AGG || rightType == SQLEXPR_TYPE_SCALAR) {
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
+      }
     }
   }
   return TSDB_CODE_SUCCESS;

src/query/src/qSqlParser.c

@@ -619,7 +619,7 @@ tSqlExpr *tSqlExprClone(tSqlExpr *pSrc) {
   tSqlExpr *pExpr = calloc(1, sizeof(tSqlExpr));
 
   memcpy(pExpr, pSrc, sizeof(*pSrc));
-  
+
   if (pSrc->pLeft) {
     pExpr->pLeft = tSqlExprClone(pSrc->pLeft);
   }
@@ -632,7 +632,7 @@ tSqlExpr *tSqlExprClone(tSqlExpr *pSrc) {
   tVariantAssign(&pExpr->value, &pSrc->value);
 
   //we don't clone paramList now because clone is only used for between/and
-  assert(pSrc->Expr.paramList == NULL);
+  pExpr->Expr.paramList = NULL;
   return pExpr;
 }
 

tests/develop-test/2-query/func_compare.py

+###################################################################
+#           Copyright (c) 2021 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1<Ganlin Zhao>: [TD-12861] : taoshell crash coredump for such as "select first(c1)==max(c1) from st"
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+
+    def run(self):
+        print("running {}".format(__file__))
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database if not exists db")
+        tdSql.execute('use db')
+
+        #Prepare data
+        tdSql.execute("create table tb (ts timestamp, value int);")
+        tdSql.execute("insert into tb values (now, 1);")
+        tdSql.execute("insert into tb values (now, 2);")
+        tdSql.execute("insert into tb values (now, 3);")
+        tdSql.execute("insert into tb values (now, 4);")
+
+        ##operator: =
+        tdSql.error('select count(*) = 4 from tb;')
+        tdSql.error('select avg(value) = 2.5 from tb')
+        tdSql.error('select twa(value) = 3.03 from tb')
+        tdSql.error('select sum(value) = 10 from tb')
+        tdSql.error('select stddev(value) = 2.0 from tb')
+        tdSql.error('select min(value) = 1 from tb')
+        tdSql.error('select max(value) = 4 from tb')
+        tdSql.error('select first(*) = 3 from tb')
+        tdSql.error('select last(*) = 3 from tb')
+        tdSql.error('select top(value, 3) = 3 from tb')
+        tdSql.error('select bottom(value, 3) = 3 from tb')
+        tdSql.error('select percentile(value, 50) = 3 from tb')
+        tdSql.error('select apercentile(value, 50) = 3 from tb')
+        tdSql.error('select last_row(*) = 3 from tb')
+        tdSql.error('select diff(value) = 3 from tb')
+        tdSql.error('select ceil(value) = 12 from tb')
+        tdSql.error('select floor(3.5) = 3 from tb')
+        tdSql.error('select round(3.5) = 3 from tb')
+
+        tdSql.error('select count(*) = max(value) from tb')
+        tdSql.error('select avg(value) = min(value) from tb')
+        tdSql.error('select first(value) = last(value) from tb')
+        tdSql.error('select round(value) = round(value) from tb')
+
+        ##operator: !=
+        tdSql.error('select count(*) != 4 from tb;')
+        tdSql.error('select avg(value) != 2.5 from tb')
+        tdSql.error('select twa(value) != 3.03 from tb')
+        tdSql.error('select sum(value) != 10 from tb')
+        tdSql.error('select stddev(value) != 2.0 from tb')
+        tdSql.error('select min(value) != 1 from tb')
+        tdSql.error('select max(value) != 4 from tb')
+        tdSql.error('select first(*) != 3 from tb')
+        tdSql.error('select last(*) != 3 from tb')
+        tdSql.error('select top(value, 3) != 3 from tb')
+        tdSql.error('select bottom(value, 3) != 3 from tb')
+        tdSql.error('select percentile(value, 50) != 3 from tb')
+        tdSql.error('select apercentile(value, 50) != 3 from tb')
+        tdSql.error('select last_row(*) != 3 from tb')
+        tdSql.error('select diff(value) != 3 from tb')
+        tdSql.error('select ceil(value) != 12 from tb')
+        tdSql.error('select floor(3.5) != 3 from tb')
+        tdSql.error('select round(3.5) != 3 from tb')
+
+        tdSql.error('select count(*) != max(value) from tb')
+        tdSql.error('select avg(value) != min(value) from tb')
+        tdSql.error('select first(value) != last(value) from tb')
+        tdSql.error('select round(value) != round(value) from tb')
+
+        ##operator: <>
+        tdSql.error('select count(*) <> 4 from tb;')
+        tdSql.error('select avg(value) <> 2.5 from tb')
+        tdSql.error('select twa(value) <> 3.03 from tb')
+        tdSql.error('select sum(value) <> 10 from tb')
+        tdSql.error('select stddev(value) <> 2.0 from tb')
+        tdSql.error('select min(value) <> 1 from tb')
+        tdSql.error('select max(value) <> 4 from tb')
+        tdSql.error('select first(*) <> 3 from tb')
+        tdSql.error('select last(*) <> 3 from tb')
+        tdSql.error('select top(value, 3) <> 3 from tb')
+        tdSql.error('select bottom(value, 3) <> 3 from tb')
+        tdSql.error('select percentile(value, 50) <> 3 from tb')
+        tdSql.error('select apercentile(value, 50) <> 3 from tb')
+        tdSql.error('select last_row(*) <> 3 from tb')
+        tdSql.error('select diff(value) <> 3 from tb')
+        tdSql.error('select ceil(value) <> 12 from tb')
+        tdSql.error('select floor(3.5) <> 3 from tb')
+        tdSql.error('select round(3.5) <> 3 from tb')
+
+        tdSql.error('select count(*) <> max(value) from tb')
+        tdSql.error('select avg(value) <> min(value) from tb')
+        tdSql.error('select first(value) <> last(value) from tb')
+        tdSql.error('select round(value) <> round(value) from tb')
+
+        ##operator: <
+        tdSql.error('select count(*) < 4 from tb;')
+        tdSql.error('select avg(value) < 2.5 from tb')
+        tdSql.error('select twa(value) < 3.03 from tb')
+        tdSql.error('select sum(value) < 10 from tb')
+        tdSql.error('select stddev(value) < 2.0 from tb')
+        tdSql.error('select min(value) < 1 from tb')
+        tdSql.error('select max(value) < 4 from tb')
+        tdSql.error('select first(*) < 3 from tb')
+        tdSql.error('select last(*) < 3 from tb')
+        tdSql.error('select top(value, 3) < 3 from tb')
+        tdSql.error('select bottom(value, 3) < 3 from tb')
+        tdSql.error('select percentile(value, 50) < 3 from tb')
+        tdSql.error('select apercentile(value, 50) < 3 from tb')
+        tdSql.error('select last_row(*) < 3 from tb')
+        tdSql.error('select diff(value) < 3 from tb')
+        tdSql.error('select ceil(value) < 12 from tb')
+        tdSql.error('select floor(3.5) < 3 from tb')
+        tdSql.error('select round(3.5) < 3 from tb')
+
+        tdSql.error('select count(*) < max(value) from tb')
+        tdSql.error('select avg(value) < min(value) from tb')
+        tdSql.error('select first(value) < last(value) from tb')
+        tdSql.error('select round(value) < round(value) from tb')
+
+        ##operator: >
+        tdSql.error('select count(*) > 4 from tb;')
+        tdSql.error('select avg(value) > 2.5 from tb')
+        tdSql.error('select twa(value) > 3.03 from tb')
+        tdSql.error('select sum(value) > 10 from tb')
+        tdSql.error('select stddev(value) > 2.0 from tb')
+        tdSql.error('select min(value) > 1 from tb')
+        tdSql.error('select max(value) > 4 from tb')
+        tdSql.error('select first(*) > 3 from tb')
+        tdSql.error('select last(*) > 3 from tb')
+        tdSql.error('select top(value, 3) > 3 from tb')
+        tdSql.error('select bottom(value, 3) > 3 from tb')
+        tdSql.error('select percentile(value, 50) > 3 from tb')
+        tdSql.error('select apercentile(value, 50) > 3 from tb')
+        tdSql.error('select last_row(*) > 3 from tb')
+        tdSql.error('select diff(value) > 3 from tb')
+        tdSql.error('select ceil(value) > 12 from tb')
+        tdSql.error('select floor(3.5) > 3 from tb')
+        tdSql.error('select round(3.5) > 3 from tb')
+
+        tdSql.error('select count(*) > max(value) from tb')
+        tdSql.error('select avg(value) > min(value) from tb')
+        tdSql.error('select first(value) > last(value) from tb')
+        tdSql.error('select round(value) > round(value) from tb')
+
+        ##operator: <=
+        tdSql.error('select count(*) <= 4 from tb;')
+        tdSql.error('select avg(value) <= 2.5 from tb')
+        tdSql.error('select twa(value) <= 3.03 from tb')
+        tdSql.error('select sum(value) <= 10 from tb')
+        tdSql.error('select stddev(value) <= 2.0 from tb')
+        tdSql.error('select min(value) <= 1 from tb')
+        tdSql.error('select max(value) <= 4 from tb')
+        tdSql.error('select first(*) <= 3 from tb')
+        tdSql.error('select last(*) <= 3 from tb')
+        tdSql.error('select top(value, 3) <= 3 from tb')
+        tdSql.error('select bottom(value, 3) <= 3 from tb')
+        tdSql.error('select percentile(value, 50) <= 3 from tb')
+        tdSql.error('select apercentile(value, 50) <= 3 from tb')
+        tdSql.error('select last_row(*) <= 3 from tb')
+        tdSql.error('select diff(value) <= 3 from tb')
+        tdSql.error('select ceil(value) <= 12 from tb')
+        tdSql.error('select floor(3.5) <= 3 from tb')
+        tdSql.error('select round(3.5) <= 3 from tb')
+
+        tdSql.error('select count(*) <= max(value) from tb')
+        tdSql.error('select avg(value) <= min(value) from tb')
+        tdSql.error('select first(value) <= last(value) from tb')
+        tdSql.error('select round(value) <= round(value) from tb')
+
+        ##operator: >=
+        tdSql.error('select count(*) >= 4 from tb;')
+        tdSql.error('select avg(value) >= 2.5 from tb')
+        tdSql.error('select twa(value) >= 3.03 from tb')
+        tdSql.error('select sum(value) >= 10 from tb')
+        tdSql.error('select stddev(value) >= 2.0 from tb')
+        tdSql.error('select min(value) >= 1 from tb')
+        tdSql.error('select max(value) >= 4 from tb')
+        tdSql.error('select first(*) >= 3 from tb')
+        tdSql.error('select last(*) >= 3 from tb')
+        tdSql.error('select top(value, 3) >= 3 from tb')
+        tdSql.error('select bottom(value, 3) >= 3 from tb')
+        tdSql.error('select percentile(value, 50) >= 3 from tb')
+        tdSql.error('select apercentile(value, 50) >= 3 from tb')
+        tdSql.error('select last_row(*) >= 3 from tb')
+        tdSql.error('select diff(value) >= 3 from tb')
+        tdSql.error('select ceil(value) >= 12 from tb')
+        tdSql.error('select floor(3.5) >= 3 from tb')
+        tdSql.error('select round(3.5) >= 3 from tb')
+
+        tdSql.error('select count(*) >= max(value) from tb')
+        tdSql.error('select avg(value) >= min(value) from tb')
+        tdSql.error('select first(value) >= last(value) from tb')
+        tdSql.error('select round(value) >= round(value) from tb')
+
+        ##operator: between and
+        tdSql.error('select count(*) between 3 and 4 from tb;')
+        tdSql.error('select avg(value) between 1.5 and 2.5 from tb')
+        tdSql.error('select twa(value) between 3.0 and 3.03 from tb')
+        tdSql.error('select sum(value) between 1 and 10 from tb')
+        tdSql.error('select stddev(value) between 1 and 2.0 from tb')
+        tdSql.error('select min(value) between 2 and 5 from tb')
+        tdSql.error('select max(value) between 1 and 10 from tb')
+        tdSql.error('select first(*) between 1 and 3 from tb')
+        tdSql.error('select last(*) between 0 and 3 from tb')
+        tdSql.error('select top(value, 3) between 0.0 and 3 from tb')
+        tdSql.error('select bottom(value, 3) between 0.0 and 3 from tb')
+        tdSql.error('select percentile(value, 50) between 1 and 3 from tb')
+        tdSql.error('select apercentile(value, 50) between 2 and 3 from tb')
+        tdSql.error('select last_row(*) between 2 and 3 from tb')
+        tdSql.error('select diff(value) between 1 and 3 from tb')
+        tdSql.error('select ceil(value) between 5 and 12 from tb')
+        tdSql.error('select floor(3.5) between 12 and 3 from tb')
+        tdSql.error('select round(3.5) between true and 3 from tb')
+
+        tdSql.error('select count(*) between min(value) and max(value) from tb')
+        tdSql.error('select avg(*) between min(value) and 3 from tb')
+        tdSql.error('select avg(value) between 1 and max(value) from tb')
+        tdSql.error('select first(value) between first(value) and last(value) from tb')
+        tdSql.error('select round(value) between ceil(value) and floor(value) from tb')
+
+        ##operator: and
+        tdSql.error('select count(*) and 1 from tb;')
+        tdSql.error('select avg(value) and 0.0 from tb')
+        tdSql.error('select twa(value) and true from tb')
+        tdSql.error('select sum(value) and false from tb')
+        tdSql.error('select 1 and stddev(value) from tb')
+        tdSql.error('select 0.0 and min(value) from tb')
+        tdSql.error('select true and max(value) from tb')
+        tdSql.error('select false and first(*) from tb')
+        tdSql.error('select last(*) and first(value) from tb')
+        tdSql.error('select top(value, 3) and bottom(value, 3) from tb')
+        tdSql.error('select percentile(value, 50) and apercentile(value, 50) from tb')
+        tdSql.error('select diff(value) and ceil(value) from tb')
+        tdSql.error('select floor(3.5) and round(3.5) and ceil(3.5) from tb')
+        tdSql.error('select true and round(3.5) and 3 from tb')
+
+        ##operator: or
+        tdSql.error('select count(*) or 1 from tb;')
+        tdSql.error('select avg(value) or 0.0 from tb')
+        tdSql.error('select twa(value) or true from tb')
+        tdSql.error('select sum(value) or false from tb')
+        tdSql.error('select 1 or stddev(value) from tb')
+        tdSql.error('select 0.0 or min(value) from tb')
+        tdSql.error('select true or max(value) from tb')
+        tdSql.error('select false or first(*) from tb')
+        tdSql.error('select last(*) or first(value) from tb')
+        tdSql.error('select top(value, 3) or bottom(value, 3) from tb')
+        tdSql.error('select percentile(value, 50) or apercentile(value, 50) from tb')
+        tdSql.error('select diff(value) or ceil(value) from tb')
+        tdSql.error('select floor(3.5) or round(3.5) or ceil(3.5) from tb')
+        tdSql.error('select true or round(3.5) or 3 from tb')
+
+        ##operator: multiple operations
+        tdSql.error('select count(*) <> avg(value) or twa(value) and sum(value) or 1 from tb;')
+        tdSql.error('select 1 and stddev(value) <= min(value) or max(value) and first(*) or 0.0 from tb')
+        tdSql.error('select last(*) and first(value) or top(value, 3) and 3 between 4.0 and bottom(value, 3)from tb')
+        tdSql.error('select percentile(value, 50) or diff(value) = ceil(value) and apercentile(value, 50) from tb')
+        tdSql.error('select floor(3.5) or round(3.5) and ceil(3.5) > true and round(3.5) or 3 from tb')
+
+        tdSql.execute('drop database db')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/develop-test/fulltest-query.sh

@@ -6,3 +6,4 @@ python3 ./test.py -f 2-query/constant_compare.py
 python3 ./test.py -f 2-query/ts_2016.py
 python3 ./test.py -f 2-query/escape.py
 python3 ./test.py -f 2-query/function_mavg.py
+python3 ./test.py -f 2-query/func_compare.py