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

fix error in sort logic

This commit is contained in:
wangmm0220 2022-04-06 19:50:24 +08:00
parent c4f67c25fb
commit c9de8b3b15
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/executor/inc/tsort.h
View File

@ -50,7 +50,6 @@ typedef struct SMsortComparParam {
void **pSources; void **pSources;
int32_t numOfSources; int32_t numOfSources;
SArray *orderInfo; // SArray<SBlockOrderInfo> SArray *orderInfo; // SArray<SBlockOrderInfo>
bool nullFirst;
} SMsortComparParam; } SMsortComparParam;
typedef struct SSortHandle SSortHandle; typedef struct SSortHandle SSortHandle;

1
source/libs/executor/src/executorimpl.c
View File

@ -4144,6 +4144,7 @@ int32_t loadRemoteDataCallback(void* param, const SDataBuf* pMsg, int32_t code)
pSourceDataInfo->status = EX_SOURCE_DATA_READY; pSourceDataInfo->status = EX_SOURCE_DATA_READY;
tsem_post(&pSourceDataInfo->pEx->ready); tsem_post(&pSourceDataInfo->pEx->ready);
return TSDB_CODE_SUCCESS;
} }
static void destroySendMsgInfo(SMsgSendInfo* pMsgBody) { static void destroySendMsgInfo(SMsgSendInfo* pMsgBody) {

4
source/libs/executor/src/tsort.c
View File

@ -391,11 +391,11 @@ int32_t msortComparFn(const void *pLeft, const void *pRight, void *param) {
} }
if (rightNull) { if (rightNull) {
return pParam->nullFirst? 1:-1; return pOrder->nullFirst? 1:-1;
} }
if (leftNull) { if (leftNull) {
return pParam->nullFirst? -1:1; return pOrder->nullFirst? -1:1;
} }
void* left1 = colDataGetData(pLeftColInfoData, pLeftSource->src.rowIndex); void* left1 = colDataGetData(pLeftColInfoData, pLeftSource->src.rowIndex);