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

fix: node clone and mac compile issues

This commit is contained in:
dapan1121 2023-08-17 16:01:38 +08:00
parent 3045a623e1
commit 43c056fb61
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/libs/executor/src/groupcacheoperator.c
View File

@ -167,7 +167,7 @@ static void destroySGcBlkCacheInfo(SGcBlkCacheInfo* pBlkCache) {
taosHashCleanup(pBlkCache->pDirtyBlk); taosHashCleanup(pBlkCache->pDirtyBlk);
void* p = NULL; void* p = NULL;
while (p = taosHashIterate(pBlkCache->pReadBlk, p)) { while (NULL != (p = taosHashIterate(pBlkCache->pReadBlk, p))) {
blockDataDeepCleanup(*(SSDataBlock**)p); blockDataDeepCleanup(*(SSDataBlock**)p);
freeGcBlockInList(p); freeGcBlockInList(p);
} }
@ -892,14 +892,14 @@ static int32_t handleDownstreamFetchDone(struct SOperatorInfo* pOperator, SGcSes
if (pGCache->batchFetch) { if (pGCache->batchFetch) {
SHashObj* pGrpHash = pGCache->globalGrp ? pGCache->pGrpHash : pCtx->pGrpHash; SHashObj* pGrpHash = pGCache->globalGrp ? pGCache->pGrpHash : pCtx->pGrpHash;
SGroupCacheData* pGroup = NULL; SGroupCacheData* pGroup = NULL;
while (pGroup = taosHashIterate(pGrpHash, pGroup)) { while (NULL != (pGroup = taosHashIterate(pGrpHash, pGroup))) {
handleGroupFetchDone(pGroup); handleGroupFetchDone(pGroup);
} }
} else { } else {
int32_t uidNum = 0; int32_t uidNum = 0;
SGcVgroupCtx* pVgCtx = NULL; SGcVgroupCtx* pVgCtx = NULL;
int32_t iter = 0; int32_t iter = 0;
while (pVgCtx = tSimpleHashIterate(pCtx->pVgTbHash, pVgCtx, &iter)) { while (NULL != (pVgCtx = tSimpleHashIterate(pCtx->pVgTbHash, pVgCtx, &iter))) {
uidNum = taosArrayGetSize(pVgCtx->pTbList); uidNum = taosArrayGetSize(pVgCtx->pTbList);
for (int32_t i = 0; i < uidNum; ++i) { for (int32_t i = 0; i < uidNum; ++i) {
SGcNewGroupInfo* pNew = taosArrayGet(pVgCtx->pTbList, i); SGcNewGroupInfo* pNew = taosArrayGet(pVgCtx->pTbList, i);

2
source/libs/executor/src/hashjoinoperator.c
View File

@ -42,7 +42,7 @@ static int64_t getRowsNumOfKeyHash(SSHashObj* pHash) {
int32_t iter = 0; int32_t iter = 0;
int64_t rowsNum = 0; int64_t rowsNum = 0;
while (pGroup = tSimpleHashIterate(pHash, pGroup, &iter)) { while (NULL != (pGroup = tSimpleHashIterate(pHash, pGroup, &iter))) {
int32_t* pKey = tSimpleHashGetKey(pGroup, NULL); int32_t* pKey = tSimpleHashGetKey(pGroup, NULL);
int64_t rows = getSingleKeyRowsNum(pGroup->rows); int64_t rows = getSingleKeyRowsNum(pGroup->rows);
qTrace("build_key:%d, rows:%" PRId64, *pKey, rows); qTrace("build_key:%d, rows:%" PRId64, *pKey, rows);

2
source/libs/planner/src/planOptimizer.c
View File

@ -941,7 +941,7 @@ static int32_t pushDownCondOptAppendFilterCol(SOptimizeContext* pCxt, SJoinLogic
} }
} }
if (!found) { if (!found) {
nodesListStrictAppend(pJoin->node.pTargets, pNode); nodesListStrictAppend(pJoin->node.pTargets, nodesCloneNode(pNode));
} }
} }
} }