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

Merge pull request #836 from taosdata/feature/liaohj 

[tbase-1269]
This commit is contained in:
slguan 2019-12-03 19:01:54 +08:00 committed by GitHub
parent 30161abedf eaa767be1b
commit b5d71c294b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/detail/src/mgmtSupertableQuery.c
View File

@ -56,7 +56,7 @@ static int32_t tabObjVGIDComparator(const void* pLeft, const void* pRight) {
// monotonic inc in memory address // monotonic inc in memory address
static int32_t tabObjPointerComparator(const void* pLeft, const void* pRight) { static int32_t tabObjPointerComparator(const void* pLeft, const void* pRight) {
int64_t ret = (int64_t)pLeft - (int64_t)pRight; int64_t ret = (*(STabObj**)(pLeft))->uid - (*(STabObj**)(pRight))->uid;
if (ret == 0) { if (ret == 0) {
return 0; return 0;
} else { } else {
@ -427,7 +427,7 @@ static tQueryResultset* doNestedLoopIntersect(tQueryResultset* pRes1, tQueryResu
} }
static tQueryResultset* doSortIntersect(tQueryResultset* pRes1, tQueryResultset* pRes2) { static tQueryResultset* doSortIntersect(tQueryResultset* pRes1, tQueryResultset* pRes2) {
size_t sizePtr = sizeof(void*); size_t sizePtr = sizeof(void *);
qsort(pRes1->pRes, pRes1->num, sizePtr, tabObjPointerComparator); qsort(pRes1->pRes, pRes1->num, sizePtr, tabObjPointerComparator);
qsort(pRes2->pRes, pRes2->num, sizePtr, tabObjPointerComparator); qsort(pRes2->pRes, pRes2->num, sizePtr, tabObjPointerComparator);