Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert empty flag to account for non-distributed tables

  • Loading branch information...
commit 4cca5b060a75cbd5965e5b1266aaa711572ce3ba 1 parent d8fff59
@rengolin rengolin authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 thorlcr/activities/temptable/thtmptableslave.cpp
View
6 thorlcr/activities/temptable/thtmptableslave.cpp
@@ -107,6 +107,8 @@ class CInlineTableSlaveActivity : public CSlaveActivity, public CThorDataLink
__uint64 startRow;
__uint64 currentRow;
__uint64 maxRow;
+ bool empty;
+
public:
IMPLEMENT_IINTERFACE_USING(CSimpleInterface);
@@ -131,11 +133,13 @@ class CInlineTableSlaveActivity : public CSlaveActivity, public CThorDataLink
ActPrintLog("InlineSLAVE: numRows = %"I64F"d, nodes = %"I64F
"d, nodeid = %"I64F"d, start = %"I64F"d, max = %"I64F"d",
numRows, nodes, nodeid, startRow, maxRow);
+ empty = false;
}
else
{
startRow = 0;
maxRow = numRows;
+ empty = !firstNode();
}
currentRow = startRow;
}
@@ -146,7 +150,7 @@ class CInlineTableSlaveActivity : public CSlaveActivity, public CThorDataLink
CATCH_NEXTROW()
{
ActivityTimer t(totalCycles, timeActivities, NULL);
- if (abortSoon)
+ if (empty || abortSoon)
return NULL;
while (currentRow < maxRow) {
RtlDynamicRowBuilder row(queryRowAllocator());
Please sign in to comment.
Something went wrong with that request. Please try again.