xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TD-100

This commit is contained in:
hzcheng 2020-04-16 18:27:41 +08:00
parent ab045f64e7
commit 8518a5b256
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tsdb/src/tsdbRWHelper.c
View File

@ -15,6 +15,7 @@
#include "tsdbMain.h" #include "tsdbMain.h"
#include "tchecksum.h" #include "tchecksum.h"
#include "tscompression.h" #include "tscompression.h"
#include "talgo.h"
// Local function definitions // Local function definitions
static int tsdbCheckHelperCfg(SHelperCfg *pCfg); static int tsdbCheckHelperCfg(SHelperCfg *pCfg);
@ -885,7 +886,6 @@ static int tsdbMergeDataWithBlock(SRWHelper *pHelper, int blkIdx, SDataCols *pDa
static int compTSKEY(const void *key1, const void *key2) { return ((TSKEY *)key1 - (TSKEY *)key2); } static int compTSKEY(const void *key1, const void *key2) { return ((TSKEY *)key1 - (TSKEY *)key2); }
static int tsdbAdjustInfoSizeIfNeeded(SRWHelper *pHelper, size_t esize) { static int tsdbAdjustInfoSizeIfNeeded(SRWHelper *pHelper, size_t esize) {
SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid;
if (tsizeof((void *)pHelper->pCompInfo) <= esize) { if (tsizeof((void *)pHelper->pCompInfo) <= esize) {
size_t tsize = esize + sizeof(SCompBlock) * 16; size_t tsize = esize + sizeof(SCompBlock) * 16;

2
src/util/tests/taosbsearchTest.cpp
View File

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tutil.h" #include "talgo.h"
static int compareFunc(const void *arg1, const void *arg2) { return (*(int *)arg1) - (*(int *)arg2); } static int compareFunc(const void *arg1, const void *arg2) { return (*(int *)arg1) - (*(int *)arg2); }