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

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

Revert "fix(qsort): use glibc qsort_r instead of taosqsort"
This commit is contained in:
Hongze Cheng 2024-04-22 19:26:43 +08:00 committed by GitHub
parent 327964b703 2424eb1e0b
commit 5e3f580242
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/common/src/tdatablock.c
View File

@ -1321,14 +1321,9 @@ 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();