-
Notifications
You must be signed in to change notification settings - Fork 303
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-32933 Fix execute timings for loop activity #19264
Open
shamser
wants to merge
2
commits into
hpcc-systems:master
Choose a base branch
from
shamser:issue32933
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -297,20 +297,23 @@ class CLoopSlaveActivity : public CLoopSlaveActivityBase | |
} | ||
const void *getNextRow(bool stopping) | ||
{ | ||
ActivityTimer t(slaveTimerStats, timeActivities); | ||
if (!abortSoon && !eof) | ||
{ | ||
unsigned emptyIterations = 0; | ||
while (!abortSoon) | ||
{ | ||
while (!abortSoon) | ||
{ | ||
OwnedConstThorRow ret = (void *)curInput->nextRow(); | ||
if (!ret) | ||
OwnedConstThorRow ret; | ||
{ | ||
ret.setown(curInput->nextRow()); // more cope with groups somehow.... | ||
LookAheadTimer t(slaveTimerStats, timeActivities); | ||
ret.setown(curInput->nextRow()); | ||
if (!ret) | ||
break; | ||
{ | ||
ret.setown(curInput->nextRow()); // more cope with groups somehow.... | ||
if (!ret) | ||
break; | ||
} | ||
} | ||
|
||
if (finishedLooping || | ||
|
@@ -439,6 +442,7 @@ class CLoopSlaveActivity : public CLoopSlaveActivityBase | |
} | ||
CATCH_NEXTROW() | ||
{ | ||
ActivityTimer t(slaveTimerStats, timeActivities); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this change looks correct in principle, but in practice, unless the lookahead time that is being performed by the feeder, the timing calculation may well be more inaccurate. |
||
return nextRowFeeder->nextRow(); | ||
} | ||
virtual void stop() override | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hm, I think it's a bit more nuanced than this.
curInput is only the inputStream initially.. it then changes, the 2nd iteration of the loop, is not processing the input, but the result of the previous iteration. As it stands if it's doing many iterations, it will count it all against look ahead time.
I think you need to set a flag and only do until curInput changes.