You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/01/21 17:49:32 UTC
svn commit: r1653594 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/
lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/
lucene/core/ lucene/test-framework/
Author: mikemccand
Date: Wed Jan 21 16:49:32 2015
New Revision: 1653594
URL: http://svn.apache.org/r1653594
Log:
LUCENE-6192: don't overflow int when writing skip data for high freq terms in extremely large indices
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java
lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
Modified: lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java?rev=1653594&r1=1653593&r2=1653594&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java Wed Jan 21 16:49:32 2015
@@ -132,8 +132,8 @@ final class Lucene40SkipListReader exten
delta = skipStream.readVInt();
}
- freqPointer[level] += skipStream.readVInt();
- proxPointer[level] += skipStream.readVInt();
+ freqPointer[level] += skipStream.readVLong();
+ proxPointer[level] += skipStream.readVLong();
return delta;
}
Modified: lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java?rev=1653594&r1=1653593&r2=1653594&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java Wed Jan 21 16:49:32 2015
@@ -138,8 +138,8 @@ final class Lucene40SkipListWriter exten
skipBuffer.writeVInt(delta);
}
- skipBuffer.writeVInt((int) (curFreqPointer - lastSkipFreqPointer[level]));
- skipBuffer.writeVInt((int) (curProxPointer - lastSkipProxPointer[level]));
+ skipBuffer.writeVLong(curFreqPointer - lastSkipFreqPointer[level]);
+ skipBuffer.writeVLong(curProxPointer - lastSkipProxPointer[level]);
lastSkipDoc[level] = curDoc;