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

more code

This commit is contained in:
Hongze Cheng 2022-11-27 16:08:15 +08:00
parent 62d7535c5c
commit a1256ac8e4
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -493,12 +493,9 @@ void tRowGet(SRow *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal) {
void tRowDestroy(SRow *pRow) { tFree((uint8_t *)pRow); } void tRowDestroy(SRow *pRow) { tFree((uint8_t *)pRow); }
static int32_t tRowPCmprFn(const void *p1, const void *p2) { static int32_t tRowPCmprFn(const void *p1, const void *p2) {
SRow *pRow1 = *(SRow **)p1; if ((*(SRow **)p1)->ts < (*(SRow **)p2)->ts) {
SRow *pRow2 = *(SRow **)p2;
if (pRow1->ts < pRow2->ts) {
return -1; return -1;
} else if (pRow1->ts > pRow2->ts) { } else if ((*(SRow **)p1)->ts > (*(SRow **)p2)->ts) {
return 1; return 1;
} }
@ -566,10 +563,10 @@ _exit:
return code; return code;
} }
int32_t tRowMergeSort(SArray *aRowP, STSchema *pTSchema, int8_t flag) { int32_t tRowMergeSort(SArray *aRowP, STSchema *pTSchema, int8_t flag) {
int32_t code = 0;
if (aRowP->size <= 1) return 0; if (aRowP->size <= 1) return 0;
int32_t code = 0;
taosArraySort(aRowP, tRowPCmprFn); taosArraySort(aRowP, tRowPCmprFn);
int32_t iStart = 0; int32_t iStart = 0;