From 9aa5ee6ccfe37fe0b9bba7b86b2a6c0d5df31385 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 4 Jul 2022 16:58:42 +0800 Subject: [PATCH 1/2] tsdbCache: fix row duplication --- source/dnode/vnode/src/tsdb/tsdbCache.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c index 921702d866..c9554b5688 100644 --- a/source/dnode/vnode/src/tsdb/tsdbCache.c +++ b/source/dnode/vnode/src/tsdb/tsdbCache.c @@ -139,7 +139,11 @@ int32_t tsdbCacheInsertLastrow(SLRUCache *pCache, STsdb *pTsdb, tb_uid_t uid, ST } else { taosLRUCacheRelease(pCache, h, true); // tsdbCacheDeleteLastrow(pCache, uid, TSKEY_MAX); - + if (dup) { + cacheRow = tdRowDup(row); + } else { + cacheRow = row; + } _taos_lru_deleter_t deleter = deleteTableCacheLastrow; LRUStatus status = taosLRUCacheInsert(pCache, key, keyLen, cacheRow, TD_ROW_LEN(cacheRow), deleter, NULL, TAOS_LRU_PRIORITY_LOW); From a4cfb51b9968058f5ab6070873f4c6ddf1a5a8d7 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 4 Jul 2022 17:03:53 +0800 Subject: [PATCH 2/2] tsdbReaderWriter: fix windows compiling issue --- source/dnode/vnode/src/tsdb/tsdbReaderWriter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c index c2dbd02035..30c097158f 100644 --- a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c +++ b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c @@ -367,7 +367,7 @@ int32_t tsdbReadDelIdx(SDelFReader *pReader, SArray *aDelIdx, uint8_t **ppBuf) { int64_t size = pReader->fDel.size - offset; uint32_t delimiter; uint8_t *pBuf = NULL; - SDelIdx *pDelIdx = &(SDelIdx){}; + SDelIdx *pDelIdx = &(SDelIdx){0}; if (!ppBuf) ppBuf = &pBuf;