[td-186] add select on tags support

src/client/inc/tsclient.h

@@ -102,7 +102,7 @@ typedef struct SColumnIndex {
 
 typedef struct SFieldSupInfo {
   bool            visible;
-  SArithExprInfo *pArithExprInfo;
+  SExprInfo      *pArithExprInfo;
   SSqlExpr *      pSqlExpr;
 } SFieldSupInfo;
 

src/client/src/tscSQLParser.c

@@ -1207,7 +1207,7 @@ int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSel
         SFieldSupInfo* pInfo = tscFieldInfoGetSupp(&pQueryInfo->fieldsInfo, slot);
         
         if (pInfo->pSqlExpr == NULL) {
-          SArithExprInfo* pFuncExpr = calloc(1, sizeof(SArithExprInfo));
+          SExprInfo* pFuncExpr = calloc(1, sizeof(SExprInfo));
           pInfo->pArithExprInfo = pFuncExpr;
           
           // arithmetic expression always return result in the format of double float

src/client/src/tscSql.c

@@ -437,7 +437,7 @@ int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
 
 static UNUSED_FUNC char *getArithemicInputSrc(void *param, const char *name, int32_t colId) {
 //  SArithmeticSupport *pSupport = (SArithmeticSupport *)param;
-//  SArithExprInfo *  pExpr = pSupport->pArithExpr;
+//  SExprInfo *  pExpr = pSupport->pArithExpr;
 
 //  int32_t index = -1;
 //  for (int32_t i = 0; i < pExpr->numOfCols; ++i) {

src/inc/taosmsg.h

@@ -380,13 +380,13 @@ typedef struct SSqlFuncMsg {
   } arg[3];
 } SSqlFuncMsg;
 
-typedef struct SArithExprInfo {
+typedef struct SExprInfo {
   SSqlFuncMsg base;
   struct tExprNode* pExpr;
   int16_t     bytes;
   int16_t     type;
   int16_t     interResBytes;
-} SArithExprInfo;
+} SExprInfo;
 
 typedef struct SColumnFilterInfo {
   int16_t lowerRelOptr;

src/inc/tsdb.h

@@ -97,8 +97,8 @@ int  tsdbTableSetName(STableCfg *config, char *name, bool dup);
 int  tsdbTableSetSName(STableCfg *config, char *sname, bool dup);
 void tsdbClearTableCfg(STableCfg *config);
 
-int32_t tsdbGetTableTagVal(TsdbRepoT *repo, STableId id, int32_t col, int16_t *type, int16_t *bytes, char **val);
-int32_t tsdbTableGetName(TsdbRepoT *repo, STableId id, char** name);
+int32_t tsdbGetTableTagVal(TsdbRepoT *repo, STableId* id, int32_t col, int16_t *type, int16_t *bytes, char **val);
+int32_t tsdbTableGetName(TsdbRepoT *repo, STableId* id, char** name);
 
 int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg);
 int tsdbDropTable(TsdbRepoT *pRepo, STableId tableId);
@@ -150,21 +150,12 @@ typedef struct STsdbQueryCond {
   SColumnInfo     *colList;
 } STsdbQueryCond;
 
-typedef struct SBlockInfo {
-  STimeWindow window;
-
-  int32_t numOfRows;
-  int32_t numOfCols;
-
-  STableId tableId;
-} SBlockInfo;
-
 typedef struct SDataBlockInfo {
   STimeWindow window;
   int32_t     rows;
   int32_t     numOfCols;
   int64_t     uid;
-  int32_t     sid;
+  int32_t     tid;
 } SDataBlockInfo;
 
 typedef struct {
@@ -279,7 +270,7 @@ SArray *tsdbGetTableList(TsdbQueryHandleT *pQueryHandle);
  * @param pTagCond. tag query condition
  *
  */
-int32_t tsdbQueryByTagsCond(
+int32_t tsdbQuerySTableByTagCond(
   TsdbRepoT *tsdb,
   int64_t uid,
   const char *pTagCond,

src/query/inc/queryExecutor.h

@@ -96,24 +96,20 @@ typedef struct SSingleColumnFilterInfo {
   void*              pData;
 } SSingleColumnFilterInfo;
 
-typedef struct STableQueryInfo {
-  int64_t     lastKey;
-  STimeWindow win;
+typedef struct STableQueryInfo {  // todo merge with the STableQueryInfo struct
+  int32_t     tableIndex;
+  int32_t     groupIdx;       // group id in table list
+  TSKEY       lastKey;
   int32_t     numOfRes;
   int16_t     queryRangeSet;  // denote if the query range is set, only available for interval query
   int64_t     tag;
+  STimeWindow win;
   STSCursor   cur;
-  int32_t     tid;  // for retrieve the page id list
-
+  STableId    id;             // for retrieve the page id list
+  
   SWindowResInfo windowResInfo;
 } STableQueryInfo;
 
-typedef struct STableDataInfo {  // todo merge with the STableQueryInfo struct
-  int32_t          tableIndex;
-  int32_t          groupIdx;  // group id in table list
-  STableQueryInfo* pTableQInfo;
-} STableDataInfo;
-
 typedef struct SQuery {
   int16_t           numOfCols;
   int16_t           numOfTags;
@@ -130,7 +126,7 @@ typedef struct SQuery {
   SLimitVal         limit;
   int32_t           rowSize;
   SSqlGroupbyExpr*  pGroupbyExpr;
-  SArithExprInfo*   pSelectExpr;
+  SExprInfo*        pSelectExpr;
   SColumnInfo*      colList;
   SColumnInfo*      tagColList;
   int32_t           numOfFilterCols;
@@ -170,14 +166,15 @@ typedef struct SQInfo {
   TSKEY            startTime;
   TSKEY            elapsedTime;
   int32_t          pointsInterpo;
-  int32_t          code;          // error code to returned to client
+  int32_t          code;              // error code to returned to client
   sem_t            dataReady;
   void*            tsdb;
   
-  STableGroupInfo  groupInfo;     // table id list
+  STableGroupInfo  tableIdGroupInfo;  // table id list < only includes the STableId list>
+  STableGroupInfo  groupInfo;         //
   SQueryRuntimeEnv runtimeEnv;
   int32_t          groupIndex;
-  int32_t          offset; /* offset in group result set of subgroup */
+  int32_t          offset;            // offset in group result set of subgroup, todo refactor
   
   T_REF_DECLARE()
   /*

src/query/inc/tsqlfunction.h

@@ -114,7 +114,7 @@ enum {
 #define QUERY_IS_FREE_RESOURCE(type) (((type)&TSDB_QUERY_TYPE_FREE_RESOURCE) != 0)
 
 typedef struct SArithmeticSupport {
-  SArithExprInfo   *pArithExpr;
+  SExprInfo   *pArithExpr;
   int32_t           numOfCols;
   SColumnInfo*      colList;
   int32_t           offset;

src/tsdb/src/tsdbMeta.c

@@ -225,9 +225,9 @@ STSchema * tsdbGetTableTagSchema(STsdbMeta *pMeta, STable *pTable) {
   }
 }
 
-int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId id, int32_t colId, int16_t* type, int16_t* bytes, char** val) {
+int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId* id, int32_t colId, int16_t* type, int16_t* bytes, char** val) {
   STsdbMeta* pMeta = tsdbGetMeta(repo);
-  STable* pTable = tsdbGetTableByUid(pMeta, id.uid);
+  STable* pTable = tsdbGetTableByUid(pMeta, id->uid);
   
   STSchema* pSchema = tsdbGetTableTagSchema(pMeta, pTable);
   
@@ -251,9 +251,9 @@ int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId id, int32_t colId, int16_t*
   return 0;
 }
 
-int32_t tsdbTableGetName(TsdbRepoT *repo, STableId id, char** name) {
+int32_t tsdbTableGetName(TsdbRepoT *repo, STableId* id, char** name) {
   STsdbMeta* pMeta = tsdbGetMeta(repo);
-  STable* pTable = tsdbGetTableByUid(pMeta, id.uid);
+  STable* pTable = tsdbGetTableByUid(pMeta, id->uid);
   
   *name = strndup(pTable->name, TSDB_TABLE_NAME_LEN);
   if (*name == NULL) {

src/tsdb/src/tsdbRead.c

@@ -62,13 +62,9 @@ typedef struct STableCheckInfo {
   STableId   tableId;
   TSKEY      lastKey;
   STable*    pTableObj;
-  int64_t    offsetInHeaderFile;
   int32_t    start;
-  bool       checkFirstFileBlock;
-  
   SCompInfo* pCompInfo;
   int32_t    compSize;
-  
   int32_t    numOfBlocks;  // number of qualified data blocks not the original blocks
 
   SDataCols*         pDataCols;
@@ -159,15 +155,15 @@ TsdbQueryHandleT* tsdbQueryTables(TsdbRepoT* tsdb, STsdbQueryCond* pCond, STable
     assert(gsize > 0);
     
     for (int32_t j = 0; j < gsize; ++j) {
-      SPair* d = (SPair*) taosArrayGet(group, j);
-      assert(d->first !=  NULL);
+      STableId* id = (STableId*) taosArrayGet(group, j);
       
       STableCheckInfo info = {
           .lastKey = pQueryHandle->window.skey,
-          .tableId = ((STable*) d->first)->tableId,
-          .pTableObj = d->first,
+          .tableId = *id,
+          .pTableObj = tsdbGetTableByUid(tsdbGetMeta(tsdb), id->uid),
       };
 
+      assert(info.pTableObj != NULL);
       taosArrayPush(pQueryHandle->pTableCheckInfo, &info);
     }
   }
@@ -357,7 +353,7 @@ static SDataBlockInfo getTrueDataBlockInfo(STableCheckInfo* pCheckInfo, SCompBlo
       .window = {.skey = pBlock->keyFirst, .ekey = pBlock->keyLast},
       .numOfCols = pBlock->numOfCols,
       .rows = pBlock->numOfPoints,
-      .sid = pCheckInfo->tableId.tid,
+      .tid = pCheckInfo->tableId.tid,
       .uid = pCheckInfo->tableId.uid,
   };
 
@@ -1058,7 +1054,7 @@ SDataBlockInfo tsdbRetrieveDataBlockInfo(TsdbQueryHandleT* pQueryHandle) {
 
   SDataBlockInfo blockInfo = {
       .uid = pTable->tableId.uid,
-      .sid = pTable->tableId.tid,
+      .tid = pTable->tableId.tid,
       .rows = rows,
       .window = {.skey = MIN(skey, ekey), .ekey = MAX(skey, ekey)}
   };
@@ -1293,24 +1289,19 @@ int32_t tableGroupComparFn(const void *p1, const void *p2, const void *param) {
 }
 
 void createTableGroupImpl(SArray* pGroups, STable** pTables, size_t numOfTables, STableGroupSupporter* pSupp, __ext_compar_fn_t compareFn) {
-  SArray* g = taosArrayInit(16, sizeof(SPair));
-  
-  SPair p = {.first = pTables[0]};
-  taosArrayPush(g, &p);
+  SArray* g = taosArrayInit(16, sizeof(STableId));
+  taosArrayPush(g, &pTables[0]->tableId);
   
   for (int32_t i = 1; i < numOfTables; ++i) {
     int32_t ret = compareFn(&pTables[i - 1], &pTables[i], pSupp);
     assert(ret == 0 || ret == -1);
     
     if (ret == 0) {
-      SPair p1 = {.first = pTables[i]};
-      taosArrayPush(g, &p1);
+      taosArrayPush(g, &pTables[i]->tableId);
     } else {
       taosArrayPush(pGroups, &g);  // current group is ended, start a new group
       g = taosArrayInit(16, POINTER_BYTES);
-  
-      SPair p1 = {.first = pTables[i]};
-      taosArrayPush(g, &p1);
+      taosArrayPush(g, &pTables[i]->tableId);
     }
   }
   
@@ -1329,11 +1320,10 @@ SArray* createTableGroup(SArray* pTableList, STSchema* pTagSchema, SColIndex* pC
   }
   
   if (numOfOrderCols == 0 || size == 1) { // no group by tags clause or only one table
-    SArray* sa = taosArrayInit(size, sizeof(SPair));
+    SArray* sa = taosArrayInit(size, sizeof(STableId));
     for(int32_t i = 0; i < size; ++i) {
       STable* pTable = taosArrayGetP(pTableList, i);
-      SPair p = {.first = pTable};
-      taosArrayPush(sa, &p);
+      taosArrayPush(sa, &pTable->tableId);
     }
     
     taosArrayPush(pTableGroup, &sa);
@@ -1441,24 +1431,15 @@ static int32_t doQueryTableList(STable* pSTable, SArray* pRes, tExprNode* pExpr)
 }
 
 
-int32_t tsdbQueryByTagsCond(
-  TsdbRepoT *tsdb,
-  int64_t uid,
-  const char *pTagCond,
-  size_t len,
-  int16_t tagNameRelType,
-  const char* tbnameCond,
-  STableGroupInfo *pGroupInfo,
-  SColIndex *pColIndex,
-  int32_t numOfCols
-) {
+int32_t tsdbQuerySTableByTagCond(TsdbRepoT *tsdb, int64_t uid, const char *pTagCond, size_t len, int16_t tagNameRelType,
+  const char* tbnameCond, STableGroupInfo *pGroupInfo, SColIndex *pColIndex, int32_t numOfCols) {
   STable* pSTable = tsdbGetTableByUid(tsdbGetMeta(tsdb), uid);
   if (pSTable == NULL) {
     uError("failed to get stable, uid:%" PRIu64, uid);
     return TSDB_CODE_INVALID_TABLE_ID;
   }
   
-  SArray* res = taosArrayInit(8, POINTER_BYTES);
+  SArray* res = taosArrayInit(8, sizeof(STableId));
   STSchema* pTagSchema = tsdbGetTableTagSchema(tsdbGetMeta(tsdb), pSTable);
   
   // no tags and tbname condition, all child tables of this stable are involved
@@ -1472,7 +1453,7 @@ int32_t tsdbQueryByTagsCond(
     return ret;
   }
 
-  int32_t    ret = TSDB_CODE_SUCCESS;
+  int32_t ret = TSDB_CODE_SUCCESS;
 
   tExprNode* expr = exprTreeFromTableName(tbnameCond);
   tExprNode* tagExpr = exprTreeFromBinary(pTagCond, len);
@@ -1507,9 +1488,9 @@ int32_t tsdbGetOneTableGroup(TsdbRepoT* tsdb, int64_t uid, STableGroupInfo* pGro
   pGroupInfo->numOfTables = 1;
   pGroupInfo->pGroupList = taosArrayInit(1, POINTER_BYTES);
   
-  SArray* group = taosArrayInit(1, POINTER_BYTES);
+  SArray* group = taosArrayInit(1, sizeof(STableId));
   
-  taosArrayPush(group, &pTable);
+  taosArrayPush(group, &pTable->tableId);
   taosArrayPush(pGroupInfo->pGroupList, &group);
   
   return TSDB_CODE_SUCCESS;

src/util/inc/tutil.h

@@ -107,11 +107,6 @@ extern "C" {
 
 #define POW2(x) ((x) * (x))
 
-typedef struct SPair {
-  void* first;
-  void* sec;
-} SPair;
-
 int32_t strdequote(char *src);
 
 void strtrim(char *src);