瀏覽代碼

Merge pull request #5113 from jakesmith/hpcc-10374

HPCC-10374 - Fix sorted loader issue effecting global sort

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 年之前
父節點
當前提交
695144fbf0
共有 1 個文件被更改,包括 2 次插入5 次删除
  1. 2 5
      thorlcr/thorutil/thmem.cpp

+ 2 - 5
thorlcr/thorutil/thmem.cpp

@@ -1474,11 +1474,8 @@ protected:
             }
             else
             {
-                // 0 rows, no overflow and candidate for allMemRows
-                if ((rc_allDiskOrAllMem == diskMemMix) || // must supply allMemRows, only here if no spilling (see above)
-                    (NULL!=allMemRows && (rc_allMem == diskMemMix)) ||
-                    (NULL!=allMemRows && (rc_mixed == diskMemMix) && 0 == overflowCount) // if allMemRows given, only if no spilling
-                   )
+                // If 0 rows, no overflow, don't return stream, except for rc_allDisk which will never fill allMemRows
+                if (allMemRows && (0 == overflowCount) && (diskMemMix != rc_allDisk))
                     return NULL;
             }
         }