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 18:13:38 UTC

svn commit: r1653606 - in /lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src: java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java

Author: mikemccand
Date: Wed Jan 21 17:13:38 2015
New Revision: 1653606

URL: http://svn.apache.org/r1653606
Log:
LUCENE-6192: don't overflow int when writing skip data for high freq terms in extremely large indices

Modified:
    lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java
    lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java

Modified: lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java?rev=1653606&r1=1653605&r2=1653606&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java Wed Jan 21 17:13:38 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/lucene_solr_5_0/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java?rev=1653606&r1=1653605&r2=1653606&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java Wed Jan 21 17:13:38 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;