提交 6a009b7e 编写于 作者: M Minglei Jin

fix(tdataformat): check do merge after sorting again

上级 98263432
...@@ -2699,6 +2699,15 @@ void tColDataSortMerge(SArray *colDataArr) { ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册