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

fix(tdataformat): check do merge after sorting again

This commit is contained in:
Minglei Jin 2022-12-27 13:40:48 +08:00
parent 98263432aa
commit 6a009b7eb4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/common/src/tdataformat.c
View File

@ -2699,6 +2699,15 @@ void tColDataSortMerge(SArray *colDataArr) {
tColDataSort(aColData, nColData); 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 ------- // merge -------
if (doMerge) { if (doMerge) {
tColDataMerge(aColData, nColData); tColDataMerge(aColData, nColData);