You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/01/16 06:31:54 UTC
svn commit: r1652342 - in
/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing:
CompressingStoredFieldsReader.java CompressingStoredFieldsWriter.java
Author: rmuir
Date: Fri Jan 16 05:31:54 2015
New Revision: 1652342
URL: http://svn.apache.org/r1652342
Log:
LUCENE-6183: be prepared for future packedints version changes
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java?rev=1652342&r1=1652341&r2=1652342&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java Fri Jan 16 05:31:54 2015
@@ -648,6 +648,10 @@ public final class CompressingStoredFiel
return numDirtyChunks;
}
+ int getPackedIntsVersion() {
+ return packedIntsVersion;
+ }
+
@Override
public long ramBytesUsed() {
return indexReader.ramBytesUsed();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java?rev=1652342&r1=1652341&r2=1652342&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java Fri Jan 16 05:31:54 2015
@@ -534,6 +534,7 @@ public final class CompressingStoredFiel
}
} else if (matchingFieldsReader.getCompressionMode() == compressionMode &&
matchingFieldsReader.getChunkSize() == chunkSize &&
+ matchingFieldsReader.getPackedIntsVersion() == PackedInts.VERSION_CURRENT &&
liveDocs == null &&
!tooDirty(matchingFieldsReader)) {
// optimized merge, raw byte copy