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

td-449: fix invalid write

This commit is contained in:
Bomin Zhang 2020-06-06 16:55:31 +08:00
parent 51de20d2e0
commit 06ac5328ec
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cq/src/cqMain.c
View File

@ -175,7 +175,7 @@ void *cqCreate(void *handle, uint64_t uid, int tid, char *sqlStr, STSchema *pSch
strcpy(pObj->sqlStr, sqlStr); strcpy(pObj->sqlStr, sqlStr);
pObj->pSchema = tdDupSchema(pSchema); pObj->pSchema = tdDupSchema(pSchema);
pObj->rowSize = pSchema->tlen; pObj->rowSize = schemaTLen(pSchema);
cTrace("vgId:%d, id:%d CQ:%s is created", pContext->vgId, pObj->tid, pObj->sqlStr); cTrace("vgId:%d, id:%d CQ:%s is created", pContext->vgId, pObj->tid, pObj->sqlStr);
@ -272,13 +272,14 @@ static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row) {
pBlk->sversion = htonl(pSchema->version); pBlk->sversion = htonl(pSchema->version);
pBlk->padding = 0; pBlk->padding = 0;
pHead->len = sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + dataRowLen(trow);
pMsg->header.vgId = htonl(pContext->vgId); pMsg->header.vgId = htonl(pContext->vgId);
pMsg->header.contLen = htonl(size - sizeof(SWalHead)); pMsg->header.contLen = htonl(pHead->len);
pMsg->length = pMsg->header.contLen; pMsg->length = pMsg->header.contLen;
pMsg->numOfBlocks = htonl(1); pMsg->numOfBlocks = htonl(1);
pHead->msgType = TSDB_MSG_TYPE_SUBMIT; pHead->msgType = TSDB_MSG_TYPE_SUBMIT;
pHead->len = size - sizeof(SWalHead);
pHead->version = 0; pHead->version = 0;
// write into vnode write queue // write into vnode write queue

4
tests/script/general/stream/table_replica1_vnoden.sim
View File

@ -196,8 +196,8 @@ $st = $stPrefix . as
sql create table $st as select count(tbcol) as c from $tb interval(1d) sql create table $st as select count(tbcol) as c from $tb interval(1d)
print =============== step16 print =============== step16
print sleep 22 seconds print sleep 120 seconds
sleep 22000 sleep 120000
print =============== step17 print =============== step17
$st = $stPrefix . c1 $st = $stPrefix . c1