Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-8500: Make sure to use a 0 offset when setting the dictionary.

This commit is contained in:
Adrien Grand 2020-09-03 09:46:34 +02:00
parent 7f68272575
commit 0a9b660648
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lucene/core/src/java/org/apache/lucene/codecs/lucene87/Lucene87StoredFieldsFormat.java
View File

@ -307,7 +307,7 @@ public class Lucene87StoredFieldsFormat extends StoredFieldsFormat {
private static class DeflateWithPresetDictCompressor extends Compressor {
final int dictLength;
final byte[] dictBytes;
final int blockLength;
final Deflater compressor;
byte[] compressed;
@ -316,7 +316,7 @@ public class Lucene87StoredFieldsFormat extends StoredFieldsFormat {
DeflateWithPresetDictCompressor(int level, int dictLength, int blockLength) {
compressor = new Deflater(level, true);
compressed = new byte[64];
this.dictLength = dictLength;
this.dictBytes = new byte[dictLength];
this.blockLength = blockLength;
}
@ -349,7 +349,8 @@ public class Lucene87StoredFieldsFormat extends StoredFieldsFormat {
@Override
public void compress(byte[] bytes, int off, int len, DataOutput out) throws IOException {
final int dictLength = Math.min(this.dictLength, len);
final int dictLength = Math.min(dictBytes.length, len);
System.arraycopy(bytes, off, dictBytes, 0, dictLength);
out.writeVInt(dictLength);
out.writeVInt(blockLength);
final int end = off + len;
@ -361,7 +362,8 @@ public class Lucene87StoredFieldsFormat extends StoredFieldsFormat {
// And then sub blocks
for (int start = off + dictLength; start < end; start += blockLength) {
compressor.reset();
compressor.setDictionary(bytes, off, dictLength);
// NOTE: offset MUST be 0 when setting the dictionary in order to work around JDK-8252739
compressor.setDictionary(dictBytes, 0, dictLength);
doCompress(bytes, start, Math.min(blockLength, off + len - start), out);
}
}