From 9b5e23b104b8f661947eaedd47a3ea59114b5a42 Mon Sep 17 00:00:00 2001 From: haojun Liao Date: Fri, 3 Jan 2020 11:13:13 +0800 Subject: [PATCH] fix invalid fix the invalid release operations when the database is dropped and the metermeta cache is cleaned up at the client side. #1053 [tbase-1435] --- src/client/src/tscUtil.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 3362af2343..638925120b 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -660,8 +660,9 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi int32_t ret = tscGetDataBlockFromList(pVnodeDataBlockHashList, pVnodeDataBlockList, pOneTableBlock->vgid, TSDB_PAYLOAD_SIZE, tsInsertHeadSize, 0, pOneTableBlock->meterId, &dataBuf); if (ret != TSDB_CODE_SUCCESS) { - tscError("%p failed to allocate the data buffer block for merging table data", pSql); - tscDestroyBlockArrayList(pTableDataBlockList); + tscError("%p failed to prepare the data block buffer for merging table data, code:%d", pSql, ret); + taosCleanUpHashTable(pVnodeDataBlockHashList); + tscDestroyBlockArrayList(pVnodeDataBlockList); return ret; } -- GitLab