Merge pull request #25438 from taosdata/fix/TD-29700

fix(qsort): use glibc qsort_r instead of taosqsort
This commit is contained in:
Hongze Cheng 2024-04-22 19:26:02 +08:00 committed by GitHub
commit 327964b703
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions

View File

@ -1321,9 +1321,14 @@ int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) {
pInfo->compFn = getKeyComparFunc(pInfo->pColData->info.type, pInfo->order);
}
/*
terrno = 0;
taosqsort(index, rows, sizeof(int32_t), &helper, dataBlockCompar);
if (terrno) return terrno;
*/
extern void qsort_r(void* base, size_t nmemb, size_t size, int (*compar)(const void*, const void*, void*), void* arg);
typedef int (*__compar_d_fn_t)(const void*, const void*, void*);
qsort_r(index, rows, sizeof(int32_t), (__compar_d_fn_t)dataBlockCompar, &helper);
int64_t p1 = taosGetTimestampUs();