Merge branch 'feature/3_liaohj' of github.com:taosdata/TDengine into feature/3_liaohj

8f5a85f6 · dapan1121 · d41efb2c · 54921550 · 8f5a85f6
显示空白变更内容
内联并排

Showing with 1 addition and 1 deletion

source/libs/executor/src/sortoperator.c source/libs/executor/src/sortoperator.c +1 -1

未找到文件。
--- a/source/libs/executor/src/sortoperator.c
+++ b/source/libs/executor/src/sortoperator.c
@@ -439,7 +439,7 @@ SOperatorInfo* createMultiwaySortMergeOperatorInfo(SOperatorInfo** downStreams,
  pInfo->bufPageSize   = getProperSortPageSize(rowSize);

  uint32_t numOfSources = taosArrayGetSize(pSortInfo);
-  numOfSources = MAX(2, numOfSources);
+  numOfSources = TMAX(2, numOfSources);

  pInfo->sortBufSize    = numOfSources * pInfo->bufPageSize;