Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16427: Evaluate and fix errorprone rules - IdentityBinaryExpression

Kevin Risden26195c824934
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index e5cf063dc8a..b160b36909c 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -80,13 +80,12 @@ allprojects { prj ->
'-Xep:EmptyCatch:OFF',
'-Xep:Finally:OFF',
'-Xep:FutureReturnValueIgnored:OFF',
- '-Xep:IdentityBinaryExpression:OFF',
'-Xep:InlineFormatString:OFF', // this introduces redundancy in format strings
'-Xep:InlineMeSuggester:OFF', // We don't use this annotation
'-Xep:InputStreamSlowMultibyteRead:OFF',
'-Xep:InvalidBlockTag:OFF', // this is needed for tags like lucene.internal
'-Xep:JavaUtilDate:OFF',
- '-Xep:MissingSummary:OFF',
+ '-Xep:MissingSummary:OFF', // style preference that we don't want to enforce
'-Xep:MixedMutabilityReturnType:OFF',
'-Xep:MutablePublicArray:OFF', // this should be possible...
'-Xep:NegativeCharLiteral:OFF',
@@ -106,7 +105,7 @@ allprojects { prj ->
'-Xep:TypeParameterShadowing:OFF',
'-Xep:TypeParameterUnusedInFormals:OFF',
'-Xep:UnicodeEscape:OFF', // can't enable since Lucene/Solr tests use unicode a bunch
- '-Xep:UnnecessaryParentheses:OFF',
+ '-Xep:UnnecessaryParentheses:OFF', // style preference that we don't want to enforce
'-Xep:UnusedMethod:OFF',
'-Xep:UnusedVariable:OFF',
'-Xep:WaitNotInLoop:OFF',
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
index a41d790c038..043230a324b 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
@@ -409,14 +409,14 @@ public class FacetModule extends SearchComponent {
if (a < b) return -1;
if (a > b) return 1;
- if (a != a) { // a==NaN
- if (b != b) {
+ if (Double.isNaN(a)) {
+ if (Double.isNaN(b)) {
return 0; // both NaN
}
return -1 * direction.getMultiplier(); // asc==-1, so this will put NaN at end of sort
}
- if (b != b) { // b is NaN so a is greater
+ if (Double.isNaN(b)) { // b is NaN so a is greater
return 1 * direction.getMultiplier(); // if sorting asc, make a less so NaN is at end
}
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
index cb374ab3c7c..0f1d2f14cd7 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
@@ -129,7 +129,7 @@ public class LRUStatsCache extends ExactStatsCache {
// force-fetched on next request and cached.
// check for missing stats from previous requests
- if (!missingColStats.isEmpty() || !missingColStats.isEmpty()) {
+ if (!missingColStats.isEmpty() || !missingTermStats.isEmpty()) {
// needs to fetch anyway, so get the full query stats + the missing stats for caching
ShardRequest sreq = super.doRetrieveStatsRequest(rb);
if (!missingColStats.isEmpty()) {
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
index 26a0e7239d0..70c2fbda507 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
@@ -87,7 +87,7 @@ public class CPUCircuitBreaker extends CircuitBreaker {
@Override
public String getDebugInfo() {
- if (seenCPUUsage.get() == 0.0 || seenCPUUsage.get() == 0.0) {
+ if (seenCPUUsage.get() == 0.0 || allowedCPUUsage.get() == 0.0) {
log.warn("CPUCircuitBreaker's monitored values (seenCPUUSage, allowedCPUUsage) not set");
}