From 5b3bd9ddc10b7758e38af756f7d91d64bf06741e Mon Sep 17 00:00:00 2001 From: hzcheng Date: Sun, 26 Apr 2020 17:12:38 +0800 Subject: [PATCH] TD-166 --- src/tsdb/CMakeLists.txt | 2 +- src/tsdb/tests/tsdbTests.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tsdb/CMakeLists.txt b/src/tsdb/CMakeLists.txt index b2154969d6..8a7c7a1a51 100644 --- a/src/tsdb/CMakeLists.txt +++ b/src/tsdb/CMakeLists.txt @@ -15,5 +15,5 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) TARGET_LINK_LIBRARIES(tsdb common tutil) # Someone has no gtest directory, so comment it - # ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(tests) ENDIF () diff --git a/src/tsdb/tests/tsdbTests.cpp b/src/tsdb/tests/tsdbTests.cpp index e53366f502..3404f6b336 100644 --- a/src/tsdb/tests/tsdbTests.cpp +++ b/src/tsdb/tests/tsdbTests.cpp @@ -27,7 +27,7 @@ typedef struct { static int insertData(SInsertInfo *pInfo) { SSubmitMsg *pMsg = - (SSubmitMsg *)malloc(sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + tdMaxRowBytesFromSchema(pInfo->pSchema) * pInfo->rowsPerSubmit); + (SSubmitMsg *)malloc(sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + dataRowMaxBytesFromSchema(pInfo->pSchema) * pInfo->rowsPerSubmit); if (pMsg == NULL) return -1; TSKEY start_time = pInfo->startTime; @@ -53,10 +53,10 @@ static int insertData(SInsertInfo *pInfo) { for (int j = 0; j < schemaNCols(pInfo->pSchema); j++) { if (j == 0) { // Just for timestamp - tdAppendColVal(row, (void *)(&start_time), schemaColAt(pInfo->pSchema, j)); + tdAppendColVal(row, (void *)(&start_time), pInfo->pSchema, j); } else { // For int int val = 10; - tdAppendColVal(row, (void *)(&val), schemaColAt(pInfo->pSchema, j)); + tdAppendColVal(row, (void *)(&val), pInfo->pSchema, j); } } pBlock->len += dataRowLen(row); -- GitLab