Pārlūkot izejas kodu

Merge pull request #13988 from jakesmith/hpcc-24444-sort-row-overflow

HPCC-24444 Improve local max sort error

Reviewed-By: Mark Kelly <mark.kelly@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 gadi atpakaļ
vecāks
revīzija
a80548bb20
1 mainītis faili ar 2 papildinājumiem un 1 dzēšanām
  1. 2 1
      thorlcr/msort/tsorts.cpp

+ 2 - 1
thorlcr/msort/tsorts.cpp

@@ -1152,7 +1152,8 @@ public:
         else
         {
             unsigned _snum = (rowidx_t)snum; // only support 2^32 rows in memory
-            assertex(snum==_snum);
+            if (snum != _snum)
+                throw MakeActivityException(activity, 0, "Local sort limit exceeeded (max = 2^32 rows), trying to sort %" RCPF "u rows", snum);
             return rowArray.createRowStream((rowidx_t)sstart, _snum, false); // must be false as rows may overlap (between join)
         }
     }