You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2021/06/14 08:05:16 UTC
[GitHub] [druid] xvrl opened a new pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
xvrl opened a new pull request #11363:
URL: https://github.com/apache/druid/pull/11363
- upgrade error-prone to 2.7.1
- support running error-prone with Java 11 and above using -Xplugin
instead of custom compiler
- add compiler arguments to ignore warnings/errors in Java 15/16
- introduce strictCompile property to enable strict profiles since we
now need multiple strict profiles for Java 8
- properly exclude all generated source files from error-prone
- fix druid-processing overriding annotation processors from parent pom
- fix druid-core disabling most non-default checks
- align plugin and annotation errorprone versions
- fix / suppress additional issues found by error-prone:
* fix bug in SeekableStreamSupervisor initializing ArrayList size with
the taskGroupdId
* fix missing @Override annotations
- remove outdated compiler plugin in benchmarks
- remove deleted ParameterPackage error-prone rule
<!-- Thanks for trying to help us make Apache Druid be the best it can be! Please fill out as much of the following information as is possible (where relevant, and remove it when irrelevant) to help make the intention and scope of this PR clear in order to ease review. -->
<!-- Please read the doc for contribution (https://github.com/apache/druid/blob/master/CONTRIBUTING.md) before making this PR. Also, once you open a PR, please _avoid using force pushes and rebasing_ since these make it difficult for reviewers to see what you've changed in response to their reviews. See [the 'If your pull request shows conflicts with master' section](https://github.com/apache/druid/blob/master/CONTRIBUTING.md#if-your-pull-request-shows-conflicts-with-master) for more details. -->
Fixes #XXXX.
<!-- Replace XXXX with the id of the issue fixed in this PR. Remove this section if there is no corresponding issue. Don't reference the issue in the title of this pull-request. -->
<!-- If you are a committer, follow the PR action item checklist for committers:
https://github.com/apache/druid/blob/master/dev/committer-instructions.md#pr-and-issue-action-item-checklist-for-committers. -->
### Description
<!-- Describe the goal of this PR, what problem are you fixing. If there is a corresponding issue (referenced above), it's not necessary to repeat the description here, however, you may choose to keep one summary sentence. -->
<!-- Describe your patch: what did you change in code? How did you fix the problem? -->
<!-- If there are several relatively logically separate changes in this PR, create a mini-section for each of them. For example: -->
#### Fixed the bug ...
#### Renamed the class ...
#### Added a forbidden-apis entry ...
<!--
In each section, please describe design decisions made, including:
- Choice of algorithms
- Behavioral aspects. What configuration values are acceptable? How are corner cases and error conditions handled, such as when there are insufficient resources?
- Class organization and design (how the logic is split between classes, inheritance, composition, design patterns)
- Method organization and design (how the logic is split between methods, parameters and return types)
- Naming (class, method, API, configuration, HTTP endpoint, names of emitted metrics)
-->
<!-- It's good to describe an alternative design (or mention an alternative name) for every design (or naming) decision point and compare the alternatives with the designs that you've implemented (or the names you've chosen) to highlight the advantages of the chosen designs and names. -->
<!-- If there was a discussion of the design of the feature implemented in this PR elsewhere (e. g. a "Proposal" issue, any other issue, or a thread in the development mailing list), link to that discussion from this PR description and explain what have changed in your final design compared to your original proposal or the consensus version in the end of the discussion. If something hasn't changed since the original discussion, you can omit a detailed discussion of those aspects of the design here, perhaps apart from brief mentioning for the sake of readability of this PR description. -->
<!-- Some of the aspects mentioned above may be omitted for simple and small changes. -->
<hr>
##### Key changed/added classes in this PR
* `MyFoo`
* `OurBar`
* `TheirBaz`
<hr>
<!-- Check the items by putting "x" in the brackets for the done things. Not all of these items apply to every PR. Remove the items which are not done or not relevant to the PR. None of the items from the checklist below are strictly necessary, but it would be very helpful if you at least self-review the PR. -->
This PR has:
- [ ] been self-reviewed.
- [ ] using the [concurrency checklist](https://github.com/apache/druid/blob/master/dev/code-review/concurrency.md) (Remove this item if the PR doesn't have any relation to concurrency.)
- [ ] added documentation for new or modified features or behaviors.
- [ ] added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
- [ ] added or updated version, license, or notice information in [licenses.yaml](https://github.com/apache/druid/blob/master/dev/license.md)
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold for [code coverage](https://github.com/apache/druid/blob/master/dev/code-review/code-coverage.md) is met.
- [ ] added integration tests.
- [ ] been tested in a test Druid cluster.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] gianm commented on pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
gianm commented on pull request #11363:
URL: https://github.com/apache/druid/pull/11363#issuecomment-861807256
Looks good to me, btw, other than the nits about comments and formatting and such.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] xvrl commented on a change in pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
xvrl commented on a change in pull request #11363:
URL: https://github.com/apache/druid/pull/11363#discussion_r652119258
##########
File path: core/src/main/java/org/apache/druid/crypto/CryptoService.java
##########
@@ -113,6 +113,7 @@ public CryptoService(
SecretKey tmp = getKeyFromPassword(passPhrase, salt);
SecretKey secret = new SecretKeySpec(tmp.getEncoded(), cipherAlgName);
+ @SuppressWarnings("InsecureCryptoUsage")
Review comment:
error-prone warns if the ciphers are not compile-time constants that it can inspect for insecure defaults.
In our case our defaults are secure, but I can add a comment if that helps.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] gianm commented on a change in pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
gianm commented on a change in pull request #11363:
URL: https://github.com/apache/druid/pull/11363#discussion_r652124736
##########
File path: core/src/main/java/org/apache/druid/crypto/CryptoService.java
##########
@@ -113,6 +113,7 @@ public CryptoService(
SecretKey tmp = getKeyFromPassword(passPhrase, salt);
SecretKey secret = new SecretKeySpec(tmp.getEncoded(), cipherAlgName);
+ @SuppressWarnings("InsecureCryptoUsage")
Review comment:
I think it'd be helpful, since the suppression looks scary.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] xvrl commented on a change in pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
xvrl commented on a change in pull request #11363:
URL: https://github.com/apache/druid/pull/11363#discussion_r652119716
##########
File path: core/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
##########
@@ -27,7 +27,7 @@
import java.util.Objects;
// logical operators live here
-
+@SuppressWarnings("ClassName")
Review comment:
right, and it also expects each class to be in its own file with the same name
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] xvrl commented on a change in pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
xvrl commented on a change in pull request #11363:
URL: https://github.com/apache/druid/pull/11363#discussion_r652150804
##########
File path: processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
##########
@@ -526,6 +526,7 @@ public int nextInt()
};
}
+ @SuppressWarnings("ReturnValueIgnored")
Review comment:
the annotation can only be put on a method or an assignment
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] xvrl commented on a change in pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
xvrl commented on a change in pull request #11363:
URL: https://github.com/apache/druid/pull/11363#discussion_r652150327
##########
File path: server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java
##########
@@ -152,9 +152,9 @@ public SinkQuerySegmentWalker(
final DataSourceAnalysis analysis = DataSourceAnalysis.forDataSource(query.getDataSource());
// Sanity check: make sure the query is based on the table we're meant to handle.
- analysis.getBaseTableDataSource()
- .filter(ds -> dataSource.equals(ds.getName()))
- .orElseThrow(() -> new ISE("Cannot handle datasource: %s", analysis.getDataSource()));
+ if (!analysis.getBaseTableDataSource().filter(ds -> dataSource.equals(ds.getName())).isPresent()) {
Review comment:
it was a fight between error-prone complaining about unused return values, and spotbugs complaining about `DLS_DEAD_LOCAL_STORE`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] gianm commented on a change in pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
gianm commented on a change in pull request #11363:
URL: https://github.com/apache/druid/pull/11363#discussion_r652113239
##########
File path: core/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
##########
@@ -27,7 +27,7 @@
import java.util.Objects;
// logical operators live here
-
+@SuppressWarnings("ClassName")
Review comment:
I guess the issue is there's no public class BinaryLogicalOperatorExpr?
I suppose that's strange, but fine.
##########
File path: core/src/main/java/org/apache/druid/crypto/CryptoService.java
##########
@@ -113,6 +113,7 @@ public CryptoService(
SecretKey tmp = getKeyFromPassword(passPhrase, salt);
SecretKey secret = new SecretKeySpec(tmp.getEncoded(), cipherAlgName);
+ @SuppressWarnings("InsecureCryptoUsage")
Review comment:
What's insecure about it? It is bad?
If it's not bad, it'd be good to have a comment here about why it's not bad.
##########
File path: pom.xml
##########
@@ -1777,75 +1778,101 @@
</plugin>
</plugins>
</build>
- </profile>
- <profile>
+ </profile>
+ <profile>
<id>strict</id>
+ <activation>
+ <property>
+ <name>strictCompile</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
<fork>true</fork>
<meminitial>1024m</meminitial>
<maxmem>3000m</maxmem>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<showWarnings>false</showWarnings>
<compilerArgs>
- <arg>-XepDisableWarningsInGeneratedCode</arg>
-
- <arg>-Xep:ClassCanBeStatic:ERROR</arg>
- <arg>-Xep:PreconditionsInvalidPlaceholder:ERROR</arg>
- <arg>-Xep:MissingOverride:ERROR</arg>
- <arg>-Xep:DefaultCharset:ERROR</arg>
- <arg>-Xep:QualifierOrScopeOnInjectMethod:ERROR</arg>
-
- <arg>-Xep:AssistedInjectAndInjectOnSameConstructor</arg>
- <arg>-Xep:AutoFactoryAtInject</arg>
- <arg>-Xep:ClassName</arg>
- <arg>-Xep:ComparisonContractViolated</arg>
- <arg>-Xep:DepAnn</arg>
- <arg>-Xep:DivZero</arg>
- <arg>-Xep:EmptyIf</arg>
- <arg>-Xep:InjectInvalidTargetingOnScopingAnnotation</arg>
- <arg>-Xep:InjectMoreThanOneQualifier</arg>
- <arg>-Xep:InjectScopeAnnotationOnInterfaceOrAbstractClass</arg>
- <arg>-Xep:InjectScopeOrQualifierAnnotationRetention</arg>
- <arg>-Xep:InjectedConstructorAnnotations</arg>
- <arg>-Xep:InsecureCryptoUsage</arg>
- <arg>-Xep:JMockTestWithoutRunWithOrRuleAnnotation</arg>
- <arg>-Xep:JavaxInjectOnFinalField</arg>
- <arg>-Xep:LockMethodChecker</arg>
- <arg>-Xep:LongLiteralLowerCaseSuffix</arg>
- <arg>-Xep:NoAllocation</arg>
- <arg>-Xep:NonRuntimeAnnotation</arg>
- <arg>-Xep:NumericEquality</arg>
- <arg>-Xep:ParameterPackage</arg>
- <arg>-Xep:ProtoStringFieldReferenceEquality</arg>
- <arg>-Xep:UnlockMethod</arg>
- </compilerArgs>
+ <arg>-XDcompilePolicy=simple</arg>
+ <!-- disable LongFloatConversion until https://github.com/google/error-prone/issues/2396 is fixed -->
+ <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/target/generated-(test-)?sources/.* -XepDisableWarningsInGeneratedCode -Xep:ClassCanBeStatic:ERROR -Xep:PreconditionsInvalidPlaceholder:ERROR -Xep:MissingOverride:ERROR -Xep:DefaultCharset:ERROR -Xep:QualifierOrScopeOnInjectMethod:ERROR -Xep:AssistedInjectAndInjectOnSameConstructor -Xep:AutoFactoryAtInject -Xep:ClassName -Xep:ComparisonContractViolated -Xep:DepAnn -Xep:DivZero -Xep:EmptyIf -Xep:InjectInvalidTargetingOnScopingAnnotation -Xep:InjectMoreThanOneQualifier -Xep:InjectScopeAnnotationOnInterfaceOrAbstractClass -Xep:InjectScopeOrQualifierAnnotationRetention -Xep:InjectedConstructorAnnotations -Xep:InsecureCryptoUsage -Xep:JMockTestWithoutRunWithOrRuleAnnotation -Xep:JavaxInjectOnFinalField -Xep:LockMethodChecker -Xep:LongLiteralLowerCaseSuffix -Xep:NoAllocation -Xep:NonRuntimeAnnotation -Xep:NumericEquality -Xep:ProtoStringFieldReferenceEquality -Xep:UnlockMethod -Xep:LongFloatConversion:OFF</arg>
Review comment:
If this still works when broken onto multiple lines, I think it'd be nice to do that, for readability's sake. The line is super long.
##########
File path: processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
##########
@@ -526,6 +526,7 @@ public int nextInt()
};
}
+ @SuppressWarnings("ReturnValueIgnored")
Review comment:
Will this suppression work if it's moved down to the single line `values.contains(null)`?
If not, consider adding a comment here about what line needs the ReturnValueIgnored suppression. It might not be obvious to people.
##########
File path: server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java
##########
@@ -152,9 +152,9 @@ public SinkQuerySegmentWalker(
final DataSourceAnalysis analysis = DataSourceAnalysis.forDataSource(query.getDataSource());
// Sanity check: make sure the query is based on the table we're meant to handle.
- analysis.getBaseTableDataSource()
- .filter(ds -> dataSource.equals(ds.getName()))
- .orElseThrow(() -> new ISE("Cannot handle datasource: %s", analysis.getDataSource()));
+ if (!analysis.getBaseTableDataSource().filter(ds -> dataSource.equals(ds.getName())).isPresent()) {
Review comment:
Fine 🙂
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] xvrl commented on a change in pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
xvrl commented on a change in pull request #11363:
URL: https://github.com/apache/druid/pull/11363#discussion_r652149196
##########
File path: pom.xml
##########
@@ -1777,75 +1778,101 @@
</plugin>
</plugins>
</build>
- </profile>
- <profile>
+ </profile>
+ <profile>
<id>strict</id>
+ <activation>
+ <property>
+ <name>strictCompile</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
<fork>true</fork>
<meminitial>1024m</meminitial>
<maxmem>3000m</maxmem>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<showWarnings>false</showWarnings>
<compilerArgs>
- <arg>-XepDisableWarningsInGeneratedCode</arg>
-
- <arg>-Xep:ClassCanBeStatic:ERROR</arg>
- <arg>-Xep:PreconditionsInvalidPlaceholder:ERROR</arg>
- <arg>-Xep:MissingOverride:ERROR</arg>
- <arg>-Xep:DefaultCharset:ERROR</arg>
- <arg>-Xep:QualifierOrScopeOnInjectMethod:ERROR</arg>
-
- <arg>-Xep:AssistedInjectAndInjectOnSameConstructor</arg>
- <arg>-Xep:AutoFactoryAtInject</arg>
- <arg>-Xep:ClassName</arg>
- <arg>-Xep:ComparisonContractViolated</arg>
- <arg>-Xep:DepAnn</arg>
- <arg>-Xep:DivZero</arg>
- <arg>-Xep:EmptyIf</arg>
- <arg>-Xep:InjectInvalidTargetingOnScopingAnnotation</arg>
- <arg>-Xep:InjectMoreThanOneQualifier</arg>
- <arg>-Xep:InjectScopeAnnotationOnInterfaceOrAbstractClass</arg>
- <arg>-Xep:InjectScopeOrQualifierAnnotationRetention</arg>
- <arg>-Xep:InjectedConstructorAnnotations</arg>
- <arg>-Xep:InsecureCryptoUsage</arg>
- <arg>-Xep:JMockTestWithoutRunWithOrRuleAnnotation</arg>
- <arg>-Xep:JavaxInjectOnFinalField</arg>
- <arg>-Xep:LockMethodChecker</arg>
- <arg>-Xep:LongLiteralLowerCaseSuffix</arg>
- <arg>-Xep:NoAllocation</arg>
- <arg>-Xep:NonRuntimeAnnotation</arg>
- <arg>-Xep:NumericEquality</arg>
- <arg>-Xep:ParameterPackage</arg>
- <arg>-Xep:ProtoStringFieldReferenceEquality</arg>
- <arg>-Xep:UnlockMethod</arg>
- </compilerArgs>
+ <arg>-XDcompilePolicy=simple</arg>
+ <!-- disable LongFloatConversion until https://github.com/google/error-prone/issues/2396 is fixed -->
+ <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/target/generated-(test-)?sources/.* -XepDisableWarningsInGeneratedCode -Xep:ClassCanBeStatic:ERROR -Xep:PreconditionsInvalidPlaceholder:ERROR -Xep:MissingOverride:ERROR -Xep:DefaultCharset:ERROR -Xep:QualifierOrScopeOnInjectMethod:ERROR -Xep:AssistedInjectAndInjectOnSameConstructor -Xep:AutoFactoryAtInject -Xep:ClassName -Xep:ComparisonContractViolated -Xep:DepAnn -Xep:DivZero -Xep:EmptyIf -Xep:InjectInvalidTargetingOnScopingAnnotation -Xep:InjectMoreThanOneQualifier -Xep:InjectScopeAnnotationOnInterfaceOrAbstractClass -Xep:InjectScopeOrQualifierAnnotationRetention -Xep:InjectedConstructorAnnotations -Xep:InsecureCryptoUsage -Xep:JMockTestWithoutRunWithOrRuleAnnotation -Xep:JavaxInjectOnFinalField -Xep:LockMethodChecker -Xep:LongLiteralLowerCaseSuffix -Xep:NoAllocation -Xep:NonRuntimeAnnotation -Xep:NumericEquality -Xep:ProtoStringFieldReferenceEquality -Xep:UnlockMethod -Xep:LongFloatConversion:OFF</arg>
Review comment:
unfortunately we cannot wrap arguments in JDK 8, it's only possible for JDK 9 and beyond see https://errorprone.info/docs/flags#maven
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] xvrl commented on pull request #11363: upgrade error-prone to 2.7.1 and support checks with Java 11+
Posted by GitBox <gi...@apache.org>.
xvrl commented on pull request #11363:
URL: https://github.com/apache/druid/pull/11363#issuecomment-861760035
@asdf2014 I see you gave a thumbs up, do you mind reviewing :) ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org