Merge pull request #1474 from taosdata/feature/2.0tsdb

TD-34

cmake/platform.inc

@@ -107,9 +107,9 @@ IF (TD_LINUX_64)
     SET(RELEASE_FLAGS "-O0")
     IF (NOT TD_ARM)
       IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
       ELSE ()
-        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g3 -gdwarf-2 -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
       ENDIF ()
     ELSE ()
       SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")

src/util/src/tskiplist.c

@@ -597,11 +597,16 @@ bool tSkipListIterNext(SSkipListIterator *iter) {
     pthread_rwlock_unlock(pSkipList->lock);
   }
   
-  return iter->cur != NULL;
+  return iter->cur != pSkipList->pTail;
 }
 
-SSkipListNode *tSkipListIterGet(SSkipListIterator *iter) { return (iter == NULL)? NULL:iter->cur; }
-
+SSkipListNode *tSkipListIterGet(SSkipListIterator *iter) { 
+  if (iter == NULL || iter->cur == iter->pSkipList->pTail) {
+     return NULL;
+  } else {
+    return iter->cur;
+  }
+}
 void* tSkipListDestroyIter(SSkipListIterator* iter) {
   if (iter == NULL) {
     return NULL;

src/vnode/tsdb/tests/tsdbTests.cpp

@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-#include "tsdb.h"
 #include "dataformat.h"
 #include "tsdbMain.h"
 
@@ -78,8 +77,8 @@ TEST(TsdbTest, createRepo) {
   tsdbCreateTable(pRepo, &tCfg);
 
   // // 3. Loop to write some simple data
-  int nRows = 10000000;
-  int rowsPerSubmit = 100;
+  int nRows = 1;
+  int rowsPerSubmit = 1;
   int64_t start_time = 1584081000000;
 
   SSubmitMsg *pMsg = (SSubmitMsg *)malloc(sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + tdMaxRowBytesFromSchema(schema) * rowsPerSubmit);
@@ -140,8 +139,26 @@ TEST(TsdbTest, createRepo) {
 
 // TEST(TsdbTest, DISABLED_openRepo) {
 TEST(TsdbTest, openRepo) {
-  tsdb_repo_t *pRepo = tsdbOpenRepo("/home/ubuntu/work/ttest/vnode0");
-  ASSERT_NE(pRepo, nullptr);
+  tsdb_repo_t *repo = tsdbOpenRepo("/home/ubuntu/work/ttest/vnode0");
+  ASSERT_NE(repo, nullptr);
+
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+
+  SFileGroup *pGroup = tsdbSearchFGroup(pRepo->tsdbFileH, 1833);
+
+  for (int type = TSDB_FILE_TYPE_HEAD; type < TSDB_FILE_TYPE_MAX; type++) {
+    tsdbOpenFile(&pGroup->files[type], O_RDONLY);
+  }
+
+  SCompIdx *pIdx = (SCompIdx *)calloc(pRepo->config.maxTables, sizeof(SCompIdx));
+  tsdbLoadCompIdx(pGroup, (void *)pIdx, pRepo->config.maxTables);
+
+  SCompInfo *pCompInfo = (SCompInfo *)malloc(sizeof(SCompInfo) + pIdx[0].len);
+
+  tsdbLoadCompBlocks(pGroup, pIdx, (void *)pCompInfo);
+
+  int k = 0;
+
 }
 
 TEST(TsdbTest, DISABLED_createFileGroup) {