Implement Aggregators directly in the DirectRunner #735
Conversation
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
bjchambers
force-pushed
the
direct-runner-aggregators
branch
from
208c79b
to
3cdaef3
Compare
| StepContext stepContext, | ||
| CounterSet.AddCounterMutator addCounterMutator, | ||
| WindowingStrategy<?, ?> windowingStrategy) { | ||
| return simpleRunner(options, fn, sideInputReader, outputManager, |
|
Done. PTAL. |
| @@ -82,7 +86,8 @@ public String getName() { | |||
| } | |||
| } | |||
|
|
|||
| private final HashMap<String, AggregatorInfo<?, ?, ?>> accumulators = new HashMap<>(); | |||
| private final ConcurrentHashMap<String, AggregatorInfo<?, ?, ?>> accumulators = | |||
|
Otherwise LGTM |
|
Will wait for tests to turn green and then I'd like to submit. @kennknowles any comments? |
bjchambers
force-pushed
the
direct-runner-aggregators
branch
from
ec43e7b
to
d6cd936
Compare
|
LGTM when green. |
bjchambers
force-pushed
the
direct-runner-aggregators
branch
from
d6cd936
to
1e85f20
Compare
| return new CounterAggregator<>(generateInternalAggregatorName(name), | ||
| combiner, addCounterMutator); | ||
| checkNotNull(combiner, "Combiner passed to createAggregator cannot be null"); | ||
| return aggregatorFactory.createAggregator(name, combiner); |
There was a problem hiding this comment.
This should be aggregatorFactory.createAggregator(generateInternalAggregatorName(name), combiner); to ensure we associate each aggregator with the current step context.
added 2 commits
July 28, 2016 13:50
Previously, we relied on conversion to Counter rather than just running the specified CombineFn. This aligns the direct runner more closely with the model. This PR also parameterizes DoFnRunner on an AggregatorFactory to implement aggregators, allowing each runner to provide the appropriate implementation.
bjchambers
force-pushed
the
direct-runner-aggregators
branch
from
fdb7d71
to
4199b11
Compare
|
Updated to actually make sure that aggregators are properly scoped per-step. PTAL. |
| checkNotNull(combiner, "Combiner passed to createAggregator cannot be null"); | ||
| return aggregatorFactory.createAggregator(name, combiner); | ||
| checkNotNull(combiner, "Combiner passed to createAggregatorForDoFn cannot be null"); | ||
| boolean isSystemDoFn = fn.getClass().isAnnotationPresent(SystemDoFnInternal.class); |
|
Running |
pl04351820
pushed a commit
to pl04351820/beam
that referenced
this pull request
Dec 20, 2023
* chore: Update gapic-generator-python to v1.11.4 PiperOrigin-RevId: 547897126 Source-Link: googleapis/googleapis@c09c75e Source-Link: https://github.com/googleapis/googleapis-gen/commit/45e0ec4343517cd0aa66b5ca64232a1802c2f945 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDVlMGVjNDM0MzUxN2NkMGFhNjZiNWNhNjQyMzJhMTgwMmMyZjk0NSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Be sure to do all of the following to help us incorporate your contribution
quickly and easily:
[BEAM-<Jira issue #>] Description of pull requestmvn clean verify. (Even better, enableTravis-CI on your fork and ensure the whole test matrix passes).
<Jira issue #>in the title with the actual Jira issuenumber, if there is one.
Individual Contributor License Agreement.