Merge pull request #21050 from ghalliday/issue35890

ghalliday · web-flow · commit 6850c98ddac5 · 2026-03-06T11:09:59.000Z
HPCC-35890 Fix problem with ordered stranding triggering premature eof

Reviewed-By: Dan S. Camper &lt;dan.camper@lexisnexisrisk.com&gt;
Merged-by: Gavin Halliday &lt;gavin.halliday@lexisnexisrisk.com&gt;
diff --git a/common/thorhelper/thorstrand.cpp b/common/thorhelper/thorstrand.cpp
@@ -219,7 +219,7 @@ RoxieRowBlock::~RoxieRowBlock()
 
 bool RoxieRowBlock::empty() const
 {
-    return (readPos >= writePos) && !exception;
+    return (readPos >= writePos) && !exception && !endOfChunk;
 }
 
 bool RoxieRowBlock::readFromStream(IRowStream * stream)
@@ -727,8 +727,9 @@ class OrderedManyToOneJunction : public CStrandJunction, implements IEngineRowSt
 public:
     IMPLEMENT_IINTERFACE_USING(CStrandJunction)
 
+    //NOTE: Pass blockSize+1 to the allocator, so that the endOfChunk can fit in the same block as the rows.
     OrderedManyToOneJunction(roxiemem::IRowManager & _rowManager, unsigned _numStrands, unsigned blockSize)
-    : CStrandJunction(_numStrands, _numStrands), allocator(_rowManager, blockSize)
+    : CStrandJunction(_numStrands, _numStrands), allocator(_rowManager, blockSize+1)
     {
         producers = new OrderedReadAheadThread * [numStrands];
         for (unsigned i=0; i < numStrands; i++)

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ RoxieRowBlock::~RoxieRowBlock()`
`219`	`219`
`220`	`220`	`bool RoxieRowBlock::empty() const`
`221`	`221`	`{`
`222`		`- return (readPos >= writePos) && !exception;`
	`222`	`+ return (readPos >= writePos) && !exception && !endOfChunk;`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`bool RoxieRowBlock::readFromStream(IRowStream * stream)`
`@@ -727,8 +727,9 @@ class OrderedManyToOneJunction : public CStrandJunction, implements IEngineRowSt`
`727`	`727`	`public:`
`728`	`728`	`IMPLEMENT_IINTERFACE_USING(CStrandJunction)`
`729`	`729`
	`730`	`+ //NOTE: Pass blockSize+1 to the allocator, so that the endOfChunk can fit in the same block as the rows.`
`730`	`731`	`OrderedManyToOneJunction(roxiemem::IRowManager & _rowManager, unsigned _numStrands, unsigned blockSize)`
`731`		`- : CStrandJunction(_numStrands, _numStrands), allocator(_rowManager, blockSize)`
	`732`	`+ : CStrandJunction(_numStrands, _numStrands), allocator(_rowManager, blockSize+1)`
`732`	`733`	`{`
`733`	`734`	`producers = new OrderedReadAheadThread * [numStrands];`
`734`	`735`	`for (unsigned i=0; i < numStrands; i++)`