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.

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

Fix configuration handling during MergeRollupTask execution #14856

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

davecromberge
Copy link
Member

Aggregation function parameters and dimensions to erase were being extracted directly from the task configuration without prepending the merge level key.

For example, the task config is encoded by the Task generator as follows:

   "hourly.keyA":  "some value",
   "hourly.keyB": "some other value",
   "mergeLevel": "hourly"

Any lookups on the configuration during task execution have to include the mergeLevel prefix in order to resolve lookups correctly.

There were three options in trying to address this bugfix:

  1. Change the encoding of the task config - TaskGenerator would need to strip out the merge level prefix and thus make it easier for key extraction. Problem is that this could break existing functionality.
  2. Re-encode all keys without the prefix in the task config. This would bloat the config.
  3. Include the merge level prefix in any key lookups - this approach is followed in this PR.

This PR should be tagged with bugfix

Aggregation function parameters and dimensions to erase were being
extracted directly from the task configuration without prepending the
merge level key.
}
return aggregationFunctionParameters;
}

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 has been moved to the MergeRollupTaskUtils helper because it is unique to MergeRollup.

@codecov-commenter
Copy link

codecov-commenter commented Jan 21, 2025

Codecov Report

Attention: Patch coverage is 96.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 63.80%. Comparing base (59551e4) to head (5bc1434).
Report is 1605 commits behind head on master.

Files with missing lines Patch % Lines
...minion/tasks/mergerollup/MergeRollupTaskUtils.java 95.65% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##             master   #14856      +/-   ##
============================================
+ Coverage     61.75%   63.80%   +2.05%     
- Complexity      207     1473    +1266     
============================================
  Files          2436     2708     +272     
  Lines        133233   151324   +18091     
  Branches      20636    23360    +2724     
============================================
+ Hits          82274    96557   +14283     
- Misses        44911    47508    +2597     
- Partials       6048     7259    +1211     
Flag Coverage Δ
custom-integration1 100.00% <ø> (+99.99%) ⬆️
integration 100.00% <ø> (+99.99%) ⬆️
integration1 100.00% <ø> (+99.99%) ⬆️
integration2 0.00% <ø> (ø)
java-11 63.70% <96.00%> (+1.99%) ⬆️
java-21 63.70% <96.00%> (+2.07%) ⬆️
skip-bytebuffers-false 63.80% <96.00%> (+2.06%) ⬆️
skip-bytebuffers-true 63.59% <96.00%> (+35.87%) ⬆️
temurin 63.80% <96.00%> (+2.05%) ⬆️
unittests 63.80% <96.00%> (+2.05%) ⬆️
unittests1 56.28% <ø> (+9.39%) ⬆️
unittests2 34.11% <96.00%> (+6.38%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants