HPCC-19906 Remove redundant code (rcflag_noAllInMemSort)

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
hpcc-systems · Jun 20, 2018 · b499b8a · b499b8a
1 parent e1c2c11
commit b499b8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/thorlcr/thorutil/thmem.cpp b/thorlcr/thorutil/thmem.cpp
@@ -1715,13 +1715,9 @@ class CThorRowCollectorBase : public CSpillable
                     totalRows += spillableRows.numCommitted();
                     if (iCompare)
                     {
-                        // Option(rcflag_noAllInMemSort) - avoid sorting allMemRows
-                        if ((nullptr == allMemRows) || (0 == (options & rcflag_noAllInMemSort)))
-                        {
-                            CCycleTimer timer;
-                            spillableRows.sort(*iCompare, maxCores);
-                            sortCycles += timer.elapsedCycles();
-                        }
+                        CCycleTimer timer;
+                        spillableRows.sort(*iCompare, maxCores);
+                        sortCycles += timer.elapsedCycles();
                     }
 
                     if ((rc_allDiskOrAllMem == diskMemMix) || // must supply allMemRows, only here if no spilling (see above)

diff --git a/thorlcr/thorutil/thmem.hpp b/thorlcr/thorutil/thmem.hpp
@@ -526,7 +526,6 @@ class graph_decl CThorSpillableRowArray : private CThorExpandingRowArray, implem
 
 
 enum RowCollectorSpillFlags { rc_mixed, rc_allMem, rc_allDisk, rc_allDiskOrAllMem };
-enum RowCollectorOptionFlags { rcflag_noAllInMemSort=0x01 };
 interface IThorRowCollectorCommon : extends IInterface, extends IThorArrayLock
 {
     virtual rowcount_t numRows() const = 0;