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

more code

This commit is contained in:
Hongze Cheng 2023-03-28 16:43:22 +08:00
parent dc10b0196e
commit 8233a5bc31
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/dnode/vnode/src/tsdb/dev/tsdbFile.c
View File

@ -25,7 +25,12 @@ typedef enum {
} tsdb_fop_t; } tsdb_fop_t;
const char *tsdb_ftype_suffix[] = { const char *tsdb_ftype_suffix[] = {
"none", "stt", "head", "data", "sma", "tomb", ".head", // TSDB_FTYPE_HEAD
".data", // TSDB_FTYPE_DATA
".sma", // TSDB_FTYPE_SMA
".tomb", // TSDB_FTYPE_TOMB
NULL, // TSDB_FTYPE_MAX
".stt",
}; };
struct SFileOp { struct SFileOp {
@ -37,7 +42,17 @@ struct SFileOp {
}; };
int32_t tsdbTFileInit(STsdb *pTsdb, struct STFile *pFile) { int32_t tsdbTFileInit(STsdb *pTsdb, struct STFile *pFile) {
snprintf(pFile->fname, TSDB_FILENAME_LEN, "%s", pTsdb->path); SVnode *pVnode = pTsdb->pVnode;
STfs *pTfs = pVnode->pTfs;
if (pTfs) {
snprintf(pFile->fname, TSDB_FILENAME_LEN, "%s%s%s%sv%df%dver%" PRId64 "%s", tfsGetDiskPath(pTfs, pFile->diskId),
TD_DIRSEP, pTsdb->path, TD_DIRSEP, TD_VID(pVnode), pFile->fid, pFile->cid, tsdb_ftype_suffix[pFile->type]);
} else {
snprintf(pFile->fname, TSDB_FILENAME_LEN, "%s%sv%df%dver%" PRId64 "%s", pTsdb->path, TD_DIRSEP, TD_VID(pVnode),
pFile->fid, pFile->cid, tsdb_ftype_suffix[pFile->type]);
}
pFile->ref = 1;
return 0; return 0;
} }

2
source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c
View File

@ -256,7 +256,7 @@ int32_t tsdbSttFWriteTSData(struct SSttFWriter *pWriter, TABLEID *tbid, TSDBROW
code = tsdbUpdateSkmTb(pWriter->config.pTsdb, tbid, pWriter->config.pSkmTb); code = tsdbUpdateSkmTb(pWriter->config.pTsdb, tbid, pWriter->config.pSkmTb);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
TABLEID id = {.suid = tbid->suid, 0}; TABLEID id = {.suid = tbid->suid, .uid = tbid->suid ? 0 : tbid->uid};
code = tBlockDataInit(&pWriter->bData, &id, pWriter->config.pSkmTb->pTSchema, NULL, 0); code = tBlockDataInit(&pWriter->bData, &id, pWriter->config.pSkmTb->pTSchema, NULL, 0);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }