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-30939 Suppress TLK jhtree stats. #18094

Merged
merged 1 commit into from
Dec 14, 2023
Merged

HPCC-30939 Suppress TLK jhtree stats. #18094

merged 1 commit into from
Dec 14, 2023

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Nov 29, 2023 •
edited
Loading

Avoid conflating the jhtree stats from TLK contexts with stats. from regular index parts.
Motivataion: the TLK is very different from other parts, and typically stays in memory,
if the TLK jhtree stats are merged into the same report as regular index part stats,
the results are misleading.

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:

@jakesmith jakesmith force-pushed the HPCC-30939-suppress-tlk-stats branch from c848f18 to eeeda52 Compare December 5, 2023 17:45
@jakesmith jakesmith requested a review from ghalliday December 6, 2023 10:00
@jakesmith
Copy link
Member Author

@ghalliday - left in draft form for now, and as 4 commits. Please review/comment.

@ghalliday
Copy link
Member

@jakesmith Even though it is a draft PR it is worth giving the PR a good title in the correct format, otherwise it isn't linked to the jira. You should also fill in the check boxes - so it is a bit clearer what state the PR is in.

ghalliday
ghalliday reviewed Dec 6, 2023
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.

Looks good. A couple of minor comments on naming.

system/jhtree/jhtree.cpp Outdated
@@ -351,6 +351,8 @@ class jhtree_decl CKeyLevelManager : implements IKeyManager, public CInterface
{
protected:
KeyStatsCollector stats;
KeyStatsCollector nullStats;
KeyStatsCollector *conditionalStats = nullptr;
Copy link
Member

Choose a reason for hiding this comment

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

conditionalStats isn't a great name - it begs the question what is it conditional all. Maybe activeStats or another variant.

system/jhtree/jhtree.cpp Outdated
@@ -1042,6 +1041,28 @@ void CKeyStore::clearCacheEntry(const IFileIO *io)
}
}

//

static void noteCLSeeks(IContextLogger *ctx, unsigned lseeks, unsigned lscans, unsigned lwildseeks)
Copy link
Member

Choose a reason for hiding this comment

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

Trivial: Do these need CL in the name (I didn't immediately understand what it meant).

@jakesmith jakesmith force-pushed the HPCC-30939-suppress-tlk-stats branch from eeeda52 to 9b0b7ee Compare December 8, 2023 14:48
@jakesmith jakesmith changed the title wip HPCC-30939 Suppress TLK jhtree stats. Dec 8, 2023
@jakesmith jakesmith force-pushed the HPCC-30939-suppress-tlk-stats branch from 9b0b7ee to a74b3d6 Compare December 8, 2023 14:49
@jakesmith jakesmith marked this pull request as ready for review December 8, 2023 14:50
@jakesmith jakesmith requested a review from ghalliday December 8, 2023 14:51
ghalliday
ghalliday approved these changes Dec 11, 2023
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 please squash

@jakesmith
HPCC-30939 Suppress TLK jhtree stats.
eb6567e 
Avoid conflating the jhtree stats from TLK contexts with stats.
from regular index parts.
Motivataion: the TLK is very different from other parts, and
typically stays in memory, if the TLK jhtree stats are merged into
the same report as regular index part stats, the results are
misleading.

Signed-off-by: Jake Smith <[email protected]>
@jakesmith jakesmith force-pushed the HPCC-30939-suppress-tlk-stats branch from a74b3d6 to eb6567e Compare December 11, 2023 15:04
@jakesmith
Copy link
Member Author

@ghalliday - squashed

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

@ghalliday ghalliday ghalliday 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.
2 participants
@jakesmith @ghalliday