Skip to content

T
TDengine

taosdata / TDengine
1 年多 前同步成功

通知 1185
Star 22016
Fork 4786
T
TDengine
提交 377517ee 编写于 作者: H hzcheng
浏览文件
操作

TD-34

上级 e0863b4c
隐藏空白更改
内联 并排
Showing with 38 addition and 37 deletion
src/vnode/tsdb/src/tsdbMain.c
浏览文件 @ 377517ee
...@@ -818,6 +818,7 @@ static SSkipListIterator **tsdbCreateTableIters(STsdbMeta *pMeta, int maxTables) ...@@ -818,6 +818,7 @@ static SSkipListIterator **tsdbCreateTableIters(STsdbMeta *pMeta, int maxTables)
// Commit to file // Commit to file
static void *tsdbCommitToFile(void *arg) { static void *tsdbCommitToFile(void *arg) {
// TODO // TODO
printf("Starting to commit....\n");
STsdbRepo * pRepo = (STsdbRepo *)arg; STsdbRepo * pRepo = (STsdbRepo *)arg;
STsdbMeta * pMeta = pRepo->tsdbMeta; STsdbMeta * pMeta = pRepo->tsdbMeta;
STsdbCache *pCache = pRepo->tsdbCache; STsdbCache *pCache = pRepo->tsdbCache;
...@@ -836,42 +837,42 @@ static void *tsdbCommitToFile(void *arg) { ...@@ -836,42 +837,42 @@ static void *tsdbCommitToFile(void *arg) {
SDataCol **cols = (SDataCol **)malloc(sizeof(SDataCol *) * maxCols); SDataCol **cols = (SDataCol **)malloc(sizeof(SDataCol *) * maxCols);
void *buf = malloc((maxBytes + sizeof(SDataCol)) * pCfg->maxRowsPerFileBlock); void *buf = malloc((maxBytes + sizeof(SDataCol)) * pCfg->maxRowsPerFileBlock);
// int sfid = tsdbGetKeyFileId(pCache->imem->keyFirst, pCfg->daysPerFile, pCfg->precision); int sfid = tsdbGetKeyFileId(pCache->imem->keyFirst, pCfg->daysPerFile, pCfg->precision);
// int efid = tsdbGetKeyFileId(pCache->imem->keyLast, pCfg->daysPerFile, pCfg->precision); int efid = tsdbGetKeyFileId(pCache->imem->keyLast, pCfg->daysPerFile, pCfg->precision);
// for (int fid = sfid; fid <= efid; fid++) { for (int fid = sfid; fid <= efid; fid++) {
// TSKEY minKey = 0, maxKey = 0; TSKEY minKey = 0, maxKey = 0;
// tsdbGetKeyRangeOfFileId(pCfg->daysPerFile, pCfg->precision, fid, &minKey, &maxKey); tsdbGetKeyRangeOfFileId(pCfg->daysPerFile, pCfg->precision, fid, &minKey, &maxKey);
// // tsdbOpenFileForWrite(pRepo, fid); // tsdbOpenFileForWrite(pRepo, fid);
// for (int tid = 0; tid < pCfg->maxTables; tid++) { for (int tid = 0; tid < pCfg->maxTables; tid++) {
// STable *pTable = pMeta->tables[tid]; STable *pTable = pMeta->tables[tid];
// if (pTable == NULL || pTable->imem == NULL) continue; if (pTable == NULL || pTable->imem == NULL) continue;
// if (iters[tid] == NULL) { // create table iterator if (iters[tid] == NULL) { // create table iterator
// iters[tid] = tSkipListCreateIter(pTable->imem->pData); iters[tid] = tSkipListCreateIter(pTable->imem->pData);
// // TODO: deal with the error // TODO: deal with the error
// if (iters[tid] == NULL) break; if (iters[tid] == NULL) break;
// if (!tSkipListIterNext(iters[tid])) { if (!tSkipListIterNext(iters[tid])) {
// // assert(0); // assert(0);
// } }
// } }
// // Init row data part // Init row data part
// cols[0] = (SDataCol *)buf; cols[0] = (SDataCol *)buf;
// for (int col = 1; col < schemaNCols(pTable->schema); col++) { for (int col = 1; col < schemaNCols(pTable->schema); col++) {
// cols[col] = (SDataCol *)((char *)(cols[col - 1]) + sizeof(SDataCol) + colBytes(schemaColAt(pTable->schema, col-1)) * pCfg->maxRowsPerFileBlock); cols[col] = (SDataCol *)((char *)(cols[col - 1]) + sizeof(SDataCol) + colBytes(schemaColAt(pTable->schema, col-1)) * pCfg->maxRowsPerFileBlock);
// } }
// // Loop the iterator // Loop the iterator
// int rowsRead = 0; int rowsRead = 0;
// while ((rowsRead = tsdbReadRowsFromCache(iters[tid], maxKey, pCfg->maxRowsPerFileBlock, cols, pTable->schema)) > while ((rowsRead = tsdbReadRowsFromCache(iters[tid], maxKey, pCfg->maxRowsPerFileBlock, cols, pTable->schema)) >
// 0) { 0) {
// // printf("rowsRead:%d-----------\n", rowsRead); // printf("rowsRead:%d-----------\n", rowsRead);
// int k = 0; int k = 0;
// } }
// } }
// } }
tsdbDestroyTableIters(iters, pCfg->maxTables); tsdbDestroyTableIters(iters, pCfg->maxTables);
......
src/vnode/tsdb/tests/tsdbTests.cpp
浏览文件 @ 377517ee
...@@ -142,7 +142,7 @@ TEST(TsdbTest, DISABLED_openRepo) { ...@@ -142,7 +142,7 @@ TEST(TsdbTest, DISABLED_openRepo) {
TEST(TsdbTest, DISABLED_createFileGroup) { TEST(TsdbTest, DISABLED_createFileGroup) {
SFileGroup fGroup; SFileGroup fGroup;
ASSERT_EQ(tsdbCreateFileGroup("/home/ubuntu/work/ttest/vnode0/data", 1820, &fGroup, 1000), 0); // ASSERT_EQ(tsdbCreateFileGroup("/home/ubuntu/work/ttest/vnode0/data", 1820, &fGroup, 1000), 0);
int k = 0; int k = 0;
} }
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或