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

Jump to bottom

HPCC-32250 Track PeakTempSize for all activities that use lookahead #18895

Closed
wants to merge 1 commit into from
Closed

HPCC-32250 Track PeakTempSize for all activities that use lookahead #18895

wants to merge 1 commit into from

Conversation

shamser
Copy link
Contributor

@shamser shamser commented Jul 18, 2024 •
edited
Loading

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32250

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

@shamser shamser marked this pull request as ready for review July 19, 2024 09:09
@shamser shamser requested a review from jakesmith July 19, 2024 09:09
jakesmith
jakesmith requested changes Jul 19, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shamser - please see comments.

I do wonder whether we shouldn't just add spilling stats to the base activity stats.
The downside, mergeStats will walk over stats in the mapping, and query them, in activities that never used them, unnecessarily.
The upside, cleaner code, future changes won't have to keep these common attributes in sync.

@ghalliday - what's your thoughts? is the overhead of cycling through a few unused stat. kinds an issue. NB: in general there will be many stats that are are used I suspect. We could also think about optimizing mergeStats/tracking the stats that have been used..

thorlcr/activities/choosesets/thchoosesets.cpp
@@ -34,7 +34,7 @@ class CChooseSetsActivityMaster : public CMasterActivity
CActivityBase *createChooseSetsActivityMaster(CMasterGraphElement *container)
{
if (container->queryLocalOrGrouped())
return new CMasterActivity(container);
return new CMasterActivity(container, spillingActivityStatistics);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be other way around, i.e. spillingActivityStatistics should be on the line below.
The local/grouped version (LocalChooseSetsActivity) does not use a lookahead, the global one does.

Copy link
Member

@ghalliday ghalliday Jul 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be simpler for all variants to use spilling stats.

thorlcr/activities/countproject/thcountproject.cpp
@@ -34,7 +34,7 @@ class CountProjectActivityMaster : public CMasterActivity
CActivityBase *createCountProjectActivityMaster(CMasterGraphElement *container)
{
if (container->queryLocalOrGrouped())
return new CMasterActivity(container);
return new CMasterActivity(container, spillingActivityStatistics);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as per previous comment, the global one uses a lookahead, not the local/grouped version

thorlcr/activities/enth/thenth.cpp
@@ -37,7 +37,7 @@ class CEnthActivityMaster : public CMasterActivity
CActivityBase *createEnthActivityMaster(CMasterGraphElement *container)
{
if (container->queryLocalOrGrouped())
return new CMasterActivity(container);
return new CMasterActivity(container, spillingActivityStatistics);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as per last comment.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in fact - both local and global Enth may use a lookahead, but I don't think localenth should - I will open a separate JIRA to change it - for now it is better to mirror how it's implemented and ensure spillingActivityStatistics used for both (as it is in worker impl.)

thorlcr/activities/firstn/thfirstn.cpp
@@ -89,7 +89,7 @@ CriticalSection CFirstNActivityMaster::singlefirstnterm;
CActivityBase *createFirstNActivityMaster(CMasterGraphElement *container)
{
if (container->queryLocalOrGrouped())
return new CMasterActivity(container);
return new CMasterActivity(container, spillingActivityStatistics);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as per previous comments. The local version doesn't use a lookahead. The global does.

thorlcr/activities/iterate/thiterate.cpp
@@ -34,7 +34,7 @@ class CIterateActivityMaster : public CMasterActivity
CActivityBase *createIterateActivityMaster(CMasterGraphElement *container)
{
if (container->queryLocalOrGrouped())
return new CMasterActivity(container);
return new CMasterActivity(container, spillingActivityStatistics);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as per previous comments. The local version doesn't use a lookahead. The global does.

thorlcr/activities/selectnth/thselectnth.cpp
@@ -35,7 +35,7 @@ class CSelectNthActivityMaster : public CMasterActivity
CActivityBase *createSelectNthActivityMaster(CMasterGraphElement *container)
{
if (container->queryLocalOrGrouped())
return new CMasterActivity(container);
return new CMasterActivity(container, spillingActivityStatistics);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as per previous comments. The local version doesn't use a lookahead. The global does.

@jakesmith jakesmith requested a review from ghalliday July 23, 2024 15:15
ghalliday
ghalliday reviewed Jul 24, 2024
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jakesmith I agree with your comments.

thorlcr/activities/choosesets/thchoosesetsslave.cpp
@@ -30,7 +30,7 @@ class BaseChooseSetsActivity : public CSlaveActivity
unsigned *tallies;

public:
BaseChooseSetsActivity(CGraphElementBase *_container) : CSlaveActivity(_container)
BaseChooseSetsActivity(CGraphElementBase *_container, const StatisticsMapping & _mapping = basicActivityStatistics) : CSlaveActivity(_container, _mapping)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clearer/safer to not have a default parameter so it is easy to check the correct mapping is being used for all variants.

thorlcr/activities/firstn/thfirstnslave.cpp
@@ -35,7 +35,7 @@ class CFirstNSlaveBase : public CSlaveActivity
IHThorFirstNArg *helper;

public:
CFirstNSlaveBase(CGraphElementBase *_container) : CSlaveActivity(_container)
CFirstNSlaveBase(CGraphElementBase *_container, const StatisticsMapping & _mapping = basicActivityStatistics) : CSlaveActivity(_container, _mapping)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

similar comment to above about not using a default parameter

thorlcr/thorutil/thormisc.cpp
@@ -79,15 +79,15 @@ const StatisticsMapping basicActivityStatistics({StTimeTotalExecute, StTimeLocal
const StatisticsMapping groupActivityStatistics({StNumGroups, StNumGroupMax}, basicActivityStatistics);
const StatisticsMapping indexReadFileStatistics({}, diskReadRemoteStatistics, jhtreeCacheStatistics);
const StatisticsMapping indexReadActivityStatistics({StNumRowsProcessed}, indexReadFileStatistics, basicActivityStatistics);
const StatisticsMapping indexWriteActivityStatistics({StPerReplicated, StNumLeafCacheAdds, StNumNodeCacheAdds, StNumBlobCacheAdds }, basicActivityStatistics, diskWriteRemoteStatistics);
const StatisticsMapping indexWriteActivityStatistics({StPerReplicated, StNumLeafCacheAdds, StNumNodeCacheAdds, StNumBlobCacheAdds }, spillingActivityStatistics, basicActivityStatistics, diskWriteRemoteStatistics);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spillingActivityStatistics -> spillStatistics

@ghalliday
Copy link
Member

Replaced by #18920

@ghalliday ghalliday closed this Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghalliday ghalliday ghalliday left review comments

@jakesmith jakesmith jakesmith requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shamser @ghalliday @jakesmith