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

more work

This commit is contained in:
Hongze Cheng 2022-06-23 03:54:20 +00:00
parent cae57255be
commit 4d8d1df2e5
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/dnode/vnode/src/tsdb/tsdbMemTable.c
View File

@ -522,7 +522,6 @@ static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, STbData *pTbData, i
} }
if (pTbData->minKey > key.ts) pTbData->minKey = key.ts; if (pTbData->minKey > key.ts) pTbData->minKey = key.ts;
if (pMemTable->minKey > key.ts) pMemTable->minKey = key.ts;
pLastRow = row.pTSRow; pLastRow = row.pTSRow;
@ -554,9 +553,14 @@ static int32_t tsdbInsertTableDataImpl(SMemTable *pMemTable, STbData *pTbData, i
tsdbCacheInsertLastrow(pMemTable->pTsdb->lruCache, pTbData->uid, pLastRow); tsdbCacheInsertLastrow(pMemTable->pTsdb->lruCache, pTbData->uid, pLastRow);
} }
} }
if (key.ts > pMemTable->maxKey) pMemTable->maxKey = key.ts;
if (pTbData->minVersion > version) pTbData->minVersion = version; if (pTbData->minVersion > version) pTbData->minVersion = version;
if (pTbData->maxVersion < version) pTbData->maxVersion = version; if (pTbData->maxVersion < version) pTbData->maxVersion = version;
// SMemTable
if (pMemTable->minKey > pTbData->minKey) pMemTable->minKey = pTbData->minKey;
if (pMemTable->maxKey < pTbData->maxKey) pMemTable->maxKey = pTbData->maxKey;
if (pMemTable->minVersion > pTbData->minVersion) pMemTable->minVersion = pTbData->minVersion;
if (pMemTable->maxVersion < pTbData->maxVersion) pMemTable->maxVersion = pTbData->maxVersion;
pMemTable->nRow += nRow; pMemTable->nRow += nRow;
pRsp->numOfRows = nRow; pRsp->numOfRows = nRow;

37
source/dnode/vnode/src/tsdb/tsdbUtil.c
View File

@ -47,6 +47,7 @@ int32_t tMapDataPutItem(SMapData *pMapData, void *pItem, int32_t (*tPutItemFn)(u
if (code) goto _err; if (code) goto _err;
// put // put
ASSERT(pMapData->flag == TSDB_OFFSET_I32);
((int32_t *)pMapData->pOfst)[nItem] = offset; ((int32_t *)pMapData->pOfst)[nItem] = offset;
tPutItemFn(pMapData->pData + offset, pItem); tPutItemFn(pMapData->pData + offset, pItem);
@ -54,31 +55,31 @@ _err:
return code; return code;
} }
static int32_t tMapDataGetOffset(SMapData *pMapData, int32_t idx) {
switch (pMapData->flag) {
case TSDB_OFFSET_I8:
return ((int8_t *)pMapData->pOfst)[idx];
break;
case TSDB_OFFSET_I16:
return ((int16_t *)pMapData->pOfst)[idx];
break;
case TSDB_OFFSET_I32:
return ((int32_t *)pMapData->pOfst)[idx];
break;
default:
ASSERT(0);
}
}
int32_t tMapDataGetItemByIdx(SMapData *pMapData, int32_t idx, void *pItem, int32_t (*tGetItemFn)(uint8_t *, void *)) { int32_t tMapDataGetItemByIdx(SMapData *pMapData, int32_t idx, void *pItem, int32_t (*tGetItemFn)(uint8_t *, void *)) {
int32_t code = 0; int32_t code = 0;
int32_t offset;
if (idx < 0 || idx >= pMapData->nItem) { if (idx < 0 || idx >= pMapData->nItem) {
code = TSDB_CODE_NOT_FOUND; code = TSDB_CODE_NOT_FOUND;
goto _exit; goto _exit;
} }
switch (pMapData->flag) { tGetItemFn(pMapData->pData + tMapDataGetOffset(pMapData, idx), pItem);
case TSDB_OFFSET_I8:
offset = ((int8_t *)pMapData->pOfst)[idx];
break;
case TSDB_OFFSET_I16:
offset = ((int16_t *)pMapData->pOfst)[idx];
break;
case TSDB_OFFSET_I32:
offset = ((int32_t *)pMapData->pOfst)[idx];
break;
default:
ASSERT(0);
}
tGetItemFn(pMapData->pData + offset, pItem);
_exit: _exit:
return code; return code;
@ -91,7 +92,7 @@ int32_t tPutMapData(uint8_t *p, SMapData *pMapData) {
ASSERT(pMapData->flag == TSDB_OFFSET_I32); ASSERT(pMapData->flag == TSDB_OFFSET_I32);
ASSERT(pMapData->nItem > 0); ASSERT(pMapData->nItem > 0);
maxOffset = ((int32_t *)pMapData->pOfst)[pMapData->nItem - 1]; maxOffset = tMapDataGetOffset(pMapData, pMapData->nItem - 1);
n += tPutI32v(p ? p + n : p, pMapData->nItem); n += tPutI32v(p ? p + n : p, pMapData->nItem);
if (maxOffset <= INT8_MAX) { if (maxOffset <= INT8_MAX) {

19
source/dnode/vnode/src/vnd/vnodeCommit.c
View File

@ -48,26 +48,21 @@ int vnodeBegin(SVnode *pVnode) {
} }
// begin tsdb // begin tsdb
if (pVnode->pSma) { if (tsdbBegin(pVnode->pTsdb) < 0) {
if (tsdbBegin(VND_RSMA0(pVnode)) < 0) { vError("vgId:%d, failed to begin tsdb since %s", TD_VID(pVnode), tstrerror(terrno));
vError("vgId:%d, failed to begin rsma0 since %s", TD_VID(pVnode), tstrerror(terrno)); return -1;
return -1; }
}
if (tsdbBegin(VND_RSMA1(pVnode)) < 0) { if (pVnode->pSma) {
if (VND_RSMA1(pVnode) && tsdbBegin(VND_RSMA1(pVnode)) < 0) {
vError("vgId:%d, failed to begin rsma1 since %s", TD_VID(pVnode), tstrerror(terrno)); vError("vgId:%d, failed to begin rsma1 since %s", TD_VID(pVnode), tstrerror(terrno));
return -1; return -1;
} }
if (tsdbBegin(VND_RSMA2(pVnode)) < 0) { if (VND_RSMA2(pVnode) && tsdbBegin(VND_RSMA2(pVnode)) < 0) {
vError("vgId:%d, failed to begin rsma2 since %s", TD_VID(pVnode), tstrerror(terrno)); vError("vgId:%d, failed to begin rsma2 since %s", TD_VID(pVnode), tstrerror(terrno));
return -1; return -1;
} }
} else {
if (tsdbBegin(pVnode->pTsdb) < 0) {
vError("vgId:%d, failed to begin tsdb since %s", TD_VID(pVnode), tstrerror(terrno));
return -1;
}
} }
return 0; return 0;