提交 a9cf4bd3 编写于 作者: H hzcheng

TD-34

上级 3f5bf97c
...@@ -718,12 +718,18 @@ static int32_t tsdbInsertDataToTable(tsdb_repo_t *repo, SSubmitBlk *pBlock) { ...@@ -718,12 +718,18 @@ static int32_t tsdbInsertDataToTable(tsdb_repo_t *repo, SSubmitBlk *pBlock) {
return 0; return 0;
} }
static int tsdbReadRowsFromCache(SSkipListIterator *pIter, TSKEY minKey, TSKEY maxKey, int maxRowsToRead, void *dst) { static int tsdbReadRowsFromCache(SSkipListIterator *pIter, TSKEY maxKey, int maxRowsToRead, void *dst) {
int numOfRows = 0; int numOfRows = 0;
do { do {
SSkipListNode *node = tSkipListIterGet(pIter); SSkipListNode *node = tSkipListIterGet(pIter);
if (node == NULL) break;
SDataRow row = SL_GET_NODE_DATA(node); SDataRow row = SL_GET_NODE_DATA(node);
if (dataRowKey(row) > maxKey) break; if (dataRowKey(row) > maxKey) break;
// Convert row data to column data
numOfRows++;
if (numOfRows > maxRowsToRead) break;
} while (tSkipListIterNext(pIter)); } while (tSkipListIterNext(pIter));
return numOfRows; return numOfRows;
} }
...@@ -746,6 +752,9 @@ static void *tsdbCommitToFile(void *arg) { ...@@ -746,6 +752,9 @@ static void *tsdbCommitToFile(void *arg) {
return NULL; return NULL;
} }
int maxCols = pMeta->maxCols;
int maxBytes = pMeta->maxRowBytes;
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);
...@@ -754,7 +763,7 @@ static void *tsdbCommitToFile(void *arg) { ...@@ -754,7 +763,7 @@ static void *tsdbCommitToFile(void *arg) {
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); 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])) {
...@@ -763,7 +772,10 @@ static void *tsdbCommitToFile(void *arg) { ...@@ -763,7 +772,10 @@ static void *tsdbCommitToFile(void *arg) {
} }
// Loop the iterator // Loop the iterator
// tsdbReadRowsFromCache(); int rowsRead = 0;
while ((rowsRead = tsdbReadRowsFromCache(iters[tid], maxKey, pCfg->maxRowsPerFileBlock, NULL)) > 0) {
int k = 0;
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册