Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP3:GA
lucene
lucene-java8compat.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File lucene-java8compat.patch of Package lucene
--- lucene-8.5.0/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java 2020-03-13 10:35:54.000000000 +0100 +++ lucene-8.5.0/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java 2020-04-06 11:47:37.590300471 +0200 @@ -20,6 +20,7 @@ import java.io.BufferedOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.WritableByteChannel; @@ -98,7 +99,7 @@ int worstCase = 4 + 3 + 2*(baseForm.length() + reading.length() + pronunciation.length()); if (worstCase > left) { ByteBuffer newBuffer = ByteBuffer.allocate(ArrayUtil.oversize(buffer.limit() + worstCase - left, 1)); - buffer.flip(); + ((Buffer)buffer).flip(); newBuffer.put(buffer); buffer = newBuffer; } @@ -321,7 +322,7 @@ out.writeVInt(buffer.position()); final WritableByteChannel channel = Channels.newChannel(bos); // Write Buffer - buffer.flip(); // set position to 0, set limit to current position + ((Buffer)buffer).flip(); // set position to 0, set limit to current position channel.write(buffer); assert buffer.remaining() == 0L; } --- lucene-8.5.0/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java 2020-03-13 10:35:55.000000000 +0100 +++ lucene-8.5.0/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java 2020-04-06 11:49:45.810989724 +0200 @@ -19,6 +19,7 @@ import java.io.EOFException; import java.io.IOException; +import java.nio.Buffer; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -85,7 +86,7 @@ throw new EOFException("read past EOF: " + this); } setCurBuf(buffers[curBufIndex]); - curBuf.position(0); + ((Buffer)curBuf).position(0); } while (!curBuf.hasRemaining()); return guard.getByte(curBuf); } catch (NullPointerException npe) { @@ -108,7 +109,7 @@ throw new EOFException("read past EOF: " + this); } setCurBuf(buffers[curBufIndex]); - curBuf.position(0); + ((Buffer)curBuf).position(0); curAvail = curBuf.remaining(); } guard.getBytes(curBuf, b, offset, len); @@ -204,10 +205,10 @@ final int bi = (int) (pos >> chunkSizePower); try { if (bi == curBufIndex) { - curBuf.position((int) (pos & chunkSizeMask)); + ((Buffer)curBuf).position((int) (pos & chunkSizeMask)); } else { final ByteBuffer b = buffers[bi]; - b.position((int) (pos & chunkSizeMask)); + ((Buffer)b).position((int) (pos & chunkSizeMask)); // write values, on exception all is unchanged this.curBufIndex = bi; setCurBuf(b); @@ -235,7 +236,7 @@ private void setPos(long pos, int bi) throws IOException { try { final ByteBuffer b = buffers[bi]; - b.position((int) (pos & chunkSizeMask)); + ((Buffer)b).position((int) (pos & chunkSizeMask)); this.curBufIndex = bi; setCurBuf(b); } catch (ArrayIndexOutOfBoundsException | IllegalArgumentException aioobe) { @@ -335,7 +336,7 @@ @SuppressWarnings("resource") protected ByteBufferIndexInput newCloneInstance(String newResourceDescription, ByteBuffer[] newBuffers, int offset, long length) { if (newBuffers.length == 1) { - newBuffers[0].position(offset); + ((Buffer)newBuffers[0]).position(offset); return new SingleBufferImpl(newResourceDescription, newBuffers[0].slice(), length, chunkSizePower, this.guard); } else { return new MultiBufferImpl(newResourceDescription, newBuffers, offset, length, chunkSizePower, guard); @@ -359,7 +360,7 @@ } // set the last buffer's limit for the sliced view. - slices[slices.length - 1].limit((int) (sliceEnd & chunkSizeMask)); + ((Buffer)slices[slices.length - 1]).limit((int) (sliceEnd & chunkSizeMask)); return slices; } @@ -399,7 +400,7 @@ super(resourceDescription, new ByteBuffer[] { buffer }, length, chunkSizePower, guard); this.curBufIndex = 0; setCurBuf(buffer); - buffer.position(0); + ((Buffer)buffer).position(0); } // TODO: investigate optimizing readByte() & Co? @@ -407,7 +408,7 @@ @Override public void seek(long pos) throws IOException { try { - curBuf.position((int) pos); + ((Buffer)curBuf).position((int) pos); } catch (IllegalArgumentException e) { if (pos < 0) { throw new IllegalArgumentException("Seeking to negative position: " + this, e); --- lucene-8.5.0/core/src/java/org/apache/lucene/store/NIOFSDirectory.java 2020-03-13 10:35:55.000000000 +0100 +++ lucene-8.5.0/core/src/java/org/apache/lucene/store/NIOFSDirectory.java 2020-04-06 11:47:37.590300471 +0200 @@ -18,6 +18,7 @@ import java.io.EOFException; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; // javadoc @link import java.nio.channels.FileChannel; @@ -159,7 +160,7 @@ // Use our own pre-wrapped byteBuf: assert byteBuf != null; bb = byteBuf; - byteBuf.clear().position(offset); + ((Buffer)byteBuf).clear().position(offset); } else { bb = ByteBuffer.wrap(b, offset, len); } @@ -174,7 +175,7 @@ int readLength = len; while (readLength > 0) { final int toRead = Math.min(CHUNK_SIZE, readLength); - bb.limit(bb.position() + toRead); + ((Buffer)bb).limit(bb.position() + toRead); assert bb.remaining() == toRead; final int i = channel.read(bb, pos); if (i < 0) { // be defensive here, even though we checked before hand, something could have changed --- lucene-8.5.0/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java 2020-03-13 10:35:55.000000000 +0100 +++ lucene-8.5.0/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java 2020-04-06 11:47:37.590300471 +0200 @@ -19,6 +19,7 @@ import java.io.EOFException; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.SeekableByteChannel; import java.nio.channels.ClosedChannelException; // javadoc @link @@ -155,7 +156,7 @@ // Use our own pre-wrapped byteBuf: assert byteBuf != null; bb = byteBuf; - byteBuf.clear().position(offset); + ((Buffer)byteBuf).clear().position(offset); } else { bb = ByteBuffer.wrap(b, offset, len); } --- lucene-8.5.0/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java 2020-03-13 10:35:56.000000000 +0100 +++ lucene-8.5.0/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java 2020-04-06 11:47:37.590300471 +0200 @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.Path; @@ -211,7 +212,7 @@ //} private void dump() throws IOException { - buffer.flip(); + ((Buffer)buffer).flip(); final long limit = filePos + buffer.limit(); if (limit > fileLength) { // this dump extends the file @@ -221,7 +222,7 @@ } // must always round to next block - buffer.limit((int) ((buffer.limit() + ALIGN - 1) & ALIGN_NOT_MASK)); + ((Buffer)buffer).limit((int) ((buffer.limit() + ALIGN - 1) & ALIGN_NOT_MASK)); assert (buffer.limit() & ALIGN_NOT_MASK) == buffer.limit() : "limit=" + buffer.limit() + " vs " + (buffer.limit() & ALIGN_NOT_MASK); assert (filePos & ALIGN_NOT_MASK) == filePos; @@ -229,7 +230,7 @@ channel.write(buffer, filePos); filePos += bufferPos; bufferPos = 0; - buffer.clear(); + ((Buffer)buffer).clear(); //System.out.println("dump: done"); // TODO: the case where we'd seek'd back, wrote an @@ -340,7 +341,7 @@ final int delta = (int) (pos - alignedPos); if (delta != 0) { refill(); - buffer.position(delta); + ((Buffer)buffer).position(delta); bufferPos = delta; } else { // force refill on next read @@ -372,7 +373,7 @@ } private void refill() throws IOException { - buffer.clear(); + ((Buffer)buffer).clear(); filePos += bufferSize; bufferPos = 0; assert (filePos & ALIGN_NOT_MASK) == filePos : "filePos=" + filePos + " anded=" + (filePos & ALIGN_NOT_MASK); @@ -386,7 +387,7 @@ if (n < 0) { throw new EOFException("read past EOF: " + this); } - buffer.rewind(); + ((Buffer)buffer).rewind(); } @Override --- lucene-8.5.0/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java 2020-03-13 10:35:56.000000000 +0100 +++ lucene-8.5.0/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java 2020-04-06 11:47:37.594300492 +0200 @@ -20,6 +20,7 @@ import java.io.Closeable; import java.io.EOFException; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.Path; @@ -93,8 +94,8 @@ intBuffer[1] = (byte) (len >> 16); intBuffer[2] = (byte) (len >> 8); intBuffer[3] = (byte) len; - intByteBuffer.limit(4); - intByteBuffer.position(0); + ((Buffer)intByteBuffer).limit(4); + ((Buffer)intByteBuffer).position(0); writeBytesToChannel(intByteBuffer); writeBytesToChannel(ByteBuffer.wrap(bytes)); @@ -131,8 +132,8 @@ long pos = start; while (pos < end) { - intByteBuffer.position(0); - intByteBuffer.limit(4); + ((Buffer)intByteBuffer).position(0); + ((Buffer)intByteBuffer).limit(4); readBytesFromChannel(pos, intByteBuffer); pos += 4; int len = ((intBuffer[0] & 0xff) << 24) |
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
