Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1193
Star 22018
Fork 4786
T
TDengine
提交 873c9705 编写于 作者: H Hongze Cheng
浏览文件
操作

more code

上级 06db212d
隐藏空白更改
内联 并排
Showing with 149 addition and 171 deletion
source/dnode/vnode/CMakeLists.txt
浏览文件 @ 873c9705
# vnode # vnode
add_library(vnode STATIC "") add_library(vnode STATIC "")
target_sources( set(
vnode VNODE_SOURCE_FILES
PRIVATE "src/vnd/vnodeOpen.c"
"src/vnd/vnodeBufPool.c"
"src/vnd/vnodeCfg.c"
"src/vnd/vnodeCommit.c"
"src/vnd/vnodeQuery.c"
"src/vnd/vnodeModule.c"
"src/vnd/vnodeSvr.c"
"src/vnd/vnodeSync.c"
"src/vnd/vnodeSnapshot.c"
"src/vnd/vnodeRetention.c"
# vnode # meta
"src/vnd/vnodeOpen.c" "src/meta/metaOpen.c"
"src/vnd/vnodeBufPool.c" "src/meta/metaIdx.c"
"src/vnd/vnodeCfg.c" "src/meta/metaTable.c"
"src/vnd/vnodeCommit.c" "src/meta/metaSma.c"
"src/vnd/vnodeQuery.c" "src/meta/metaQuery.c"
"src/vnd/vnodeModule.c" "src/meta/metaCommit.c"
"src/vnd/vnodeSvr.c" "src/meta/metaEntry.c"
"src/vnd/vnodeSync.c" "src/meta/metaSnapshot.c"
"src/vnd/vnodeSnapshot.c" "src/meta/metaCache.c"
"src/vnd/vnodeRetention.c"
# meta # sma
"src/meta/metaOpen.c" "src/sma/smaEnv.c"
"src/meta/metaIdx.c" "src/sma/smaUtil.c"
"src/meta/metaTable.c" "src/sma/smaFS.c"
"src/meta/metaSma.c" "src/sma/smaOpen.c"
"src/meta/metaQuery.c" "src/sma/smaCommit.c"
"src/meta/metaCommit.c" "src/sma/smaRollup.c"
"src/meta/metaEntry.c" "src/sma/smaSnapshot.c"
"src/meta/metaSnapshot.c" "src/sma/smaTimeRange.c"
"src/meta/metaCache.c"
# sma # tsdb
"src/sma/smaEnv.c" "src/tsdb/tsdbCommit.c"
"src/sma/smaUtil.c" "src/tsdb/tsdbFile.c"
"src/sma/smaFS.c" "src/tsdb/tsdbFS.c"
"src/sma/smaOpen.c" "src/tsdb/tsdbOpen.c"
"src/sma/smaCommit.c" "src/tsdb/tsdbMemTable.c"
"src/sma/smaRollup.c" "src/tsdb/tsdbRead.c"
"src/sma/smaSnapshot.c" "src/tsdb/tsdbCache.c"
"src/sma/smaTimeRange.c" "src/tsdb/tsdbWrite.c"
"src/tsdb/tsdbReaderWriter.c"
"src/tsdb/tsdbUtil.c"
"src/tsdb/tsdbSnapshot.c"
"src/tsdb/tsdbCacheRead.c"
"src/tsdb/tsdbRetention.c"
"src/tsdb/tsdbDiskData.c"
"src/tsdb/tsdbMergeTree.c"
"src/tsdb/tsdbDataIter.c"
# tsdb # tq
"src/tsdb/tsdbCommit.c" "src/tq/tq.c"
"src/tsdb/tsdbFile.c" "src/tq/tqExec.c"
"src/tsdb/tsdbFS.c" "src/tq/tqMeta.c"
"src/tsdb/tsdbOpen.c" "src/tq/tqRead.c"
"src/tsdb/tsdbMemTable.c" "src/tq/tqOffset.c"
"src/tsdb/tsdbRead.c" "src/tq/tqPush.c"
"src/tsdb/tsdbCache.c" "src/tq/tqSink.c"
"src/tsdb/tsdbWrite.c" "src/tq/tqCommit.c"
"src/tsdb/tsdbReaderWriter.c" "src/tq/tqSnapshot.c"
"src/tsdb/tsdbUtil.c" "src/tq/tqOffsetSnapshot.c"
"src/tsdb/tsdbSnapshot.c" )
"src/tsdb/tsdbCacheRead.c"
"src/tsdb/tsdbRetention.c"
"src/tsdb/tsdbDiskData.c"
"src/tsdb/tsdbMergeTree.c"
"src/tsdb/tsdbDataIter.c"
# # dev
"src/tsdb/dev/tsdbCommit.c"
"src/tsdb/dev/tsdbMerge.c"
"src/tsdb/dev/tsdbSttFWriter.c"
# tq if (USE_DEV_CODE)
"src/tq/tq.c" aux_source_directory("src/tsdb/dev" VNODE_SOURCE_DEV_FILES)
"src/tq/tqExec.c" list(
"src/tq/tqMeta.c" APPEND
"src/tq/tqRead.c" VNODE_SOURCE_FILES
"src/tq/tqOffset.c" ${VNODE_SOURCE_DEV_FILES}
"src/tq/tqPush.c" )
"src/tq/tqSink.c" endif(USE_DEV_CODE)
"src/tq/tqCommit.c"
"src/tq/tqSnapshot.c" target_sources(
"src/tq/tqOffsetSnapshot.c" vnode
PRIVATE
${VNODE_SOURCE_FILES}
) )
IF (TD_VNODE_PLUGINS) IF (TD_VNODE_PLUGINS)
......
source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c
浏览文件 @ 873c9705
...@@ -16,163 +16,128 @@ ...@@ -16,163 +16,128 @@
#include "tsdbSttFWriter.h" #include "tsdbSttFWriter.h"
#include "tsdbUtil.h" #include "tsdbUtil.h"
extern int32_t tsdbOpenFile(const char *path, int32_t szPage, int32_t flag, STsdbFD **ppFD);
extern void tsdbCloseFile(STsdbFD **ppFD);
extern int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, const uint8_t *pBuf, int64_t size);
extern int32_t tsdbReadFile(STsdbFD *pFD, int64_t offset, uint8_t *pBuf, int64_t size);
extern int32_t tsdbFsyncFile(STsdbFD *pFD);
struct SSttFWriter { struct SSttFWriter {
SSttFWriterConf conf; SSttFWriterConf config;
SBlockData bData; // time-series data
SDelBlock dData; SBlockData bData;
SArray *aSttBlk; // SArray<SSttBlk> SSttBlk sttBlk;
SArray *aDelBlk; // SArray<SDelBlk> SArray *aSttBlk; // SArray<SSttBlk>
SSkmInfo skmTb; // tombstone data
SSkmInfo skmRow; SDelBlock dData;
STsdbFD *pFd; SArray *aDelBlk; // SArray<SDelBlk>
// helper data
SSkmInfo skmTb;
SSkmInfo skmRow;
STsdbFD *pFd;
}; };
int32_t tsdbSttFWriterOpen(const SSttFWriterConf *pConf, SSttFWriter **ppWriter) { static int32_t tsdbSttFWriteTSBlock(SSttFWriter *pWriter) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino;
ppWriter[0] = taosMemoryCalloc(1, sizeof(SSttFWriter)); SBlockData *pBData = &pWriter->bData;
if (ppWriter[0] == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY;
TSDB_CHECK_CODE(code, lino, _exit);
}
ppWriter[0]->conf = pConf[0]; // compress data block
if (ppWriter[0]->conf.pSkmTb == NULL) ppWriter[0]->conf.pSkmTb = &ppWriter[0]->skmTb; code = tCmprBlockData(pBData, pWriter->config.cmprAlg, NULL, NULL, NULL /* TODO */, NULL /* TODO */);
if (ppWriter[0]->conf.pSkmRow == NULL) ppWriter[0]->conf.pSkmRow = &ppWriter[0]->skmRow; TSDB_CHECK_CODE(code, lino, _exit);
tBlockDataCreate(&ppWriter[0]->bData); TSDB_CHECK_NULL(taosArrayPush(pWriter->aSttBlk, &pWriter->sttBlk), code, lino, _exit, TSDB_CODE_OUT_OF_MEMORY);
// tDelBlockCreate(&ppWriter[0]->dData);
tBlockDataClear(pBData);
_exit: _exit:
if (code) { if (code) {
tsdbError("vgId:%d %s failed at line %d since %s", TD_VID(pConf->pTsdb->pVnode), __func__, lino, tstrerror(code)); tsdbError("vgId:%d %s failed at line %d since %s", TD_VID(pWriter->config.pTsdb->pVnode), __func__, lino,
if (ppWriter[0]) { tstrerror(code));
taosMemoryFree(ppWriter[0]);
ppWriter[0] = NULL;
}
} }
return code; return code;
} }
int32_t tsdbSttFWriterClose(SSttFWriter **ppWriter) { int32_t tsdbSttFWriterOpen(const SSttFWriterConf *pConf, SSttFWriter **ppWriter) {
int32_t code = 0;
// TODO
return code;
}
int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow) {
int32_t code = 0;
// TODO
return code;
}
int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData) {
int32_t code = 0;
// TODO
return code;
}
#if 0
extern int32_t tsdbOpenFile(const char *path, int32_t szPage, int32_t flag, STsdbFD **ppFD);
extern void tsdbCloseFile(STsdbFD **ppFD);
struct SSttFWriter {
STsdb *pTsdb;
SSttFile file;
SBlockData bData;
SArray *aSttBlk;
STsdbFD *pFd;
SSkmInfo *pSkmTb;
SSkmInfo *pSkmRow;
int32_t maxRow;
};
static int32_t tsdbSttFWriteTSDataBlock(SSttFWriter *pWriter) {
int32_t code = 0;
// TODO
return code;
}
int32_t tsdbSttFWriterOpen(STsdb *pTsdb, const SSttFile *pSttFile, SSttFWriter **ppWriter) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino;
int32_t szPage = pTsdb->pVnode->config.tsdbPageSize;
int32_t flag = TD_FILE_READ | TD_FILE_WRITE;
char fname[TSDB_FILENAME_LEN];
ppWriter[0] = taosMemoryCalloc(1, sizeof(SSttFWriter)); if ((ppWriter[0] = taosMemoryCalloc(1, sizeof(SSttFWriter))) == NULL) {
if (ppWriter[0] == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY; code = TSDB_CODE_OUT_OF_MEMORY;
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
ppWriter[0]->pTsdb = pTsdb; ppWriter[0]->config = pConf[0];
ppWriter[0]->file = pSttFile[0]; if (ppWriter[0]->config.pSkmTb == NULL) ppWriter[0]->config.pSkmTb = &ppWriter[0]->skmTb;
if (ppWriter[0]->config.pSkmRow == NULL) ppWriter[0]->config.pSkmRow = &ppWriter[0]->skmRow;
tBlockDataCreate(&ppWriter[0]->bData); tBlockDataCreate(&ppWriter[0]->bData);
ppWriter[0]->aSttBlk = taosArrayInit(64, sizeof(SSttBlk)); // tDelBlockCreate(&ppWriter[0]->dData);
if (ppWriter[0]->aSttBlk == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY;
TSDB_CHECK_CODE(code, lino, _exit);
}
if (pSttFile->size == 0) flag |= (TD_FILE_CREATE | TD_FILE_TRUNC); int32_t flag = TD_FILE_READ | TD_FILE_WRITE | TD_FILE_CREATE | TD_FILE_TRUNC; // TODO
tsdbSttFileName(pTsdb, (SDiskID){0}, 0, &ppWriter[0]->file, fname); // TODO code = tsdbOpenFile(NULL /* TODO */, pConf->szPage, flag, &ppWriter[0]->pFd);
code = tsdbOpenFile(fname, szPage, flag, &ppWriter[0]->pFd);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
_exit: _exit:
if (code) { if (code) {
tsdbError("vgId:%d %s failed at line %d since %s", TD_VID(pTsdb->pVnode), __func__, lino, tstrerror(code)); tsdbError("vgId:%d %s failed at line %d since %s", TD_VID(pConf->pTsdb->pVnode), __func__, lino, tstrerror(code));
if (ppWriter[0]) { if (ppWriter[0]) {
tBlockDataDestroy(&ppWriter[0]->bData);
taosArrayDestroy(ppWriter[0]->aSttBlk);
taosMemoryFree(ppWriter[0]); taosMemoryFree(ppWriter[0]);
ppWriter[0] = NULL; ppWriter[0] = NULL;
} }
} }
return 0; return code;
} }
int32_t tsdbSttFWriterClose(SSttFWriter *pWriter) { int32_t tsdbSttFWriterClose(SSttFWriter **ppWriter) {
int32_t code = 0;
// TODO // TODO
return 0; return code;
} }
int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow) { int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino;
if (!TABLE_SAME_SCHEMA(pWriter->bData.suid, pWriter->bData.uid, tbid->suid, tbid->uid)) { if (!TABLE_SAME_SCHEMA(pWriter->bData.suid, pWriter->bData.uid, tbid->suid, tbid->uid)) {
if (pWriter->bData.nRow > 0) { if (pWriter->bData.nRow > 0) {
code = tsdbSttFWriteTSDataBlock(pWriter); code = tsdbSttFWriteTSBlock(pWriter);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
code = tBlockDataInit(&pWriter->bData, tbid, NULL /* TODO */, NULL, 0); // TODO: code = tsdbUpdateTableSchema(pWriter->config.pTsdb, tbid->uid, tbid->suid, pWriter->config.pSkmTb);
TSDB_CHECK_CODE(code, lino, _exit);
TABLEID id = {.suid = tbid->suid, .uid = tbid->suid ? 0 : tbid->uid};
code = tBlockDataInit(&pWriter->bData, &id, pWriter->config.pSkmTb->pTSchema, NULL, 0);
TSDB_CHECK_CODE(code, lino, _exit);
}
if (pRow->type == TSDBROW_ROW_FMT) {
// TODO: code = tsdbUpdateRowSchema(pWriter->config.pTsdb, tbid->uid, tbid->suid, pRow->row,
// pWriter->config.pSkmRow);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
code = tBlockDataAppendRow(&pWriter->bData, pRow, NULL /* TODO */, tbid->uid); code = tBlockDataAppendRow(&pWriter->bData, pRow, pWriter->config.pSkmRow->pTSchema, tbid->uid);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
if (pWriter->bData.nRow >= pWriter->maxRow) { if (pWriter->bData.nRow >= pWriter->config.maxRow) {
code = tsdbSttFWriteTSDataBlock(pWriter); code = tsdbSttFWriteTSBlock(pWriter);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
_exit: _exit:
if (code) { if (code) {
tsdbError("vgId:%d %s failed at line %d since %s", TD_VID(pWriter->pTsdb->pVnode), __func__, lino, tstrerror(code)); tsdbError("vgId:%d %s failed at line %d since %s", TD_VID(pWriter->config.pTsdb->pVnode), __func__, lino,
tstrerror(code));
} }
return 0; return code;
} }
int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, int64_t suid, int64_t uid, int64_t version) { int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; // TODO
return code;
// TODO write row }
return 0; \ No newline at end of file
}
#endif
\ No newline at end of file
source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h
浏览文件 @ 873c9705
...@@ -35,6 +35,8 @@ struct SSttFWriterConf { ...@@ -35,6 +35,8 @@ struct SSttFWriterConf {
SSkmInfo *pSkmTb; SSkmInfo *pSkmTb;
SSkmInfo *pSkmRow; SSkmInfo *pSkmRow;
int32_t maxRow; int32_t maxRow;
int32_t szPage;
int8_t cmprAlg;
}; };
#ifdef __cplusplus #ifdef __cplusplus
......
source/dnode/vnode/src/tsdb/dev/tsdbUtil.h
浏览文件 @ 873c9705
...@@ -27,11 +27,14 @@ typedef struct SDelBlock SDelBlock; ...@@ -27,11 +27,14 @@ typedef struct SDelBlock SDelBlock;
typedef struct SDelBlk SDelBlk; typedef struct SDelBlk SDelBlk;
/* Exposed APIs */ /* Exposed APIs */
int32_t tDelBlockCreate(SDelBlock *pDelBlock);
int32_t tDelBlockDestroy(SDelBlock *pDelBlock);
int32_t tDelBlockClear(SDelBlock *pDelBlock);
int32_t tDelBlockAppend(SDelBlock *pDelBlock, const TABLEID *tbid, const SDelData *pDelData);
/* Exposed Structs */ /* Exposed Structs */
struct SDelBlock { struct SDelBlock {
// <suid, uid, version, skey, ekey> SColData aColData[4]; // <suid, uid, version, skey, ekey>
SColData aColData[4];
}; };
struct SDelBlk { struct SDelBlk {
......
source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
浏览文件 @ 873c9705
...@@ -141,7 +141,7 @@ _exit: ...@@ -141,7 +141,7 @@ _exit:
return code; return code;
} }
static int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, const uint8_t *pBuf, int64_t size) { int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, const uint8_t *pBuf, int64_t size) {
int32_t code = 0; int32_t code = 0;
int64_t fOffset = LOGIC_TO_FILE_OFFSET(offset, pFD->szPage); int64_t fOffset = LOGIC_TO_FILE_OFFSET(offset, pFD->szPage);
int64_t pgno = OFFSET_PGNO(fOffset, pFD->szPage); int64_t pgno = OFFSET_PGNO(fOffset, pFD->szPage);
...@@ -173,7 +173,7 @@ _exit: ...@@ -173,7 +173,7 @@ _exit:
return code; return code;
} }
static int32_t tsdbReadFile(STsdbFD *pFD, int64_t offset, uint8_t *pBuf, int64_t size) { int32_t tsdbReadFile(STsdbFD *pFD, int64_t offset, uint8_t *pBuf, int64_t size) {
int32_t code = 0; int32_t code = 0;
int64_t n = 0; int64_t n = 0;
int64_t fOffset = LOGIC_TO_FILE_OFFSET(offset, pFD->szPage); int64_t fOffset = LOGIC_TO_FILE_OFFSET(offset, pFD->szPage);
...@@ -202,7 +202,7 @@ _exit: ...@@ -202,7 +202,7 @@ _exit:
return code; return code;
} }
static int32_t tsdbFsyncFile(STsdbFD *pFD) { int32_t tsdbFsyncFile(STsdbFD *pFD) {
int32_t code = 0; int32_t code = 0;
code = tsdbWriteFilePage(pFD); code = tsdbWriteFilePage(pFD);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或