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

Correct some accidental renames #778

Closed
wants to merge 1 commit into from

Conversation

bjchambers
Copy link
Contributor

Be sure to do all of the following to help us incorporate your contribution
quickly and easily:

  • [*] Make sure the PR title is formatted like:
    [BEAM-<Jira issue #>] Description of pull request
  • [*] Make sure tests pass via mvn clean verify. (Even better, enable
    Travis-CI on your fork and ensure the whole test matrix passes).
  • [*] Replace <Jira issue #> in the title with the actual Jira issue
    number, if there is one.
  • [*] If this contribution is large, please file an Apache
    Individual Contributor License Agreement.

IDE over-eagerly replaced some occurrences of createAggregator with
createAggregatorForDoFn. This corrects that.

@bjchambers
Copy link
Contributor Author

R: @tgroh @dhalperi

@tgroh
Copy link
Member

tgroh commented Aug 3, 2016

LGTM.

@@ -81,15 +81,15 @@
* <p>This method is called to create an aggregator for a {@link DoFn}. It receives the class
* of the {@link DoFn} being executed and the context of the step it is being executed in.
*/
<InputT, AccumT, OutputT> Aggregator<InputT, OutputT> createAggregatorForDoFn(
<InputT, AccumT, OutputT> Aggregator<InputT, OutputT> createAggregator(
Copy link
Contributor

Choose a reason for hiding this comment

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

this one needs revert I believe.

@dhalperi
Copy link
Contributor

dhalperi commented Aug 4, 2016

Also now needs a merge on top of Kenn's magic.

@bjchambers
Copy link
Contributor Author

Rebased.

@dhalperi
Copy link
Contributor

Build failing:

[ERROR] COMPILATION ERROR : 
[INFO] -------------------------------------------------------------
[ERROR] /home/jenkins/jenkins-slave/workspace/beam_PreCommit_MavenVerify/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CounterAggregator.java:[43,18] org.apache.beam.sdk.util.CounterAggregator.CounterAggregatorFactory is not abstract and does not override abstract method <InputT,AccumT,OutputT>createAggregator(java.lang.Class<?>,org.apache.beam.sdk.util.ExecutionContext.StepContext,java.lang.String,org.apache.beam.sdk.transforms.Combine.CombineFn<InputT,AccumT,OutputT>) in org.apache.beam.sdk.transforms.Aggregator.AggregatorFactory
[ERROR] /home/jenkins/jenkins-slave/workspace/beam_PreCommit_MavenVerify/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CounterAggregator.java:[50,5] method does not override or implement a method from a supertype
[INFO] 2 errors 

@dhalperi
Copy link
Contributor

Build still failing:

[ERROR] COMPILATION ERROR : 
[INFO] -------------------------------------------------------------
[ERROR] /home/jenkins/jenkins-slave/workspace/beam_PreCommit_MavenVerify/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java:[348,31] cannot find symbol
  symbol:   method createAggregatorForDoFn(java.lang.Class<capture#1 of ? extends org.apache.beam.sdk.transforms.OldDoFn>,org.apache.beam.sdk.util.ExecutionContext.StepContext,java.lang.String,org.apache.beam.sdk.transforms.Combine.CombineFn<AggInputT,capture#2 of ?,AggOutputT>)
  location: variable aggregatorFactory of type org.apache.beam.sdk.transforms.Aggregator.AggregatorFactory
[INFO] 1 error

@dhalperi
Copy link
Contributor

Still pending, looks like?

IDE over-eagerly replaced some occurrences of createAggregator with
createAggregatorForDoFn. This corrects that.
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.

None yet

3 participants