Merge pull request #4002 from taosdata/feature/query

Feature/query

src/client/src/tscSubquery.c

@@ -219,6 +219,11 @@ static void tscDestroyJoinSupporter(SJoinSupporter* pSupporter) {
     pSupporter->f = NULL;
   }
 
+  if (pSupporter->pVgroupTables != NULL) {
+    taosArrayDestroy(pSupporter->pVgroupTables);
+    pSupporter->pVgroupTables = NULL;
+  }
+
   taosTFree(pSupporter->pIdTagList);
   tscTagCondRelease(&pSupporter->tagCond);
   free(pSupporter);
@@ -327,6 +332,7 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
   
     STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pNewQueryInfo, 0);
     pTableMetaInfo->pVgroupTables = pSupporter->pVgroupTables;
+    pSupporter->pVgroupTables = NULL;
 
     /*
      * When handling the projection query, the offset value will be modified for table-table join, which is changed
@@ -359,7 +365,7 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
       int16_t colId = tscGetJoinTagColIdByUid(&pQueryInfo->tagCond, pTableMetaInfo->pTableMeta->id.uid);
 
       // set the tag column id for executor to extract correct tag value
-      pExpr->param[0].i64Key = colId;
+      pExpr->param[0] = (tVariant) {.i64Key = colId, .nType = TSDB_DATA_TYPE_BIGINT, .nLen = sizeof(int64_t)};
       pExpr->numOfParams = 1;
     }
 
@@ -388,25 +394,6 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
 
       assert(taosArrayGetSize(pTableMetaInfo->pVgroupTables) > 0);
       TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
-    } else { // TODO remove unnecessarily accessed vnode
-//      pTableMetaInfo->vgroupList->
-//      for(int32_t k = 0; k < taosArrayGetSize(pTableMetaInfo->pVgroupTables);) {
-//        SVgroupTableInfo* p = taosArrayGet(pTableMetaInfo->pVgroupTables, k);
-//
-//        bool found = false;
-//        for(int32_t f = 0; f < num; ++f) {
-//          if (p->vgInfo.vgId == list[f]) {
-//            found = true;
-//            break;
-//          }
-//        }
-//
-//        if (!found) {
-//          tscRemoveVgroupTableGroup(pTableMetaInfo->pVgroupTables, k);
-//        } else {
-//          k++;
-//        }
-//      }
     }
 
     taosTFree(list);
@@ -1023,15 +1010,28 @@ void tscFetchDatablockFromSubquery(SSqlObj* pSql) {
 
   // If at least one subquery is completed in current vnode, try the next vnode in case of multi-vnode
   // super table projection query.
-  if (numOfFetch <= 0 && !reachLimit) {
+  if (reachLimit) {
+    pSql->res.completed = true;
+    freeJoinSubqueryObj(pSql);
+
+    if (pSql->res.code == TSDB_CODE_SUCCESS) {
+      (*pSql->fp)(pSql->param, pSql, 0);
+    } else {
+      tscQueueAsyncRes(pSql);
+    }
+
+    return;
+  }
+
+  if (numOfFetch <= 0) {
     bool tryNextVnode = false;
 
-    SSqlObj* pp = pSql->pSubs[0];
+    SSqlObj*    pp = pSql->pSubs[0];
     SQueryInfo* pi = tscGetQueryInfoDetail(&pp->cmd, 0);
 
     // get the number of subquery that need to retrieve the next vnode.
     if (tscNonOrderedProjectionQueryOnSTable(pi, 0)) {
-      for(int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
+      for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
         SSqlObj* pSub = pSql->pSubs[i];
         if (pSub != NULL && pSub->res.row >= pSub->res.numOfRows && pSub->res.completed) {
           pSql->subState.numOfRemain++;
@@ -1047,7 +1047,8 @@ void tscFetchDatablockFromSubquery(SSqlObj* pSql) {
 
       SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSub->cmd, 0);
 
-      if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && pSub->res.row >= pSub->res.numOfRows && pSub->res.completed) {
+      if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && pSub->res.row >= pSub->res.numOfRows &&
+          pSub->res.completed) {
         STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
         assert(pQueryInfo->numOfTables == 1);
 
@@ -1085,7 +1086,7 @@ void tscFetchDatablockFromSubquery(SSqlObj* pSql) {
     } else {
       tscQueueAsyncRes(pSql);
     }
-    
+
     return;
   }
 

src/mnode/src/mnodeProfile.c

@@ -182,7 +182,7 @@ static int32_t mnodeGetConnsMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
   // app name
   pShow->bytes[cols] = TSDB_APPNAME_LEN + VARSTR_HEADER_SIZE;
   pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "app_name");
+  strcpy(pSchema[cols].name, "program");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 

src/query/src/qExecutor.c

@@ -2631,17 +2631,19 @@ void setTagVal(SQueryRuntimeEnv *pRuntimeEnv, void *pTable, void *tsdb) {
         pFuncMsg->colInfo.colIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
       assert(pFuncMsg->numOfParams == 1);
 
-      int16_t tagColId = (int16_t)pExprInfo->base.arg->argValue.i64;
-      SColumnInfo* pColInfo = doGetTagColumnInfoById(pQuery->tagColList, pQuery->numOfTags, tagColId);
+      int16_t      tagColId = (int16_t)pExprInfo->base.arg->argValue.i64;
+      SColumnInfo *pColInfo = doGetTagColumnInfoById(pQuery->tagColList, pQuery->numOfTags, tagColId);
 
       doSetTagValueInParam(tsdb, pTable, tagColId, &pRuntimeEnv->pCtx[0].tag, pColInfo->type, pColInfo->bytes);
 
-    if (pRuntimeEnv->pCtx[0].tag.nType == TSDB_DATA_TYPE_BINARY || pRuntimeEnv->pCtx[0].tag.nType == TSDB_DATA_TYPE_NCHAR) {}
-      qDebug("QInfo:%p set tag value for join comparison, colId:%" PRId64 ", val:%s", pQInfo, pExprInfo->base.arg->argValue.i64,
-             pRuntimeEnv->pCtx[0].tag.pz);
-    } else {
-      qDebug("QInfo:%p set tag value for join comparison, colId:%" PRId64 ", val:%"PRId64, pQInfo, pExprInfo->base.arg->argValue.i64,
-          pRuntimeEnv->pCtx[0].tag.i64Key);
+      int16_t tagType = pRuntimeEnv->pCtx[0].tag.nType;
+      if (tagType == TSDB_DATA_TYPE_BINARY || tagType == TSDB_DATA_TYPE_NCHAR) {
+        qDebug("QInfo:%p set tag value for join comparison, colId:%" PRId64 ", val:%s", pQInfo,
+               pExprInfo->base.arg->argValue.i64, pRuntimeEnv->pCtx[0].tag.pz);
+      } else {
+        qDebug("QInfo:%p set tag value for join comparison, colId:%" PRId64 ", val:%" PRId64, pQInfo,
+               pExprInfo->base.arg->argValue.i64, pRuntimeEnv->pCtx[0].tag.i64Key);
+      }
     }
   }
 }

tests/script/general/parser/groupby.sim

@@ -27,7 +27,7 @@ $mt = $mtPrefix . $i
 
 $tstart = 100000
 
-sql drop database if exits $db -x step1
+sql drop database if exists $db -x step1
 step1:
 sql create database if not exists $db keep 36500
 sql use $db

tests/script/general/parser/join.sim

@@ -24,7 +24,7 @@ $mt = $mtPrefix . $i
 
 $tstart = 100000
 
-sql drop database if exits $db -x step1
+sql drop database if exists $db -x step1
 step1:
 sql create database if not exists $db keep 36500
 sql use $db

tests/script/general/parser/join_multivnode.sim

@@ -22,7 +22,7 @@ $mt = $mtPrefix . $i
 
 $tstart = 100000
 
-sql drop database if exits $db -x step1
+sql drop database if exists $db -x step1
 step1:
 sql create database if not exists $db keep 36500
 sql use $db

tests/script/general/parser/projection_limit_offset.sim

@@ -21,7 +21,7 @@ $mt = $mtPrefix . $i
 
 $tstart = 100000
 
-sql drop database if exits $db -x step1
+sql drop database if exists $db -x step1
 step1:
 sql create database if not exists $db keep 36500
 sql use $db

tests/script/general/parser/sliding.sim

@@ -26,7 +26,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql drop database if exits $db -x step1
+sql drop database if exists $db -x step1
 step1:
 sql create database if not exists $db maxtables 4 keep 36500
 sql use $db

tests/script/general/parser/testSuite.sim

-sleep 2000
-run general/parser/alter.sim
-sleep 2000
-run general/parser/alter1.sim
-sleep 2000
-run general/parser/alter_stable.sim
-sleep 2000
-run general/parser/auto_create_tb.sim
-sleep 2000
-run general/parser/auto_create_tb_drop_tb.sim
-sleep 2000
-run general/parser/col_arithmetic_operation.sim
-sleep 2000
-run general/parser/columnValue.sim
-sleep 2000
-run general/parser/commit.sim
-sleep 2000
-run general/parser/create_db.sim
-sleep 2000
-run general/parser/create_mt.sim
-sleep 2000
-run general/parser/create_tb.sim
-sleep 2000
-run general/parser/dbtbnameValidate.sim
-sleep 2000
-run general/parser/fill.sim
-sleep 2000
-run general/parser/fill_stb.sim
-sleep 2000
-#run general/parser/fill_us.sim               #
-sleep 2000
-run general/parser/first_last.sim
-sleep 2000
-run general/parser/import_commit1.sim
-sleep 2000
-run general/parser/import_commit2.sim
-sleep 2000
-run general/parser/import_commit3.sim
-sleep 2000
-#run general/parser/import_file.sim
-sleep 2000
-run general/parser/insert_tb.sim
-sleep 2000
-run general/parser/tags_dynamically_specifiy.sim
-sleep 2000
-run general/parser/interp.sim
-sleep 2000
-run general/parser/lastrow.sim
+#sleep 2000
+#run general/parser/alter.sim
+#sleep 2000
+#run general/parser/alter1.sim
+#sleep 2000
+#run general/parser/alter_stable.sim
+#sleep 2000
+#run general/parser/auto_create_tb.sim
+#sleep 2000
+#run general/parser/auto_create_tb_drop_tb.sim
+#sleep 2000
+#run general/parser/col_arithmetic_operation.sim
+#sleep 2000
+#run general/parser/columnValue.sim
+#sleep 2000
+#run general/parser/commit.sim
+#sleep 2000
+#run general/parser/create_db.sim
+#sleep 2000
+#run general/parser/create_mt.sim
+#sleep 2000
+#run general/parser/create_tb.sim
+#sleep 2000
+#run general/parser/dbtbnameValidate.sim
+#sleep 2000
+#run general/parser/fill.sim
+#sleep 2000
+#run general/parser/fill_stb.sim
+#sleep 2000
+##run general/parser/fill_us.sim               #
+#sleep 2000
+#run general/parser/first_last.sim
+#sleep 2000
+#run general/parser/import_commit1.sim
+#sleep 2000
+#run general/parser/import_commit2.sim
+#sleep 2000
+#run general/parser/import_commit3.sim
+#sleep 2000
+##run general/parser/import_file.sim
+#sleep 2000
+#run general/parser/insert_tb.sim
+#sleep 2000
+#run general/parser/tags_dynamically_specifiy.sim
+#sleep 2000
+#run general/parser/interp.sim
+#sleep 2000
+#run general/parser/lastrow.sim
 sleep 2000
 run general/parser/limit.sim
 sleep 2000

tests/script/general/parser/union.sim

@@ -27,7 +27,7 @@ $j = 1
 
 $mt1 = $mtPrefix . $j
 
-sql drop database if exits $db -x step1
+sql drop database if exists $db -x step1
 step1:
 sql create database if not exists $db
 sql use $db

tests/script/general/parser/where.sim

@@ -20,7 +20,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql drop database if exits $db -x step1
+sql drop database if exists $db -x step1
 step1:
 sql create database if not exists $db 
 sql use $db