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

Fix fetch table segmentation fault

This commit is contained in:
hzcheng 2020-03-06 14:22:52 +00:00
parent 192e33db38
commit 7ae3eebe06
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vnode/tsdb/src/tsdbMeta.c
View File

@ -206,8 +206,11 @@ static int32_t tsdbCheckTableCfg(STableCfg *pCfg) {
} }
STable *tsdbGetTableByUid(STsdbMeta *pMeta, int64_t uid) { STable *tsdbGetTableByUid(STsdbMeta *pMeta, int64_t uid) {
STable *pTable = *(STable **)taosGetDataFromHashTable(pMeta->tableMap, (char *)(&uid), sizeof(uid)); void *ptr = taosGetDataFromHashTable(pMeta->tableMap, (char *)(&uid), sizeof(uid));
return pTable;
if (ptr == NULL) return NULL;
return *(STable **)ptr;
} }
static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable) { static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable) {

2
src/vnode/tsdb/tests/tsdbTests.cpp
View File

@ -4,7 +4,7 @@
#include "tsdb.h" #include "tsdb.h"
#include "tsdbMeta.h" #include "tsdbMeta.h"
TEST(TsdbTest, DISABLED_createTable) { TEST(TsdbTest, createTable) {
STsdbMeta *pMeta = tsdbCreateMeta(100); STsdbMeta *pMeta = tsdbCreateMeta(100);
ASSERT_NE(pMeta, nullptr); ASSERT_NE(pMeta, nullptr);