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.

Sign up for GitHub

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-32922 Capture lookahead timings for join and keyedjoin activities #19255

Merged
merged 1 commit into from
Nov 18, 2024
Merged

HPCC-32922 Capture lookahead timings for join and keyedjoin activities #19255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion thorlcr/activities/join/thjoinslave.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ class JoinSlaveActivity : public CSlaveActivity, implements ILookAheadStopNotify
{
try
{
LookAheadTimer t(slaveTimerStats, timeActivities);
startInput(secondaryInputIndex);

if (ensureStartFTLookAhead(secondaryInputIndex))
{
IThorDataLink *secondaryInput = queryInput(secondaryInputIndex);
Expand Down
13 changes: 9 additions & 4 deletions thorlcr/activities/keyedjoin/thkeyedjoinslave.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2675,13 +2675,18 @@ class CKeyedJoinSlave : public CSlaveActivity, implements IJoinProcessor, implem
{
if (queryAbortSoon())
break;
OwnedConstThorRow lhsRow = inputStream->nextRow();
if (!lhsRow)
OwnedConstThorRow lhsRow;
{
groupStart = nullptr; // NB: only ever set if preserveGroups on
LookAheadTimer t(slaveTimerStats, timeActivities);

lhsRow.setown(inputStream->nextRow());
if (!lhsRow)
break;
{
groupStart = nullptr; // NB: only ever set if preserveGroups on
lhsRow.setown(inputStream->nextRow());
if (!lhsRow)
break;
}
}
Linked<CJoinGroup> jg;
if (helper->leftCanMatch(lhsRow))
Expand Down
Loading