提交 155b1438 编写于 作者: wmmhello's avatar wmmhello

fix error in order by logic

上级 eba69fdb
...@@ -825,14 +825,17 @@ static void copyBackToBlock(SSDataBlock* pDataBlock, SColumnInfoData* pCols) { ...@@ -825,14 +825,17 @@ static void copyBackToBlock(SSDataBlock* pDataBlock, SColumnInfoData* pCols) {
if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) { if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
taosMemoryFreeClear(pColInfoData->varmeta.offset); taosMemoryFreeClear(pColInfoData->varmeta.offset);
pColInfoData->varmeta = pCols[i].varmeta;
} else { } else {
taosMemoryFreeClear(pColInfoData->nullbitmap); taosMemoryFreeClear(pColInfoData->nullbitmap);
pColInfoData->nullbitmap = pCols[i].nullbitmap;
} }
taosMemoryFreeClear(pColInfoData->pData); taosMemoryFreeClear(pColInfoData->pData);
pColInfoData->pData = pCols[i].pData;
} }
colDataDestroy(pCols); taosMemoryFreeClear(pCols);
} }
static int32_t* createTupleIndex(size_t rows) { static int32_t* createTupleIndex(size_t rows) {
...@@ -1197,7 +1200,6 @@ void colDataDestroy(SColumnInfoData* pColData) { ...@@ -1197,7 +1200,6 @@ void colDataDestroy(SColumnInfoData* pColData) {
} }
taosMemoryFree(pColData->pData); taosMemoryFree(pColData->pData);
taosMemoryFree(pColData);
} }
int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock) { int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册