Apache Lucene open-source search software
Optimize computing number of levels in MultiLevelSkipListWriter#bufferSkip (#12653)
Shubham Chaudharyde8ae1de7cc0
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex d6bf6d2283f..26536192dd3 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -209,6 +209,8 @@ Optimizations* GITHUB#12651: Use 2d array for OnHeapHnswGraph representation. (Patrick Zhai)+* GITHUB#12653: Optimize computing number of levels in MultiLevelSkipListWriter#bufferSkip. (Shubham Chaudhary)+Changes in runtime behavior---------------------diff --git a/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.javaindex f592b7c0737..bbeed679a38 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java@@ -63,25 +63,24 @@ public abstract class MultiLevelSkipListWriter {/** for every skip level a different buffer is used */private ByteBuffersDataOutput[] skipBuffer;+ /** Length of the window at which the skips are placed on skip level 1 */+ private final int windowLength;+/** Creates a {@code MultiLevelSkipListWriter}. */protected MultiLevelSkipListWriter(int skipInterval, int skipMultiplier, int maxSkipLevels, int df) {this.skipInterval = skipInterval;this.skipMultiplier = skipMultiplier;- int numberOfSkipLevels;// calculate the maximum number of skip levels for this document frequency- if (df <= skipInterval) {- numberOfSkipLevels = 1;+ if (df > skipInterval) {+ // also make sure it does not exceed maxSkipLevels+ this.numberOfSkipLevels =+ Math.min(1 + MathUtil.log(df / skipInterval, skipMultiplier), maxSkipLevels);} else {- numberOfSkipLevels = 1 + MathUtil.log(df / skipInterval, skipMultiplier);- }-- // make sure it does not exceed maxSkipLevels- if (numberOfSkipLevels > maxSkipLevels) {- numberOfSkipLevels = maxSkipLevels;+ this.numberOfSkipLevels = 1;}- this.numberOfSkipLevels = numberOfSkipLevels;+ this.windowLength = Math.toIntExact(skipInterval * (long) skipMultiplier);}/**@@ -130,12 +129,16 @@ public abstract class MultiLevelSkipListWriter {assert df % skipInterval == 0;int numLevels = 1;- df /= skipInterval;-- // determine max level- while ((df % skipMultiplier) == 0 && numLevels < numberOfSkipLevels) {+ // This optimizes the most common case i.e. numLevels = 1, it does a single modulo check to+ // catch that case+ if (df % windowLength == 0) {numLevels++;- df /= skipMultiplier;+ df /= windowLength;+ // determine max level+ while ((df % skipMultiplier) == 0 && numLevels < numberOfSkipLevels) {+ numLevels++;+ df /= skipMultiplier;+ }}long childPointer = 0;