You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/10/26 18:21:28 UTC

[solr] 09/09: SOLR-16427: Evaluate and fix errorprone rules - NarrowingCompoundAssignment

This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git

commit 317f422922cb7f387721e0f51a5b54ce496cbc73
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Mon Oct 24 18:04:45 2022 -0400

    SOLR-16427: Evaluate and fix errorprone rules - NarrowingCompoundAssignment
---
 gradle/validation/error-prone.gradle                           |  1 -
 .../src/java/org/apache/solr/search/ReRankQParserPlugin.java   |  2 +-
 .../apache/solr/cloud/CloudExitableDirectoryReaderTest.java    |  4 ++--
 .../solr/cloud/DistribDocExpirationUpdateProcessorTest.java    |  2 +-
 .../core/src/test/org/apache/solr/cloud/TestCloudRecovery.java |  6 +++---
 .../org/apache/solr/handler/component/TermsComponentTest.java  | 10 +++++-----
 solr/core/src/test/org/apache/solr/search/TestFiltering.java   |  2 +-
 solr/core/src/test/org/apache/solr/search/TestSearchPerf.java  |  4 ++--
 .../processor/CategoryRoutedAliasUpdateProcessorTest.java      |  2 +-
 .../processor/DimensionalRoutedAliasUpdateProcessorTest.java   |  2 +-
 .../update/processor/TimeRoutedAliasUpdateProcessorTest.java   |  6 +++---
 solr/core/src/test/org/apache/solr/util/BitSetPerf.java        |  2 +-
 .../solr/client/solrj/impl/CloudHttp2SolrClientTest.java       |  4 ++--
 .../org/apache/solr/client/solrj/impl/CloudSolrClientTest.java |  4 ++--
 .../solr/client/solrj/impl/HttpSolrClientConPoolTest.java      |  2 +-
 solr/solrj/src/test/org/noggit/TestJSONParser.java             |  2 +-
 .../org/apache/solr/cloud/AbstractFullDistribZkTestBase.java   |  2 +-
 .../cloud/api/collections/AbstractIncrementalBackupTest.java   |  8 ++++----
 18 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index f5a30bf1483..3f4d437fdd0 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -98,7 +98,6 @@ allprojects { prj ->
             '-Xep:MissingSummary:OFF',
             '-Xep:MixedMutabilityReturnType:OFF',
             '-Xep:MutablePublicArray:OFF', // this should be possible...
-            '-Xep:NarrowingCompoundAssignment:OFF',
             '-Xep:NegativeCharLiteral:OFF',
             '-Xep:NonAtomicVolatileUpdate:OFF',
             '-Xep:NonCanonicalType:OFF',
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
index 3bb9a5efc8c..5e3f25e9890 100644
--- a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
@@ -90,7 +90,7 @@ public class ReRankQParserPlugin extends QParserPlugin {
         float firstPassScore, boolean secondPassMatches, float secondPassScore) {
       float score = firstPassScore;
       if (secondPassMatches) {
-        score += reRankWeight * secondPassScore;
+        score = (float) (score + reRankWeight * secondPassScore);
       }
       return score;
     }
diff --git a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java
index 5728b6c9c2d..561ecfb1d96 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java
@@ -98,7 +98,7 @@ public class CloudExitableDirectoryReaderTest extends SolrCloudTestCase {
             (n, c) -> DocCollection.isFullyActive(n, c, 2, 1));
 
     fiveHundredsByNode = new LinkedHashMap<>();
-    int httpOk = 0;
+    long httpOk = 0;
     for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
       MetricRegistry metricRegistry = ((JettySolrRunnerWithMetrics) jetty).getMetricRegistry();
 
@@ -301,7 +301,7 @@ public class CloudExitableDirectoryReaderTest extends SolrCloudTestCase {
         }; // add more cases here
 
     params.add(cases[random().nextInt(cases.length)]);
-    for (; ; creep *= 1.5) {
+    for (; ; creep = (int) (creep * 1.5)) {
       try (Trap catchClass = catchCount(creep)) {
 
         params.set("boundary", creep);
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
index d49b4e61dd8..6f7d9ea959a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
@@ -252,7 +252,7 @@ public class DistribDocExpirationUpdateProcessorTest extends SolrCloudTestCase {
     final Set<String> shardsThatChange = new HashSet<>();
 
     int coresCompared = 0;
-    int totalDocsOnAllShards = 0;
+    long totalDocsOnAllShards = 0;
     final DocCollection collectionState =
         cluster.getSolrClient().getClusterState().getCollection(COLLECTION);
     for (Slice shard : collectionState) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
index 17e0440fada..3bbbf5d088b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
@@ -140,9 +140,9 @@ public class TestCloudRecovery extends SolrCloudTestCase {
     }
 
     // check metrics
-    int replicationCount = 0;
-    int errorsCount = 0;
-    int skippedCount = 0;
+    long replicationCount = 0;
+    long errorsCount = 0;
+    long skippedCount = 0;
     for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
       SolrMetricManager manager = jetty.getCoreContainer().getMetricManager();
       List<String> registryNames =
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
index 764448dbb92..967313b4a34 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
@@ -717,11 +717,11 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
               totBuff,
               minSegBuff);
       MutableValueInt v = (MutableValueInt) iter.getMutableValue();
-      int i = 0;
+      long i = 0;
       for (; ; ) {
         long count = iter.getNextCount();
         if (count < 0) break;
-        assertEquals(vals[i], v.value);
+        assertEquals(vals[(int) i], v.value);
         i += count;
         // if (i < 10) System.out.println("COUNT=" + count + " OBJ="+v.toObject());
       }
@@ -737,7 +737,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
       for (; ; ) {
         long count = iter.getNextCount();
         if (count < 0) break;
-        assertEquals(vals[i], lv.value);
+        assertEquals(vals[(int) i], lv.value);
         i += count;
         // if (i < 10) System.out.println("COUNT=" + count + " OBJ="+v.toObject());
       }
@@ -753,7 +753,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
       for (; ; ) {
         long count = iter.getNextCount();
         if (count < 0) break;
-        assertEquals(vals[i], fv.value, 0);
+        assertEquals(vals[(int) i], fv.value, 0);
         i += count;
         // if (i < 10) System.out.println("COUNT=" + count + " OBJ="+v.toObject());
       }
@@ -769,7 +769,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
       for (; ; ) {
         long count = iter.getNextCount();
         if (count < 0) break;
-        assertEquals(vals[i], dv.value, 0);
+        assertEquals(vals[(int) i], dv.value, 0);
         i += count;
         // if (i < 10) System.out.println("COUNT=" + count + " OBJ="+v.toObject());
       }
diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
index 7d559d4d296..1d44ac2943f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
@@ -493,7 +493,7 @@ public class TestFiltering extends SolrTestCaseJ4 {
       // sanity check
       assertJQ(req("q", "*:*"), "/response/numFound==" + model.indexSize);
 
-      int totalMatches = 0;
+      long totalMatches = 0;
       int nonZeros = 0;
       for (int qiter = 0; qiter < queryIter; qiter++) {
         model.clear();
diff --git a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
index 9bf1da52dc0..bbbbf5f84b3 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
@@ -163,14 +163,14 @@ public class TestSearchPerf extends SolrTestCaseJ4 {
     return ret;
   }
 
-  private int doListGen(Query q, List<Query> filt) throws Exception {
+  private long doListGen(Query q, List<Query> filt) throws Exception {
     SolrQueryRequest req = lrf.makeRequest();
 
     SolrIndexSearcher searcher = req.getSearcher();
 
     final RTimer timer = new RTimer();
 
-    int ret = 0;
+    long ret = 0;
     for (int i = 0; i < ITERATIONS; i++) {
       DocList l =
           searcher.getDocList(q, filt, (Sort) null, 0, 10, SolrIndexSearcher.NO_CHECK_QCACHE);
diff --git a/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java
index 9c3943634e5..ee0f599e621 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java
@@ -468,7 +468,7 @@ public class CategoryRoutedAliasUpdateProcessorTest extends RoutedAliasUpdatePro
     observedCols.sort(String::compareTo); // don't really care about the order here.
     assertFalse(observedCols.isEmpty());
 
-    int numFoundViaCollections = 0;
+    long numFoundViaCollections = 0;
     for (String col : observedCols) {
       final QueryResponse colResponse =
           solrClient.query(
diff --git a/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java
index 28e5e665813..25237a153a5 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java
@@ -555,7 +555,7 @@ public class DimensionalRoutedAliasUpdateProcessorTest extends RoutedAliasUpdate
       throws Exception {
     final int expectNumFound =
         lastDocId - numDocsDeletedOrFailed; // lastDocId is effectively # generated docs
-    int totalNumFound = 0;
+    long totalNumFound = 0;
 
     final List<String> cols =
         new CollectionAdminRequest.ListAliases()
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
index ecb05fad51f..06985502b97 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
@@ -85,7 +85,7 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
   private CloudSolrClient solrClient;
 
   private int lastDocId = 0;
-  private int numDocsDeletedOrFailed = 0;
+  private long numDocsDeletedOrFailed = 0;
 
   @Before
   public void doBefore() throws Exception {
@@ -852,7 +852,7 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
   }
 
   private void assertInvariants(String... expectedColls) throws IOException, SolrServerException {
-    final int expectNumFound =
+    final long expectNumFound =
         lastDocId - numDocsDeletedOrFailed; // lastDocId is effectively # generated docs
 
     final List<String> cols =
@@ -864,7 +864,7 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
         cols.stream().sorted(Collections.reverseOrder()).toArray(),
         cols.toArray());
 
-    int totalNumFound = 0;
+    long totalNumFound = 0;
     Instant colEndInstant = null; // exclusive end
     for (String col : cols) { // ASSUMPTION: reverse sorted order
       final Instant colStartInstant = TimeRoutedAlias.parseInstantFromCollectionName(alias, col);
diff --git a/solr/core/src/test/org/apache/solr/util/BitSetPerf.java b/solr/core/src/test/org/apache/solr/util/BitSetPerf.java
index 86a815bf428..28124ab35df 100644
--- a/solr/core/src/test/org/apache/solr/util/BitSetPerf.java
+++ b/solr/core/src/test/org/apache/solr/util/BitSetPerf.java
@@ -69,7 +69,7 @@ public class BitSetPerf {
     FixedBitSet obs = new FixedBitSet(bitSetSize);
     randomSets(bitSetSize, numBitsSet, bs, obs);
 
-    int ret = 0;
+    long ret = 0;
 
     final RTimer timer = new RTimer();
 
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
index 1e52d73627f..9982bc3a4ca 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
@@ -398,8 +398,8 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {
 
     // Request counts increase from expected nodes should aggregate to 1000, while there should be
     // no increase in unexpected nodes.
-    int increaseFromExpectedUrls = 0;
-    int increaseFromUnexpectedUrls = 0;
+    long increaseFromExpectedUrls = 0;
+    long increaseFromUnexpectedUrls = 0;
     Map<String, Long> numRequestsToUnexpectedUrls = Maps.newHashMap();
     for (Slice slice : col.getSlices()) {
       for (Replica replica : slice.getReplicas()) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index 85318bf5fff..dd062582966 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -398,8 +398,8 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
 
     // Request counts increase from expected nodes should aggregate to 1000, while there should be
     // no increase in unexpected nodes.
-    int increaseFromExpectedUrls = 0;
-    int increaseFromUnexpectedUrls = 0;
+    long increaseFromExpectedUrls = 0;
+    long increaseFromUnexpectedUrls = 0;
     Map<String, Long> numRequestsToUnexpectedUrls = Maps.newHashMap();
     for (Slice slice : col.getSlices()) {
       for (Replica replica : slice.getReplicas()) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java
index de5a93b56d5..960a1604f35 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java
@@ -180,7 +180,7 @@ public class HttpSolrClientConPoolTest extends SolrJettyTestBase {
       for (int i = 0; i < 2; i++) {
         roundRobin.commit();
       }
-      int total = 0;
+      long total = 0;
       for (int i = 0; i < 2; i++) {
         total += roundRobin.query(new SolrQuery("*:*")).getResults().getNumFound();
       }
diff --git a/solr/solrj/src/test/org/noggit/TestJSONParser.java b/solr/solrj/src/test/org/noggit/TestJSONParser.java
index 17d043e376e..e718e90e361 100644
--- a/solr/solrj/src/test/org/noggit/TestJSONParser.java
+++ b/solr/solrj/src/test/org/noggit/TestJSONParser.java
@@ -246,7 +246,7 @@ public class TestJSONParser extends SolrTestCaseJ4 {
       JSONParser parser = getParser(new String(arr));
       parser.setFlags(random().nextInt()); // set random parser flags
 
-      int ret = 0;
+      double ret = 0;
       try {
         for (; ; ) {
           int ev = parser.nextEvent();
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index b3c7c4be31c..43f8376fac7 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@ -1733,7 +1733,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
 
     // now check that the right # are on each shard
     theShards = shardToJetty.keySet();
-    int cnt = 0;
+    long cnt = 0;
     for (String s : theShards) {
       int times = shardToJetty.get(s).size();
       for (int i = 0; i < times; i++) {
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
index ff59cc836d1..acd101985cd 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
@@ -366,10 +366,10 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase {
             .get();
     try (FileInputStream fis = new FileInputStream(fileGetCorrupted)) {
       byte[] contents = fis.readAllBytes();
-      contents[contents.length - CodecUtil.footerLength() - 1] += 1;
-      contents[contents.length - CodecUtil.footerLength() - 2] += 1;
-      contents[contents.length - CodecUtil.footerLength() - 3] += 1;
-      contents[contents.length - CodecUtil.footerLength() - 4] += 1;
+      for (int i = 1; i < 5; i++) {
+        byte key = (byte) (contents.length - CodecUtil.footerLength() - i);
+        contents[key] = (byte) (contents[key] + 1);
+      }
       try (FileOutputStream fos = new FileOutputStream(fileGetCorrupted)) {
         fos.write(contents);
       }