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-30949 Ensure that duplicate statistics are not added to a CStatsCollection #18097

Merged
merged 1 commit into from
Dec 7, 2023
Merged

HPCC-30949 Ensure that duplicate statistics are not added to a CStatsCollection #18097

merged 1 commit into from
Dec 7, 2023

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Nov 30, 2023 •
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:

ghalliday
ghalliday commented Nov 30, 2023
View reviewed changes
system/jlib/jstats.cpp Outdated
@@ -1919,6 +1919,10 @@ class CStatisticCollection : public CInterfaceOf<IStatisticCollection>
//other public interface functions
void addStatistic(StatisticKind kind, unsigned __int64 value)
{
#if 1 //def _DEBUG
Copy link
Member Author

Choose a reason for hiding this comment

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

This will be debug only in the final PR - pushed to run the full regression suite.

Copy link
Contributor

Choose a reason for hiding this comment

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

It would be useful to have a comment to say that addStatistic shouldn't ever add the same kind multiple times.

Copy link
Member Author

Choose a reason for hiding this comment

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

I agree. I'll add one when I change the #if

@github-actions GitHub Actions
Copy link

https://track.hpccsystems.com/browse/HPCC-30949
Jira updated

@ghalliday ghalliday requested a review from shamser December 1, 2023 08:49
shamser
shamser approved these changes Dec 1, 2023
View reviewed changes
Copy link
Contributor

@shamser shamser left a comment

Choose a reason for hiding this comment

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

I think a comment on addStatistic would be useful.

system/jlib/jstats.cpp Outdated
@@ -1919,6 +1919,10 @@ class CStatisticCollection : public CInterfaceOf<IStatisticCollection>
//other public interface functions
void addStatistic(StatisticKind kind, unsigned __int64 value)
{
#if 1 //def _DEBUG
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be useful to have a comment to say that addStatistic shouldn't ever add the same kind multiple times.

@ghalliday ghalliday requested a review from shamser December 1, 2023 14:07
@ghalliday
Copy link
Member Author

@shamser please sanity check the comments and the change to the #if

shamser
shamser reviewed Dec 1, 2023
View reviewed changes
system/jlib/jstats.cpp Outdated
@@ -1917,8 +1917,15 @@ class CStatisticCollection : public CInterfaceOf<IStatisticCollection>
}

//other public interface functions
// addStatstic should only be used if it is known that the kind is not already there
Copy link
Contributor

Choose a reason for hiding this comment

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

minor: spelling addStatistic

shamser
shamser reviewed Dec 1, 2023
View reviewed changes
roxie/ccd/ccdserver.cpp
}
virtual void addStatistic(StatisticKind kind, unsigned __int64 value) override
{
//Always merge rather than updating
Copy link
Contributor

Choose a reason for hiding this comment

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

minor: merge rather than "add"

shamser
shamser approved these changes Dec 1, 2023
View reviewed changes
Copy link
Contributor

@shamser shamser left a comment

Choose a reason for hiding this comment

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

Couple of minors related to comments.

richardkchapman
richardkchapman approved these changes Dec 4, 2023
View reviewed changes
Copy link
Member

@richardkchapman richardkchapman left a comment

Choose a reason for hiding this comment

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

Looks plausible

@ghalliday
Copy link
Member Author

Fixed comments and force pushed.

@ghalliday ghalliday merged commit 953ba17 into hpcc-systems:candidate-9.4.x Dec 7, 2023
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shamser shamser shamser approved these changes

@richardkchapman richardkchapman richardkchapman approved these 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
@ghalliday @richardkchapman @shamser