Skip to content

T
TDengine

taosdata / TDengine
11 个月 前同步成功

通知 1179
Star 22014
Fork 4786
T
TDengine

体验新版 GitCode，发现更多精彩内容 >>

提交 c568aeaa 编写于 作者: H Hongze Cheng
浏览文件
操作

more

上级 07d13f2e
隐藏空白更改
内联 并排
Showing with 30 addition and 14 deletion
source/dnode/vnode/src/tsdb/tsdbMemTable2.c
浏览文件 @ c568aeaa
...@@ -64,8 +64,8 @@ static int memDataPCmprFn(const void *p1, const void *p2); ...@@ -64,8 +64,8 @@ static int memDataPCmprFn(const void *p1, const void *p2);
static int32_t tPutTSDBRow(uint8_t *p, TSDBROW *pRow); static int32_t tPutTSDBRow(uint8_t *p, TSDBROW *pRow);
static int32_t tGetTSDBRow(uint8_t *p, TSDBROW *pRow); static int32_t tGetTSDBRow(uint8_t *p, TSDBROW *pRow);
static int8_t tsdbMemSkipListRandLevel(SMemSkipList *pSl); static int8_t tsdbMemSkipListRandLevel(SMemSkipList *pSl);
static void memDataGetPosToPut(SMemData *pMemData, SMemSkipListNode **backward, TSDBROW *pRow); static void memDataMovePosTo(SMemData *pMemData, SMemSkipListNode **pos, TSDBROW *pRow, int8_t forward);
static int32_t memDataDoPut(SMemData *pMemData, SMemSkipListNode **pos, TSDBROW *pRow, int8_t isForward); static int32_t memDataDoPut(SMemData *pMemData, SMemSkipListNode **pos, TSDBROW *pRow, int8_t forward);
static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData, int64_t version, static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData, int64_t version,
SVSubmitBlk *pSubmitBlk); SVSubmitBlk *pSubmitBlk);
...@@ -300,8 +300,7 @@ static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData, ...@@ -300,8 +300,7 @@ static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData,
int32_t nRow = 0; int32_t nRow = 0;
TSDBROW row = {.version = version}; TSDBROW row = {.version = version};
SMemSkipListNode *backward[SL_MAX_LEVEL]; SMemSkipListNode *pos[SL_MAX_LEVEL];
SMemSkipListNode *forward[SL_MAX_LEVEL];
ASSERT(pSubmitBlk->nData); ASSERT(pSubmitBlk->nData);
...@@ -309,8 +308,8 @@ static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData, ...@@ -309,8 +308,8 @@ static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData,
n += tGetTSRow(p + n, &row.tsRow); n += tGetTSRow(p + n, &row.tsRow);
ASSERT(n <= pSubmitBlk->nData); ASSERT(n <= pSubmitBlk->nData);
memDataGetPosToPut(pMemData, backward, &row); memDataMovePosTo(pMemData, pos, &row, 0);
code = memDataDoPut(pMemData, backward, &row, 0); code = memDataDoPut(pMemData, pos, &row, 0);
if (code) { if (code) {
goto _exit; goto _exit;
} }
...@@ -322,6 +321,11 @@ static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData, ...@@ -322,6 +321,11 @@ static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, SMemData *pMemData,
ASSERT(n <= pSubmitBlk->nData); ASSERT(n <= pSubmitBlk->nData);
// TODO // TODO
memDataMovePosTo(pMemData, pos, &row, 1);
code = memDataDoPut(pMemData, pos, &row, 1);
if (code) {
goto _exit;
}
nRow++; nRow++;
} }
...@@ -330,17 +334,29 @@ _exit: ...@@ -330,17 +334,29 @@ _exit:
return code; return code;
} }
static void memDataGetPosToPut(SMemData *pMemData, SMemSkipListNode **backward, TSDBROW *pRow) { static void memDataMovePosTo(SMemData *pMemData, SMemSkipListNode **pos, TSDBROW *pRow, int8_t forward) {
SMemSkipListNode *px; SMemSkipListNode *px;
SMemSkipListNode *pn; SMemSkipListNode *pn;
TSDBKEY *pKey; TSDBKEY *pKey;
int c; int c;
for (int8_t iLevel = 0; iLevel < pMemData->sl.maxLevel - 1; iLevel++) { if (forward) {
backward[iLevel] = pMemData->sl.pTail; px = pMemData->sl.pHead;
} for (int8_t iLevel = pMemData->sl.maxLevel - 1; iLevel >= 0; iLevel--) {
pn = SL_NODE_FORWARD(px, iLevel);
if (0) { while (pn != pMemData->sl.pTail) {
pKey = (TSDBKEY *)SL_NODE_DATA(pn);
c = tsdbKeyCmprFn(pKey, pRow);
if (pKey >= 0) {
break;
} else {
px = pn;
pn = SL_NODE_FORWARD(px, iLevel);
}
}
pos[iLevel] = px;
}
} else { } else {
px = pMemData->sl.pTail; px = pMemData->sl.pTail;
for (int8_t iLevel = pMemData->sl.maxLevel - 1; iLevel >= 0; iLevel--) { for (int8_t iLevel = pMemData->sl.maxLevel - 1; iLevel >= 0; iLevel--) {
...@@ -358,12 +374,12 @@ static void memDataGetPosToPut(SMemData *pMemData, SMemSkipListNode **backward, ...@@ -358,12 +374,12 @@ static void memDataGetPosToPut(SMemData *pMemData, SMemSkipListNode **backward,
} }
} }
} }
backward[iLevel] = px; pos[iLevel] = px;
} }
} }
} }
static int32_t memDataDoPut(SMemData *pMemData, SMemSkipListNode **pos, TSDBROW *pRow, int8_t isForward) { static int32_t memDataDoPut(SMemData *pMemData, SMemSkipListNode **pos, TSDBROW *pRow, int8_t forward) {
int32_t code = 0; int32_t code = 0;
// TODO // TODO
return code; return code;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或