Merge pull request #9418 from taosdata/fix/TD-12435

[TD-12435]<fix>(other):convert ` identifier if it is in sub query whe…

src/client/src/tscSQLParser.c

@@ -6090,7 +6090,7 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
 
 // todo error !!!!
 int32_t tsRewriteFieldNameIfNecessary(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
-  const char rep[] = {'(', ')', '*', ',', '.', '/', '\\', '+', '-', '%', ' '};
+  const char rep[] = {'(', ')', '*', ',', '.', '/', '\\', '+', '-', '%', ' ', '`'};
 
   for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
     char* fieldName = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i)->name;

src/util/src/tlosertree.c

@@ -96,7 +96,12 @@ void tLoserTreeAdjust(SLoserTreeInfo* pTree, int32_t idx) {
       return;
     }
 
-    int32_t ret = pTree->comparFn(pCur, &kLeaf, pTree->param);
+    /* there is a risk
+     * there should be  pTree->comparFn(&pCur->index, &kLeaf.index, pTree->param)
+     * but the first element in SLoserTreeNode is int32_t
+     * and the comparFn get data as *(int32_t*)(void *), so it is just ok.
+    */
+    int32_t ret = pTree->comparFn(&pCur, &kLeaf, pTree->param);
     if (ret < 0) {
       SLoserTreeNode t = pTree->pNode[parentId];
       pTree->pNode[parentId] = kLeaf;

tests/develop-test/0-others/TD-12435.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, db_test.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
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+import json
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1: [TD-12435] fix ` identifier in table column name if using create table as subquery
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("============== STEP 1 ===== prepare data & validate json string")
+        tdSql.execute("create table if not exists st(ts timestamp, dataInt int)")
+        tdSql.execute("create table st_from_sub as select avg(`dataInt`) from st interval(1m)")
+        tdSql.query("describe st_from_sub")
+        tdSql.checkData(1, 0, 'avg__dataInt__')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+

tests/develop-test/fulltest-others.sh

-python3 ./test.py -f 0-others/json_tag.py
\ No newline at end of file
+python3 ./test.py -f 0-others/json_tag.py
+python3 ./test.py -f 0-others/TD-12435.py
\ No newline at end of file