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 2011/04/19 19:51:10 UTC
svn commit: r1095147 - in
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs:
MultiLevelSkipListReader.java MultiLevelSkipListWriter.java
Author: rmuir
Date: Tue Apr 19 17:51:10 2011
New Revision: 1095147
URL: http://svn.apache.org/viewvc?rev=1095147&view=rev
Log:
LUCENE-3037: calculate log with integer math
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListWriter.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java?rev=1095147&r1=1095146&r2=1095147&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java Tue Apr 19 17:51:10 2011
@@ -184,10 +184,19 @@ public abstract class MultiLevelSkipList
}
}
+ /** returns x == 0 ? 0 : Math.floor(Math.log(x) / Math.log(base)) */
+ static int log(int x, int base) {
+ int ret = 0;
+ while (x >= base) {
+ x /= base;
+ ret++;
+ }
+ return ret;
+ }
+
/** Loads the skip levels */
private void loadSkipLevels() throws IOException {
- // TODO: would be preferable to use integer math here instead.
- numberOfSkipLevels = docCount == 0 ? 0 : (int) Math.floor(StrictMath.log(docCount) / StrictMath.log(skipInterval[0]));
+ numberOfSkipLevels = log(docCount, skipInterval[0]);
if (numberOfSkipLevels > maxNumberOfSkipLevels) {
numberOfSkipLevels = maxNumberOfSkipLevels;
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListWriter.java?rev=1095147&r1=1095146&r2=1095147&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListWriter.java Tue Apr 19 17:51:10 2011
@@ -61,8 +61,7 @@ public abstract class MultiLevelSkipList
this.skipInterval = skipInterval;
// calculate the maximum number of skip levels for this document frequency
- // TODO: would be preferable to use integer math here instead.
- numberOfSkipLevels = df == 0 ? 0 : (int) Math.floor(StrictMath.log(df) / StrictMath.log(skipInterval));
+ numberOfSkipLevels = MultiLevelSkipListReader.log(df, skipInterval);
// make sure it does not exceed maxSkipLevels
if (numberOfSkipLevels > maxSkipLevels) {