refactor: do some internal refactor.
This commit is contained in:
parent
69cb630e7f
commit
2ce7d18e94
|
@ -1524,8 +1524,6 @@ void* blockDataDestroy(SSDataBlock* pBlock) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_VAR_DATA_TYPE(pBlock->info.pks[0].type)) {
|
if (IS_VAR_DATA_TYPE(pBlock->info.pks[0].type)) {
|
||||||
uInfo("1====free pk:%p, %p pBlock", pBlock->info.pks[0].pData, pBlock);
|
|
||||||
uInfo("2====free pk:%p, %p pBlock", pBlock->info.pks[1].pData, pBlock);
|
|
||||||
taosMemoryFreeClear(pBlock->info.pks[0].pData);
|
taosMemoryFreeClear(pBlock->info.pks[0].pData);
|
||||||
taosMemoryFreeClear(pBlock->info.pks[1].pData);
|
taosMemoryFreeClear(pBlock->info.pks[1].pData);
|
||||||
}
|
}
|
||||||
|
@ -1705,10 +1703,6 @@ SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData) {
|
||||||
p->pData = taosMemoryCalloc(1, pDataBlock->info.pks[1].nData);
|
p->pData = taosMemoryCalloc(1, pDataBlock->info.pks[1].nData);
|
||||||
p->nData = pDataBlock->info.pks[1].nData;
|
p->nData = pDataBlock->info.pks[1].nData;
|
||||||
memcpy(p->pData, pDataBlock->info.pks[1].pData, p->nData);
|
memcpy(p->pData, pDataBlock->info.pks[1].pData, p->nData);
|
||||||
uInfo("===========clone block, with varchar, %p, 0---addr:%p, src:%p, %p", pBlock, pBlock->info.pks[0].pData, pDataBlock, pDataBlock->info.pks[0].pData);
|
|
||||||
uInfo("===========clone block, with varchar, %p, 1---addr:%p, src:%p, %p", pBlock, pBlock->info.pks[1].pData, pDataBlock, pDataBlock->info.pks[1].pData);
|
|
||||||
} else {
|
|
||||||
uInfo("===========clone block without varchar pk, %p, src:%p", pBlock, pDataBlock);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (copyData) {
|
if (copyData) {
|
||||||
|
|
|
@ -45,7 +45,7 @@ int32_t tqPushMsg(STQ* pTq, tmsg_t msgType) {
|
||||||
// 1. the vnode has already been restored.
|
// 1. the vnode has already been restored.
|
||||||
// 2. the vnode should be the leader.
|
// 2. the vnode should be the leader.
|
||||||
// 3. the stream is not suspended yet.
|
// 3. the stream is not suspended yet.
|
||||||
if ((!tsDisableStream) && (numOfTasks > 0) /* && (msgType == TDMT_VND_SUBMIT || msgType == TDMT_VND_DELETE)*/) {
|
if ((!tsDisableStream) && (numOfTasks > 0)) {
|
||||||
tqScanWalAsync(pTq, true);
|
tqScanWalAsync(pTq, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue