rowsize issue

src/query/src/qExecutor.c

@@ -6385,19 +6385,6 @@ SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SSqlGroupbyExpr* pGroupbyExpr
     }
   }
 
-  if (pSecExprs != NULL) {
-    // calculate the result row size
-    for (int16_t col = 0; col < pQuery->numOfExpr2; ++col) {
-      assert(pSecExprs[col].bytes > 0);
-      pQuery->resultRowSize += pSecExprs[col].bytes;
-
-      // keep the tag length
-      if (TSDB_COL_IS_TAG(pSecExprs[col].base.colInfo.flag)) {
-        pQuery->tagLen += pSecExprs[col].bytes;
-      }
-    }
-  } else {
-    // calculate the result row size
   for (int16_t col = 0; col < numOfOutput; ++col) {
     assert(pExprs[col].bytes > 0);
     pQuery->resultRowSize += pExprs[col].bytes;
@@ -6407,6 +6394,19 @@ SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SSqlGroupbyExpr* pGroupbyExpr
       pQuery->tagLen += pExprs[col].bytes;
     }
   }
+
+  if (pSecExprs != NULL) {
+    int32_t resultRowSize = 0;
+    
+    // calculate the result row size
+    for (int16_t col = 0; col < pQuery->numOfExpr2; ++col) {
+      assert(pSecExprs[col].bytes > 0);
+      resultRowSize += pSecExprs[col].bytes;
+    }
+
+    if (resultRowSize > pQuery->resultRowSize) {
+      pQuery->resultRowSize = resultRowSize;
+    }
   }
 
   doUpdateExprColumnIndex(pQuery);