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

Merge pull request #16137 from taosdata/feature/stream 

fix(stream): window delete
This commit is contained in:
Hui Li 2022-08-16 16:13:52 +08:00 committed by GitHub
parent ae954d2eda 645a2cce97
commit 9ffb72aa17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/dnode/vnode/src/tq/tqSink.c
View File

@ -17,7 +17,7 @@
#include "tmsg.h"
#include "tq.h"
int32_t tdBuildDeleteReq(SVnode* pVnode, const char* stbFullName, const SSDataBlock* pDataBlock,
int32_t tqBuildDeleteReq(SVnode* pVnode, const char* stbFullName, const SSDataBlock* pDataBlock,
SBatchDeleteReq* deleteReq) {
ASSERT(pDataBlock->info.type == STREAM_DELETE_RESULT);
int32_t totRow = pDataBlock->info.rows;
@ -68,9 +68,10 @@ SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
SSDataBlock* pDataBlock = taosArrayGet(pBlocks, i);
if (pDataBlock->info.type == STREAM_DELETE_RESULT) {
int32_t padding1 = 0;
void* padding2 = taosMemoryMalloc(1);
void* padding2 = NULL;
taosArrayPush(schemaReqSz, &padding1);
taosArrayPush(schemaReqs, &padding2);
continue;
}
STagVal tagVal = {
@ -138,8 +139,7 @@ SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
continue;
}
int32_t rows = pDataBlock->info.rows;
// TODO min
int32_t rowSize = pDataBlock->info.rowSize;
/*int32_t rowSize = pDataBlock->info.rowSize;*/
int32_t maxLen = TD_ROW_MAX_BYTES_FROM_SCHEMA(pTSchema);
int32_t schemaLen = 0;
@ -150,7 +150,6 @@ SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
}
// assign data
// TODO
ret = rpcMallocCont(cap);
ret->header.vgId = pVnode->config.vgId;
ret->length = sizeof(SSubmitReq);
@ -161,13 +160,12 @@ SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
SSDataBlock* pDataBlock = taosArrayGet(pBlocks, i);
if (pDataBlock->info.type == STREAM_DELETE_RESULT) {
pDeleteReq->suid = suid;
tdBuildDeleteReq(pVnode, stbFullName, pDataBlock, pDeleteReq);
tqBuildDeleteReq(pVnode, stbFullName, pDataBlock, pDeleteReq);
continue;
}
blkHead->numOfRows = htonl(pDataBlock->info.rows);
blkHead->sversion = htonl(pTSchema->version);
// TODO
blkHead->suid = htobe64(suid);
// uid is assigned by vnode
blkHead->uid = 0;

2
source/dnode/vnode/src/tsdb/tsdbMemTable.c
View File

@ -196,7 +196,7 @@ int32_t tsdbDeleteTableData(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid
tsdbCacheDeleteLast(pTsdb->lruCache, pTbData->uid, eKey);
}
tsdbError("vgId:%d, delete data from table suid:%" PRId64 " uid:%" PRId64 " skey:%" PRId64 " eKey:%" PRId64
tsdbInfo("vgId:%d, delete data from table suid:%" PRId64 " uid:%" PRId64 " skey:%" PRId64 " eKey:%" PRId64
" since %s",
TD_VID(pTsdb->pVnode), suid, uid, sKey, eKey, tstrerror(code));
return code;

4
tests/script/jenkins/basic.txt
View File

@ -237,8 +237,8 @@
./test.sh -f tsim/stream/distributeInterval0.sim
./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
./test.sh -f tsim/stream/distributeSession0.sim
#./test.sh -f tsim/stream/session0.sim
#./test.sh -f tsim/stream/session1.sim
./test.sh -f tsim/stream/session0.sim
./test.sh -f tsim/stream/session1.sim
./test.sh -f tsim/stream/state0.sim
./test.sh -f tsim/stream/triggerInterval0.sim
./test.sh -f tsim/stream/triggerSession0.sim

26
tests/script/tsim/stream/session0.sim
View File

@ -83,22 +83,22 @@ if $data11 != 3 then
goto loop0
endi
if $data12 != NULL then
if $data12 != 10 then
print ======data12=$data12
goto loop0
endi
if $data13 != NULL then
if $data13 != 10 then
print ======data13=$data13
goto loop0
endi
if $data14 != NULL then
if $data14 != 1.100000000 then
print ======data14=$data14
return -1
endi
if $data15 != NULL then
if $data15 != 0.000000000 then
print ======data15=$data15
return -1
endi
@ -141,38 +141,38 @@ if $data01 != 7 then
goto loop1
endi
if $data02 != NULL then
if $data02 != 18 then
print =====data02=$data02
goto loop1
endi
if $data03 != NULL then
if $data03 != 4 then
print =====data03=$data03
goto loop1
endi
if $data04 != NULL then
print ======$data04
if $data04 != 1.000000000 then
print ======data04=$data04
return -1
endi
if $data05 != NULL then
print ======$data05
if $data05 != 1.154700538 then
print ======data05=$data05
return -1
endi
if $data06 != 4 then
print ======$data06
print ======data06=$data06
return -1
endi
if $data07 != 1.000000000 then
print ======$data07
print ======data07=$data07
return -1
endi
if $data08 != 13 then
print ======$data08
print ======data08=$data08
return -1
endi