|
@@ -953,7 +953,7 @@ public:
|
|
|
factory(_factory),
|
|
|
basehelper(_factory->getHelper()),
|
|
|
activityId(_factory->queryId()),
|
|
|
- stats(_factory ? _factory->queryStatsMapping() : actStatistics),
|
|
|
+ stats(_factory->queryStatsMapping()),
|
|
|
probeManager(_probeManager)
|
|
|
{
|
|
|
input = NULL;
|
|
@@ -1015,7 +1015,7 @@ public:
|
|
|
factory->noteProcessed(0, processed);
|
|
|
factory->mergeActivityStats(stats, totalCycles, localCycles);
|
|
|
}
|
|
|
- if (ctx)
|
|
|
+ if (ctx && factory)
|
|
|
{
|
|
|
if (processed)
|
|
|
ctx->noteProcessed(factory->querySubgraphId(), activityId, 0, processed, 0);
|
|
@@ -1715,7 +1715,7 @@ public:
|
|
|
{
|
|
|
if (factory && !debugging)
|
|
|
factory->noteProcessed(0, processed);
|
|
|
- if (ctx)
|
|
|
+ if (ctx && factory)
|
|
|
ctx->noteProcessed(factory->querySubgraphId(), activityId, 0, processed, strands.ordinality());
|
|
|
processed = 0; // To avoid reprocessing in base destructor
|
|
|
}
|
|
@@ -3147,8 +3147,6 @@ public:
|
|
|
virtual const void *getMessageHeader(unsigned &length) const
|
|
|
{
|
|
|
throwUnexpected(); // should never get called - I don't have a header available
|
|
|
- length = 0;
|
|
|
- return NULL;
|
|
|
}
|
|
|
|
|
|
virtual const void *getMessageMetadata(unsigned &length) const
|
|
@@ -4247,8 +4245,7 @@ public:
|
|
|
}
|
|
|
if (ctx->queryDebugContext() && ctx->queryDebugContext()->getExecuteSequentially())
|
|
|
deferredStart = true;
|
|
|
- if (ctx)
|
|
|
- timeActivities = ctx->queryOptions().timeActivities;
|
|
|
+ timeActivities = ctx->queryOptions().timeActivities;
|
|
|
}
|
|
|
|
|
|
virtual void onStart(unsigned _parentExtractSize, const byte * _parentExtract)
|
|
@@ -24151,7 +24148,7 @@ public:
|
|
|
virtual void onLimitExceeded(bool isKeyed)
|
|
|
{
|
|
|
if (traceLevel > 4)
|
|
|
- DBGLOG("activityid = %d isKeyed = %d line = %d", activityId, isKeyed, __LINE__);DBGLOG("%d activityid = %d", __LINE__, activityId);
|
|
|
+ DBGLOG("activityid = %d isKeyed = %d line = %d", activityId, isKeyed, __LINE__);
|
|
|
throwUnexpected();
|
|
|
}
|
|
|
|
|
@@ -27847,11 +27844,13 @@ protected:
|
|
|
if (!next)
|
|
|
{
|
|
|
ASSERT(repeats==0);
|
|
|
- ASSERT(output[count++] == NULL);
|
|
|
+ ASSERT(output[count] == NULL);
|
|
|
+ count++;
|
|
|
next = outStream->nextRow();
|
|
|
if (!next)
|
|
|
{
|
|
|
- ASSERT(output[count++] == NULL);
|
|
|
+ ASSERT(output[count] == NULL);
|
|
|
+ count++;
|
|
|
break;
|
|
|
}
|
|
|
}
|