Merge pull request #14973 from taosdata/szhou/feature/user-tags

fix: enable tag scan optimization when the scan cols is empty before adding ts col

include/libs/nodes/plannodes.h

@@ -78,6 +78,7 @@ typedef struct SScanLogicNode {
   SNodeList*    pGroupTags;
   bool          groupSort;
   int8_t        cacheLastMode;
+  bool          hasNormalCols; // neither tag column nor primary key tag column
 } SScanLogicNode;
 
 typedef struct SJoinLogicNode {

source/libs/planner/src/planLogicCreater.c

@@ -278,6 +278,10 @@ static int32_t createScanLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
 
   pScan->scanType = getScanType(pCxt, pScan->pScanPseudoCols, pScan->pScanCols, pScan->tableType);
 
+  if (NULL != pScan->pScanCols) {
+    pScan->hasNormalCols = true;
+  }
+
   if (TSDB_CODE_SUCCESS == code) {
     code = addPrimaryKeyCol(pScan->tableId, &pScan->pScanCols);
   }

source/libs/planner/src/planOptimizer.c

@@ -2113,7 +2113,7 @@ static bool tagScanMayBeOptimized(SLogicNode* pNode) {
     return false;
   }
   SScanLogicNode* pScan = (SScanLogicNode*)pNode;
-  if (NULL != pScan->pScanCols) {
+  if (pScan->hasNormalCols) {
     return false;
   }
   if (NULL == pNode->pParent || QUERY_NODE_LOGIC_PLAN_AGG != nodeType(pNode->pParent) ||