Merge pull request #7661 from taosdata/hotfix/TD-6418

[td-6418]fix DERIVATIVE order by tag crash issue

Merge pull request #7661 from taosdata/hotfix/TD-6418
[td-6418]fix DERIVATIVE order by tag crash issue
ca2a9fb3 · dapan1121 · GitHub · 96125eae · 1cb7ae38 · ca2a9fb3
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

src/query/src/qExecutor.c src/query/src/qExecutor.c +1 -1

未找到文件。
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5313,7 +5313,7 @@ SArray* getResultGroupCheckColumns(SQueryAttr* pQuery) {

      // TSDB_FUNC_TAG_DUMMY function needs to be ignored
      if (index->colId == pExpr->colInfo.colId &&
-          ((TSDB_COL_IS_TAG(pExpr->colInfo.flag) && pExpr->functionId == TSDB_FUNC_TAG) ||
+          ((TSDB_COL_IS_TAG(pExpr->colInfo.flag) && ((pExpr->functionId == TSDB_FUNC_TAG) || (pExpr->functionId == TSDB_FUNC_TAGPRJ))) ||
           (TSDB_COL_IS_NORMAL_COL(pExpr->colInfo.flag) && pExpr->functionId == TSDB_FUNC_PRJ))) {
        index->colIndex = j;
        index->colId = pExpr->resColId;