Merge branch 'develop' into feature/2.0tsdb

src/tsdb/src/tsdbMeta.c

@@ -225,18 +225,27 @@ STSchema * tsdbGetTableTagSchema(STsdbMeta *pMeta, STable *pTable) {
   }
 }
 
-int32_t tsdbGetTableTagVal(tsdb_repo_t* repo, STableId id, int32_t col, int16_t* type, int16_t* bytes, char** val) {
+int32_t tsdbGetTableTagVal(tsdb_repo_t* repo, STableId id, int32_t colId, int16_t* type, int16_t* bytes, char** val) {
   STsdbMeta* pMeta = tsdbGetMeta(repo);
   STable* pTable = tsdbGetTableByUid(pMeta, id.uid);
   
   STSchema* pSchema = tsdbGetTableTagSchema(pMeta, pTable);
-  STColumn* pCol = schemaColAt(pSchema, col);
+  
+  STColumn* pCol = NULL;
+  for(int32_t col = 0; col < schemaNCols(pSchema); ++col) {
+    STColumn* p = schemaColAt(pSchema, col);
+    if (p->colId == colId) {
+      pCol = p;
+    }
+  }
+  
+  assert(pCol != NULL);
   
   SDataRow row = (SDataRow)pTable->tagVal;
   char* d = dataRowAt(row, TD_DATA_ROW_HEAD_SIZE);
   
   *val = d;
-  *type = pCol->type;
+  *type  = pCol->type;
   *bytes = pCol->bytes;
   
   return 0;

src/tsdb/src/tsdbRead.c

@@ -98,31 +98,23 @@ typedef struct SBlockOrderSupporter {
 typedef struct STsdbQueryHandle {
   STsdbRepo*    pTsdb;
   SQueryFilePos cur;    // current position
-  SQueryFilePos start;  // the start position, used for secondary/third iteration
 
   SDataBlockLoadInfo dataBlockLoadInfo; /* record current block load information */
   SLoadCompBlockInfo compBlockLoadInfo; /* record current compblock information in SQuery */
 
-  int16_t     numOfRowsPerPage;
-  uint16_t    flag;  // denotes reversed scan of data or not
   int16_t     order;
   STimeWindow window;  // the primary query time window that applies to all queries
-  int32_t     blockBufferSize;
   SCompBlock* pBlock;
   int32_t     numOfBlocks;
   SField**    pFields;
   SArray*     pColumns;  // column list, SColumnInfoData array list
   bool        locateStart;
   int32_t     realNumOfRows;
-  bool        loadDataAfterSeek;  // load data after seek.
   SArray*     pTableCheckInfo;
   int32_t     activeIndex;
-
-  bool    checkFiles;  // check file stage
-  int32_t tableIndex;
-  bool    isFirstSlot;
-  void*   qinfo;  // query info handle, for debug purpose
-
+  bool        checkFiles;  // check file stage
+  void*       qinfo;  // query info handle, for debug purpose
+  
   STableBlockInfo* pDataBlockInfo;
 
   SFileGroup*    pFileGroup;
@@ -154,8 +146,6 @@ tsdb_query_handle_t* tsdbQueryTables(tsdb_repo_t* tsdb, STsdbQueryCond* pCond, S
   pQueryHandle->compIndex = calloc(10000, sizeof(SCompIdx));
   tsdbInitReadHelper(&pQueryHandle->rhelper, (STsdbRepo*) tsdb);
 
-  pQueryHandle->loadDataAfterSeek = false;
-  pQueryHandle->isFirstSlot = true;
   pQueryHandle->cur.fid = -1;
 
   size_t sizeOfGroup = taosArrayGetSize(groupList->pGroupList);