Merge branch 'main' into FIX/TD-21043-main

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG 11b60a4
+        GIT_TAG 4776778
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

include/libs/executor/executor.h

@@ -154,6 +154,8 @@ void qCleanExecTaskBlockBuf(qTaskInfo_t tinfo);
  */
 int32_t qAsyncKillTask(qTaskInfo_t tinfo, int32_t rspCode);
 
+bool qTaskIsExecuting(qTaskInfo_t qinfo);
+
 /**
  * destroy query info structure
  * @param qHandle

source/dnode/vnode/src/tsdb/tsdbMemTable.c

@@ -22,10 +22,10 @@
 #define SL_NODE_SIZE(l)               (sizeof(SMemSkipListNode) + ((l) << 4))
 #define SL_NODE_FORWARD(n, l)         ((n)->forwards[l])
 #define SL_NODE_BACKWARD(n, l)        ((n)->forwards[(n)->level + (l)])
-#define SL_GET_NODE_FORWARD(n, l)     ((SMemSkipListNode *)atomic_load_64((int64_t *)&SL_NODE_FORWARD(n, l)))
-#define SL_GET_NODE_BACKWARD(n, l)    ((SMemSkipListNode *)atomic_load_64((int64_t *)&SL_NODE_BACKWARD(n, l)))
-#define SL_SET_NODE_FORWARD(n, l, p)  atomic_store_64((int64_t *)&SL_NODE_FORWARD(n, l), (int64_t)(p))
-#define SL_SET_NODE_BACKWARD(n, l, p) atomic_store_64((int64_t *)&SL_NODE_BACKWARD(n, l), (int64_t)(p))
+#define SL_GET_NODE_FORWARD(n, l)     ((SMemSkipListNode *)atomic_load_ptr(&SL_NODE_FORWARD(n, l)))
+#define SL_GET_NODE_BACKWARD(n, l)    ((SMemSkipListNode *)atomic_load_ptr(&SL_NODE_BACKWARD(n, l)))
+#define SL_SET_NODE_FORWARD(n, l, p)  atomic_store_ptr(&SL_NODE_FORWARD(n, l), p)
+#define SL_SET_NODE_BACKWARD(n, l, p) atomic_store_ptr(&SL_NODE_BACKWARD(n, l), p)
 
 #define SL_MOVE_BACKWARD 0x1
 #define SL_MOVE_FROM_POS 0x2

source/libs/executor/src/executor.c

@@ -704,6 +704,15 @@ int32_t qAsyncKillTask(qTaskInfo_t qinfo, int32_t rspCode) {
   return TSDB_CODE_SUCCESS;
 }
 
+bool qTaskIsExecuting(qTaskInfo_t qinfo) {
+  SExecTaskInfo* pTaskInfo = (SExecTaskInfo*)qinfo;
+  if (NULL == pTaskInfo) {
+    return false;
+  }
+
+  return 0 != atomic_load_64(&pTaskInfo->owner);
+}
+
 static void printTaskExecCostInLog(SExecTaskInfo* pTaskInfo) {
   STaskCostInfo* pSummary = &pTaskInfo->cost;
   int64_t        idleTime = pSummary->start - pSummary->created;

source/libs/qworker/src/qworker.c

@@ -202,6 +202,15 @@ _return:
   QW_RET(code);
 }
 
+bool qwTaskNotInExec(SQWTaskCtx *ctx) {
+  qTaskInfo_t    taskHandle = ctx->taskHandle;
+  if (NULL == taskHandle || !qTaskIsExecuting(taskHandle)) {
+    return true;
+  }
+
+  return false;
+}
+
 int32_t qwGenerateSchHbRsp(SQWorker *mgmt, SQWSchStatus *sch, SQWHbInfo *hbInfo) {
   int32_t taskNum = 0;
 
@@ -508,8 +517,10 @@ int32_t qwHandlePostPhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *inp
   }
 
   if (QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP)) {
-    QW_ERR_JRET(qwDropTask(QW_FPARAMS()));
-    QW_ERR_JRET(ctx->rspCode);
+    if (QW_PHASE_POST_FETCH != phase || qwTaskNotInExec(ctx)) {
+      QW_ERR_JRET(qwDropTask(QW_FPARAMS()));
+      QW_ERR_JRET(ctx->rspCode);
+    }
   }
 
   if (ctx->rspCode) {

source/util/src/tcompare.c

@@ -23,6 +23,7 @@
 #include "thash.h"
 #include "tlog.h"
 #include "types.h"
+#include "osString.h"
 
 int32_t setChkInBytes1(const void *pLeft, const void *pRight) {
   return NULL != taosHashGet((SHashObj *)pRight, pLeft, 1) ? 1 : 0;
@@ -208,16 +209,16 @@ int32_t compareLenPrefixedWStr(const void *pLeft, const void *pRight) {
   int32_t len1 = varDataLen(pLeft);
   int32_t len2 = varDataLen(pRight);
 
-  if (len1 != len2) {
-    return len1 > len2 ? 1 : -1;
-  } else {
-    int32_t ret = memcmp((TdUcs4 *)pLeft, (TdUcs4 *)pRight, len1);
-    if (ret == 0) {
+  int32_t ret = tasoUcs4Compare((TdUcs4 *)varDataVal(pLeft), (TdUcs4 *)varDataVal(pRight), len1>len2 ? len2:len1);
+  if (ret == 0) {
+    if (len1 > len2)
+      return 1;
+    else if(len1 < len2)
+      return -1;
+    else
       return 0;
-    } else {
-      return ret > 0 ? 1 : -1;
-    }
   }
+  return (ret < 0) ? -1 : 1;
 }
 
 int32_t compareLenPrefixedWStrDesc(const void *pLeft, const void *pRight) {

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

@@ -408,8 +408,8 @@ class TDTestCase:
         # test group by & order by  json tag
         tdSql.query(f"select ts,jtag->'tag1' from {dbname}.jsons1 partition by jtag->'tag1' order by jtag->'tag1' desc")
         tdSql.checkRows(11)
-        tdSql.checkData(0, 1, '"femail"')
-        tdSql.checkData(2, 1, '"收到货"')
+        tdSql.checkData(0, 1, '"收到货"')
+        tdSql.checkData(2, 1, '"femail"')
         tdSql.checkData(7, 1, "false")
 
 
@@ -421,9 +421,10 @@ class TDTestCase:
         tdSql.query(f"select count(*),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag1' desc")
         tdSql.checkRows(8)
         tdSql.checkData(0, 0, 2)
-        tdSql.checkData(0, 1, '"femail"')
+        tdSql.checkData(0, 1, '"收到货"')
+        tdSql.checkData(1, 1, '"femail"')
         tdSql.checkData(1, 0, 2)
-        tdSql.checkData(1, 1, '"收到货"')
+        
         tdSql.checkData(2, 0, 1)
         tdSql.checkData(2, 1, "11.000000000")
         tdSql.checkData(5, 0, 1)
@@ -437,7 +438,7 @@ class TDTestCase:
         tdSql.checkData(5, 0, 1)
         tdSql.checkData(5, 1, "11.000000000")
         tdSql.checkData(7, 0, 2)
-        tdSql.checkData(7, 1, '"femail"')
+        tdSql.checkData(7, 1, '"收到货"')
 
         # test stddev with group by json tag
         tdSql.query(f"select stddev(dataint),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag1'")
@@ -445,8 +446,8 @@ class TDTestCase:
         tdSql.checkData(0, 1, None)
         tdSql.checkData(4, 0, 0)
         tdSql.checkData(4, 1, "5.000000000")
-        tdSql.checkData(7, 0, 11)
-        tdSql.checkData(7, 1, '"femail"')
+        tdSql.checkData(6, 0, 11)
+        tdSql.checkData(7, 1, '"收到货"')
 
         res = tdSql.getColNameList(f"select stddev(dataint),jsons1.jtag->'tag1' from {dbname}.jsons1 group by jsons1.jtag->'tag1' order by jtag->'tag1'")
         cname_list = []