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

Enable flink dependency enforcement and make dependencies explicit #2549

Closed
wants to merge 3 commits into from

Conversation

iemejia
Copy link
Member

@iemejia iemejia commented Apr 16, 2017

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.

@iemejia
Copy link
Member Author

iemejia commented Apr 16, 2017

R: @aljoscha

<!--
Force an upgrade on the version of Apache Commons from Flink to support DEFLATE compression.
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>[1.9,)</version>
<scope>runtime</scope>
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 hesitated to put this in test, but not sure after reading the comment. Do you think that runtime still do the trick.

@@ -46,7 +45,7 @@ public State getState() {
throws AggregatorRetrievalException {
throw new AggregatorRetrievalException(
"Accumulators can't be retrieved for detached Job executions.",
new NotImplementedException());
new UnsupportedOperationException());
Copy link
Member Author

@iemejia iemejia Apr 16, 2017

Choose a reason for hiding this comment

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

I did this so we don't need the extra commons lang dependency for something so simple as this.

@@ -38,7 +38,7 @@
import org.apache.beam.sdk.util.WindowingStrategy;
import org.apache.beam.sdk.values.PCollectionView;
import org.apache.beam.sdk.values.TupleTag;
import org.apache.commons.lang.SerializationUtils;
import org.apache.commons.lang3.SerializationUtils;
Copy link
Member Author

Choose a reason for hiding this comment

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

And I moved this to use commons lang3 to align with other modules and beam-parent.
Notice that the scope is only test, so no issues.


<build>
<plugins>
<plugin>
Copy link
Member Author

Choose a reason for hiding this comment

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

clean ups, this is all inherited now from the parent.

@iemejia
Copy link
Member Author

iemejia commented Apr 16, 2017

Run Flink ValidatesRunner

@iemejia
Copy link
Member Author

iemejia commented Apr 16, 2017

Run Flink ValidatesRunner

@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 70.659% when pulling 89d82a1 on iemejia:fix-flink-deps into f7d727c on apache:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.003%) to 70.652% when pulling 89d82a1 on iemejia:fix-flink-deps into f7d727c on apache:master.

@aljoscha
Copy link
Contributor

I created https://issues.apache.org/jira/browse/BEAM-1993 and https://issues.apache.org/jira/browse/BEAM-1994. Would you be interested in working on these? They simply remove code and restructure the modules. I'm asking because it would affect this PR.

@iemejia
Copy link
Member Author

iemejia commented Apr 18, 2017

Sure I will take both if you don't mind after this one gets merged.

Copy link
Contributor

@aljoscha aljoscha left a comment

Choose a reason for hiding this comment

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

LGTM modulo the comment about flink-annotations.


<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-annotations</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is only needed because EncodedValueTypeInformation.java has @PublicEvolving annotations, which it shouldn't have. If you remove those then you don't need this dependency.

@iemejia
Copy link
Member Author

iemejia commented Apr 18, 2017

Run Flink ValidatesRunner

@@ -18,7 +18,6 @@
package org.apache.beam.runners.flink.translation.types;

import org.apache.beam.sdk.coders.Coder;
import org.apache.flink.annotation.PublicEvolving;
Copy link
Member Author

@iemejia iemejia Apr 18, 2017

Choose a reason for hiding this comment

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

This was removed to stop needing the flink-annotation dependency as suggested during the PR review..

@coveralls
Copy link

coveralls commented Apr 18, 2017

Coverage Status

Coverage increased (+22.0%) to 92.625% when pulling 8c5778e on iemejia:fix-flink-deps into f7d727c on apache:master.

@aljoscha
Copy link
Contributor

Yep, this still LGTM!

@asfgit asfgit closed this in fac4f3e Apr 18, 2017
@iemejia iemejia deleted the fix-flink-deps branch April 18, 2017 14:15
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