From 6a009b7eb4d8891c742811e756e04858357e0040 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Tue, 27 Dec 2022 13:40:48 +0800 Subject: [PATCH] fix(tdataformat): check do merge after sorting again --- source/common/src/tdataformat.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 6ab3a0bb55..5d19012273 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -2699,6 +2699,15 @@ void tColDataSortMerge(SArray *colDataArr) { tColDataSort(aColData, nColData); } + if (doMerge != 1) { + for (int32_t iVal = 1; iVal < aColData[0].nVal; ++iVal) { + if (aKey[iVal] == aKey[iVal - 1]) { + doMerge = 1; + break; + } + } + } + // merge ------- if (doMerge) { tColDataMerge(aColData, nColData);