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

feat(tmq): enable withTbName config for snapshot

This commit is contained in:
Liu Jicong 2022-06-30 14:48:57 +08:00
parent 4695dc2dae
commit 8dece648e3
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/dnode/vnode/src/tq/tqExec.c
View File

@ -85,10 +85,12 @@ int32_t tqScanSnapshot(STQ* pTq, const STqExecHandle* pExec, SMqDataRsp* pRsp, S
tqAddBlockDataToRsp(pDataBlock, pRsp); tqAddBlockDataToRsp(pDataBlock, pRsp);
if (pRsp->withTbName) { if (pRsp->withTbName) {
// TODO int64_t uid;
pRsp->withTbName = 0; int64_t ts;
/*int64_t uid = 0;*/ if (qGetStreamScanStatus(task, &uid, &ts) < 0) {
/*tqAddTbNameToRsp(pTq, uid, pRsp, workerId);*/ ASSERT(0);
}
tqAddTbNameToRsp(pTq, uid, pRsp, workerId);
} }
pRsp->blockNum++; pRsp->blockNum++;

6
source/dnode/vnode/src/tsdb/tsdbRead.c
View File

@ -532,9 +532,9 @@ int32_t tsdbSetTableList(tsdbReaderT reader, SArray* tableList) {
tsdbReaderT tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, SArray* tableList, uint64_t qId, tsdbReaderT tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, SArray* tableList, uint64_t qId,
uint64_t taskId) { uint64_t taskId) {
/*if (taosArrayGetSize(tableList) == 0) {*/ if (taosArrayGetSize(tableList) == 0) {
/*return NULL;*/ return NULL;
/*}*/ }
STsdbReadHandle* pTsdbReadHandle = tsdbQueryTablesImpl(pVnode, pCond, qId, taskId); STsdbReadHandle* pTsdbReadHandle = tsdbQueryTablesImpl(pVnode, pCond, qId, taskId);
if (pTsdbReadHandle == NULL) { if (pTsdbReadHandle == NULL) {
return NULL; return NULL;