diff --git a/source/libs/executor/inc/tsort.h b/source/libs/executor/inc/tsort.h
index cc5db32666..3c7194de6f 100644
--- a/source/libs/executor/inc/tsort.h
+++ b/source/libs/executor/inc/tsort.h
@@ -50,7 +50,6 @@ typedef struct SMsortComparParam {
   void        **pSources;
   int32_t       numOfSources;
   SArray       *orderInfo;   // SArray<SBlockOrderInfo>
-  bool          nullFirst;
 } SMsortComparParam;
 
 typedef struct SSortHandle SSortHandle;
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index f3f52455f0..34f3325a8d 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4144,6 +4144,7 @@ int32_t loadRemoteDataCallback(void* param, const SDataBuf* pMsg, int32_t code)
 
   pSourceDataInfo->status = EX_SOURCE_DATA_READY;
   tsem_post(&pSourceDataInfo->pEx->ready);
+  return TSDB_CODE_SUCCESS;
 }
 
 static void destroySendMsgInfo(SMsgSendInfo* pMsgBody) {
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 2aa8f6a09d..a052cbe846 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -391,11 +391,11 @@ int32_t msortComparFn(const void *pLeft, const void *pRight, void *param) {
     }
 
     if (rightNull) {
-      return pParam->nullFirst? 1:-1;
+      return pOrder->nullFirst? 1:-1;
     }
 
     if (leftNull) {
-      return pParam->nullFirst? -1:1;
+      return pOrder->nullFirst? -1:1;
     }
 
     void* left1  = colDataGetData(pLeftColInfoData, pLeftSource->src.rowIndex);