Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-32937 Capture and report lookahead for FetchActivity #19266

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions thorlcr/activities/fetch/thfetchslave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class CFetchStream : public IRowStream, implements IStopInput, implements IFetch
bool abortSoon;
mptag_t tag;
Owned<IRowStream> keyOutStream;
CActivityBase &owner;
CSlaveActivity &owner;
Linked<IThorRowInterfaces> keyRowIf, fetchRowIf;
StringAttr logicalFilename;

Expand Down Expand Up @@ -124,7 +124,7 @@ class CFetchStream : public IRowStream, implements IStopInput, implements IFetch
public:
IMPLEMENT_IINTERFACE_USING(CSimpleInterface);

CFetchStream(CActivityBase &_owner, IThorRowInterfaces *_keyRowIf, IThorRowInterfaces *_fetchRowIf, bool &_abortSoon, const char *_logicalFilename, CPartDescriptorArray &_parts, unsigned _offsetCount, size32_t offsetMapSz, const void *offsetMap, IFetchHandler *_iFetchHandler, mptag_t _tag, IExpander *_eexp)
CFetchStream(CSlaveActivity &_owner, IThorRowInterfaces *_keyRowIf, IThorRowInterfaces *_fetchRowIf, bool &_abortSoon, const char *_logicalFilename, CPartDescriptorArray &_parts, unsigned _offsetCount, size32_t offsetMapSz, const void *offsetMap, IFetchHandler *_iFetchHandler, mptag_t _tag, IExpander *_eexp)
: owner(_owner), keyRowIf(_keyRowIf), fetchRowIf(_fetchRowIf), abortSoon(_abortSoon), logicalFilename(_logicalFilename),
iFetchHandler(_iFetchHandler), offsetCount(_offsetCount), tag(_tag), eexp(_eexp)
{
Expand Down Expand Up @@ -220,7 +220,11 @@ class CFetchStream : public IRowStream, implements IStopInput, implements IFetch

for (;;)
{
OwnedConstThorRow keyRec = keyOutStream->nextRow(); // is this right?
OwnedConstThorRow keyRec;
{
LookAheadTimer t(owner.getActivityTimerAccumulator(), owner.queryTimeActivities());
keyRec.setown(keyOutStream->nextRow()); // is this right?
}
if (!keyRec)
break;

Expand Down
Loading