This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9_0
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_0 by this push:
new 97f4a73 SOLR-15943: Simplify HDFS cache to account for LUCENE-10366 /
LUCENE-10376
97f4a73 is described below
commit 97f4a73b0a1d39d05d530fd35534d56f1fd762a4
Author: Kevin Risden <[email protected]>
AuthorDate: Thu Feb 17 15:19:54 2022 -0500
SOLR-15943: Simplify HDFS cache to account for LUCENE-10366 / LUCENE-10376
---
solr/CHANGES.txt | 2 +
.../store/blockcache/CustomBufferedIndexInput.java | 102 ++++-----------------
2 files changed, 21 insertions(+), 83 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d0bac8b..91cfdc4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -535,6 +535,8 @@ and each individual module's jar will be included in its
directory's lib/ folder
* SOLR-15949: Docker: the official image now uses Java 17 provided by Eclipse
Temurin. Formerly it was Java 11 from OpenJDK.
(janhoy, David Smiley)
+* SOLR-15943: Simplify HDFS cache to account for LUCENE-10366 / LUCENE-10376
(Kevin Risden)
+
Bug Fixes
---------------------
* SOLR-15849: Fix the connection reset problem caused by the incorrect use of
4LW with \n when monitoring zooKeeper status (Fa Ming).
diff --git
a/solr/modules/hdfs/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java
b/solr/modules/hdfs/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java
index 560be65..50f8bf6 100644
---
a/solr/modules/hdfs/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java
+++
b/solr/modules/hdfs/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java
@@ -118,99 +118,35 @@ public abstract class CustomBufferedIndexInput extends
IndexInput {
}
@Override
- public short readShort() throws IOException {
- if (2 <= (bufferLength - bufferPosition)) {
- final byte b1 = buffer[bufferPosition++];
- final byte b2 = buffer[bufferPosition++];
- return (short) ((b2 & 0xFF) << 8 | (b1 & 0xFF));
- } else {
- return super.readShort();
- }
+ public final short readShort() throws IOException {
+ // this can make JVM less confused (see LUCENE-10366 / SOLR-15943)
+ return super.readShort();
}
@Override
- public int readInt() throws IOException {
- if (4 <= (bufferLength - bufferPosition)) {
- final byte b1 = buffer[bufferPosition++];
- final byte b2 = buffer[bufferPosition++];
- final byte b3 = buffer[bufferPosition++];
- final byte b4 = buffer[bufferPosition++];
- return (b4 & 0xFF) << 24 | (b3 & 0xFF) << 16 | (b2 & 0xFF) << 8 | (b1 &
0xFF);
- } else {
- return super.readInt();
- }
+ public final int readInt() throws IOException {
+ // this can make JVM less confused (see LUCENE-10366 / SOLR-15943)
+ return super.readInt();
}
-
+
@Override
- public long readLong() throws IOException {
- if (8 <= (bufferLength - bufferPosition)) {
- return (readInt() & 0xFFFFFFFFL) | (((long) readInt()) << 32);
- } else {
- return super.readLong();
- }
+ public final long readLong() throws IOException {
+ // this can make JVM less confused (see LUCENE-10366 / SOLR-15943)
+ return super.readLong();
}
-
+
@Override
- public int readVInt() throws IOException {
- if (5 <= (bufferLength - bufferPosition)) {
- byte b = buffer[bufferPosition++];
- if (b >= 0) return b;
- int i = b & 0x7F;
- b = buffer[bufferPosition++];
- i |= (b & 0x7F) << 7;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7F) << 14;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7F) << 21;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- // Warning: the next ands use 0x0F / 0xF0 - beware copy/paste errors:
- i |= (b & 0x0F) << 28;
- if ((b & 0xF0) == 0) return i;
- throw new RuntimeException("Invalid vInt detected (too many bits)");
- } else {
- return super.readVInt();
- }
+ public final int readVInt() throws IOException {
+ // this can make JVM less confused (see LUCENE-10366 / SOLR-15943)
+ return super.readVInt();
}
-
+
@Override
- public long readVLong() throws IOException {
- if (9 <= bufferLength - bufferPosition) {
- byte b =buffer[bufferPosition++];
- if (b >= 0) return b;
- long i = b & 0x7FL;
- b = buffer[bufferPosition++];
- i |= (b & 0x7FL) << 7;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7FL) << 14;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7FL) << 21;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7FL) << 28;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7FL) << 35;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7FL) << 42;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7FL) << 49;
- if (b >= 0) return i;
- b = buffer[bufferPosition++];
- i |= (b & 0x7FL) << 56;
- if (b >= 0) return i;
- throw new RuntimeException("Invalid vLong detected (negative values
disallowed)");
- } else {
- return super.readVLong();
- }
+ public final long readVLong() throws IOException {
+ // this can make JVM less confused (see LUCENE-10366 / SOLR-15943)
+ return super.readVLong();
}
-
+
private void refill() throws IOException {
long start = bufferStart + bufferPosition;
long end = start + bufferSize;
