|
@@ -946,7 +946,7 @@ public:
|
|
|
|
|
|
virtual bool process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieDiskReadBaseActivity::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieDiskReadBaseActivity::process");
|
|
|
atomic_inc(&diskReadStarted);
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
doProcess(output);
|
|
@@ -2328,7 +2328,7 @@ public:
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CParallelRoxieActivity::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CParallelRoxieActivity::process");
|
|
|
atomic_inc(&diskReadStarted);
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
class casyncfor: public CAsyncFor
|
|
@@ -3457,7 +3457,7 @@ public:
|
|
|
|
|
|
virtual bool process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieIndexReadActivity ::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieIndexReadActivity ::process");
|
|
|
unsigned __int64 keyedLimit = readHelper->getKeyedLimit();
|
|
|
unsigned __int64 limit = readHelper->getRowLimit();
|
|
|
|
|
@@ -3736,7 +3736,7 @@ public:
|
|
|
|
|
|
virtual bool process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieIndexNormalizeActivity ::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieIndexNormalizeActivity ::process");
|
|
|
unsigned __int64 keyedLimit = normalizeHelper->getKeyedLimit();
|
|
|
unsigned __int64 rowLimit = normalizeHelper->getRowLimit();
|
|
|
|
|
@@ -3910,7 +3910,7 @@ public:
|
|
|
|
|
|
virtual bool process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieIndexCountActivity ::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieIndexCountActivity ::process");
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
unsigned skipped = 0;
|
|
|
|
|
@@ -4034,7 +4034,7 @@ public:
|
|
|
|
|
|
virtual bool process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieIndexAggregateActivity ::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieIndexAggregateActivity ::process");
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
|
|
|
OptimizedRowBuilder rowBuilder(rowAllocator, meta, output, serializer);
|
|
@@ -4183,7 +4183,7 @@ public:
|
|
|
|
|
|
virtual bool process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieIndexGroupAggregateActivity ::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieIndexGroupAggregateActivity ::process");
|
|
|
Owned<IRowManager> rowManager = roxiemem::createRowManager(0, NULL, logctx, NULL, true); // MORE - should not really use default limits
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
|
|
@@ -4387,7 +4387,7 @@ public:
|
|
|
|
|
|
bool CRoxieFetchActivityBase::process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieFetchActivityBase::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieFetchActivityBase::process");
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
unsigned accepted = 0;
|
|
|
unsigned rejected = 0;
|
|
@@ -4797,7 +4797,7 @@ IRoxieSlaveActivity *CRoxieKeyedJoinIndexActivityFactory::createActivity(SlaveCo
|
|
|
|
|
|
bool CRoxieKeyedJoinIndexActivity::process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieKeyedJoinIndexActivity::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieKeyedJoinIndexActivity::process");
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
IOutputMetaData *joinFieldsMeta = helper->queryJoinFieldsRecordSize();
|
|
|
Owned<IEngineRowAllocator> joinFieldsAllocator = getRowAllocator(joinFieldsMeta, basefactory->queryId());
|
|
@@ -5088,7 +5088,7 @@ public:
|
|
|
|
|
|
bool CRoxieKeyedJoinFetchActivity::process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieKeyedJoinFetchActivity::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieKeyedJoinFetchActivity::process");
|
|
|
// MORE - where we are returning everything there is an optimization or two to be had
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
unsigned processed = 0;
|
|
@@ -5228,7 +5228,7 @@ public:
|
|
|
|
|
|
virtual bool process()
|
|
|
{
|
|
|
- MTIME_SECTION(timer, "CRoxieRemoteActivity ::process");
|
|
|
+ MTIME_SECTION(queryActiveTimer(), "CRoxieRemoteActivity ::process");
|
|
|
|
|
|
Owned<IMessagePacker> output = ROQ->createOutputStream(packet->queryHeader(), false, logctx);
|
|
|
unsigned __int64 rowLimit = remoteHelper->getRowLimit();
|