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/28 15:21:45 UTC
[solr] 04/12: SOLR-16427: Evaluate and fix errorprone rules - BadShiftAmount
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 837516d01163f4348da7ab05e4a0f6dddbe46689
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Tue Oct 25 13:50:35 2022 -0400
SOLR-16427: Evaluate and fix errorprone rules - BadShiftAmount
---
gradle/validation/error-prone.gradle | 1 -
.../src/java/org/apache/solr/util/hll/HLLUtil.java | 1 +
.../test/org/apache/solr/search/TestDocSet.java | 1 +
.../src/java/org/apache/solr/common/util/Hash.java | 78 +++++++++++-----------
4 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index 0d30d95af0b..a3f0054e363 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -78,7 +78,6 @@ allprojects { prj ->
'-Xep:AmbiguousMethodReference:OFF',
'-Xep:ArgumentSelectionDefectChecker:OFF',
'-Xep:BadImport:OFF', // style preference that we don't want to enforce
- '-Xep:BadShiftAmount:OFF',
'-Xep:CanIgnoreReturnValueSuggester:OFF',
'-Xep:ComplexBooleanConstant:OFF',
'-Xep:DoubleCheckedLocking:OFF',
diff --git a/solr/core/src/java/org/apache/solr/util/hll/HLLUtil.java b/solr/core/src/java/org/apache/solr/util/hll/HLLUtil.java
index 3d955f2edc6..33d507be814 100644
--- a/solr/core/src/java/org/apache/solr/util/hll/HLLUtil.java
+++ b/solr/core/src/java/org/apache/solr/util/hll/HLLUtil.java
@@ -30,6 +30,7 @@ final class HLLUtil {
*
* @see #pwMaxMask(int)
*/
+ @SuppressWarnings("BadShiftAmount")
private static final long[] PW_MASK = {
~((1L << (((1 << 0) - 1) - 1)) - 1),
~((1L << (((1 << 1) - 1) - 1)) - 1),
diff --git a/solr/core/src/test/org/apache/solr/search/TestDocSet.java b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
index 3583ca385a6..d23c022828e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestDocSet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
@@ -60,6 +60,7 @@ public class TestDocSet extends SolrTestCase {
}
// test the DocSetCollector
+ @SuppressWarnings("BadShiftAmount")
public void collect(DocSet set, int maxDoc) {
int smallSetSize = maxDoc >> 64 + 3;
if (set.size() > 1) {
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Hash.java b/solr/solrj/src/java/org/apache/solr/common/util/Hash.java
index 79d543c6a07..05e9f291f0d 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Hash.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Hash.java
@@ -81,22 +81,22 @@ public class Hash {
// into real x86 rotate instructions.
{
a -= c;
- a ^= (c << 4) | (c >>> -4);
+ a ^= (c << 4) | (c >>> 28);
c += b;
b -= a;
- b ^= (a << 6) | (a >>> -6);
+ b ^= (a << 6) | (a >>> 26);
a += c;
c -= b;
- c ^= (b << 8) | (b >>> -8);
+ c ^= (b << 8) | (b >>> 24);
b += a;
a -= c;
- a ^= (c << 16) | (c >>> -16);
+ a ^= (c << 16) | (c >>> 16);
c += b;
b -= a;
- b ^= (a << 19) | (a >>> -19);
+ b ^= (a << 19) | (a >>> 13);
a += c;
c -= b;
- c ^= (b << 4) | (b >>> -4);
+ c ^= (b << 4) | (b >>> 28);
b += a;
}
@@ -114,19 +114,19 @@ public class Hash {
// final(a,b,c);
{
c ^= b;
- c -= (b << 14) | (b >>> -14);
+ c -= (b << 14) | (b >>> 18);
a ^= c;
- a -= (c << 11) | (c >>> -11);
+ a -= (c << 11) | (c >>> 21);
b ^= a;
- b -= (a << 25) | (a >>> -25);
+ b -= (a << 25) | (a >>> 7);
c ^= b;
- c -= (b << 16) | (b >>> -16);
+ c -= (b << 16) | (b >>> 16);
a ^= c;
- a -= (c << 4) | (c >>> -4);
+ a -= (c << 4) | (c >>> 28);
b ^= a;
- b -= (a << 14) | (a >>> -14);
+ b -= (a << 14) | (a >>> 18);
c ^= b;
- c -= (b << 24) | (b >>> -24);
+ c -= (b << 24) | (b >>> 8);
}
case 0:
break;
@@ -179,22 +179,22 @@ public class Hash {
// into real x86 rotate instructions.
{
a -= c;
- a ^= (c << 4) | (c >>> -4);
+ a ^= (c << 4) | (c >>> 28);
c += b;
b -= a;
- b ^= (a << 6) | (a >>> -6);
+ b ^= (a << 6) | (a >>> 26);
a += c;
c -= b;
- c ^= (b << 8) | (b >>> -8);
+ c ^= (b << 8) | (b >>> 24);
b += a;
a -= c;
- a ^= (c << 16) | (c >>> -16);
+ a ^= (c << 16) | (c >>> 16);
c += b;
b -= a;
- b ^= (a << 19) | (a >>> -19);
+ b ^= (a << 19) | (a >>> 13);
a += c;
c -= b;
- c ^= (b << 4) | (b >>> -4);
+ c ^= (b << 4) | (b >>> 28);
b += a;
}
mixed = true;
@@ -203,19 +203,19 @@ public class Hash {
if (!mixed) {
// final(a,b,c)
c ^= b;
- c -= (b << 14) | (b >>> -14);
+ c -= (b << 14) | (b >>> 18);
a ^= c;
- a -= (c << 11) | (c >>> -11);
+ a -= (c << 11) | (c >>> 21);
b ^= a;
- b -= (a << 25) | (a >>> -25);
+ b -= (a << 25) | (a >>> 7);
c ^= b;
- c -= (b << 16) | (b >>> -16);
+ c -= (b << 16) | (b >>> 16);
a ^= c;
- a -= (c << 4) | (c >>> -4);
+ a -= (c << 4) | (c >>> 28);
b ^= a;
- b -= (a << 14) | (a >>> -14);
+ b -= (a << 14) | (a >>> 18);
c ^= b;
- c -= (b << 24) | (b >>> -24);
+ c -= (b << 24) | (b >>> 8);
}
return c;
@@ -255,22 +255,22 @@ public class Hash {
// into real x86 rotate instructions.
{
a -= c;
- a ^= (c << 4) | (c >>> -4);
+ a ^= (c << 4) | (c >>> 28);
c += b;
b -= a;
- b ^= (a << 6) | (a >>> -6);
+ b ^= (a << 6) | (a >>> 26);
a += c;
c -= b;
- c ^= (b << 8) | (b >>> -8);
+ c ^= (b << 8) | (b >>> 24);
b += a;
a -= c;
- a ^= (c << 16) | (c >>> -16);
+ a ^= (c << 16) | (c >>> 16);
c += b;
b -= a;
- b ^= (a << 19) | (a >>> -19);
+ b ^= (a << 19) | (a >>> 13);
a += c;
c -= b;
- c ^= (b << 4) | (b >>> -4);
+ c ^= (b << 4) | (b >>> 28);
b += a;
}
mixed = true;
@@ -279,19 +279,19 @@ public class Hash {
if (!mixed) {
// final(a,b,c)
c ^= b;
- c -= (b << 14) | (b >>> -14);
+ c -= (b << 14) | (b >>> 18);
a ^= c;
- a -= (c << 11) | (c >>> -11);
+ a -= (c << 11) | (c >>> 21);
b ^= a;
- b -= (a << 25) | (a >>> -25);
+ b -= (a << 25) | (a >>> 7);
c ^= b;
- c -= (b << 16) | (b >>> -16);
+ c -= (b << 16) | (b >>> 16);
a ^= c;
- a -= (c << 4) | (c >>> -4);
+ a -= (c << 4) | (c >>> 28);
b ^= a;
- b -= (a << 14) | (a >>> -14);
+ b -= (a << 14) | (a >>> 18);
c ^= b;
- c -= (b << 24) | (b >>> -24);
+ c -= (b << 24) | (b >>> 8);
}
return c + (((long) b) << 32);