diff --git a/source/libs/executor/src/hashjoinoperator.c b/source/libs/executor/src/hashjoinoperator.c
index 9014f3683ed9fe47736d12692bbe6c2699abba2f..2feaa88aecca6c6c2dc22002228d37df5dd0d5b7 100755
--- a/source/libs/executor/src/hashjoinoperator.c
+++ b/source/libs/executor/src/hashjoinoperator.c
@@ -369,9 +369,6 @@ static FORCE_INLINE void appendHJoinResToBlock(struct SOperatorInfo* pOperator,
 
   pRes->info.rows = resNum;
   pCtx->rowRemains = pCtx->pBuildRow ? true : false;
-  if (!pCtx->rowRemains) {
-    pCtx->probeIdx++;
-  }
 }
 
 
@@ -423,8 +420,8 @@ static void doHashJoinImpl(struct SOperatorInfo* pOperator) {
     }
   }
 
-  for (int32_t i = pCtx->probeIdx; i < pCtx->pProbeData->info.rows; ++i) {
-    copyKeyColsDataToBuf(pProbe, i, &bufLen);
+  for (; pCtx->probeIdx < pCtx->pProbeData->info.rows; ++pCtx->probeIdx) {
+    copyKeyColsDataToBuf(pProbe, pCtx->probeIdx, &bufLen);
     SGroupData* pGroup = tSimpleHashGet(pJoin->pKeyHash, pProbe->keyData, bufLen);
     if (pGroup) {
       pCtx->pBuildRow = pGroup->rows;
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 42ca38897ff4402297d2465c4689ea37905849d5..b967b317f623ed6e96ec1076685f9ebe23cf4136 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -797,7 +797,7 @@ static int32_t createTableListInfoFromParam(SOperatorInfo* pOperator) {
     return TSDB_CODE_INVALID_PARA;
   }
   
-  qDebug("add total %d dynamic tables to scan, exist num:%d", num, taosArrayGetSize(pListInfo->pTableList));
+  qDebug("add total %d dynamic tables to scan, exist num:%" PRId64, num, (int64_t)taosArrayGetSize(pListInfo->pTableList));
 
   pListInfo->oneTableForEachGroup = true;