diff --git a/lucene/backward-codecs/src/generated/checksums/generateForDeltaUtil101.json b/lucene/backward-codecs/src/generated/checksums/generateForDeltaUtil101.json index b08480a3eda1..5c9a5c7926f5 100644 --- a/lucene/backward-codecs/src/generated/checksums/generateForDeltaUtil101.json +++ b/lucene/backward-codecs/src/generated/checksums/generateForDeltaUtil101.json @@ -1,4 +1,4 @@ { - "lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/ForDeltaUtil.java": "29fd59e9847d3012497c3079fa7ebc4f68fa6a94", + "lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/ForDeltaUtil.java": "19ddcb5229ae0a3b5c14f9c8a2fca5e811a7b172", "lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/gen_ForDeltaUtil.py": "147b81236bc0373fe97e808c0ae7a2cb6276ae5a" } diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/ForDeltaUtil.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/ForDeltaUtil.java index 276ed2006239..ae01015a2978 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/ForDeltaUtil.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/ForDeltaUtil.java @@ -104,9 +104,10 @@ private static void prefixSum16(int[] arr, int base) { } private static void prefixSum32(int[] arr, int base) { - arr[0] += base; - for (int i = 1; i < BLOCK_SIZE; ++i) { - arr[i] += arr[i - 1]; + int sum = base; + for (int i = 0; i < BLOCK_SIZE; ++i) { + sum += arr[i]; + arr[i] = sum; } } diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/Lucene101PostingsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/Lucene101PostingsReader.java index 62f9b49f6526..0bc94899b5bd 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/Lucene101PostingsReader.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/Lucene101PostingsReader.java @@ -185,10 +185,11 @@ public void init(IndexInput termsIn, SegmentReadState state) throws IOException } } - static void prefixSum(int[] buffer, int count, long base) { - buffer[0] += base; - for (int i = 1; i < count; ++i) { - buffer[i] += buffer[i - 1]; + static void prefixSum(int[] buffer, int count, int base) { + int sum = base; + for (int i = 0; i < count; ++i) { + sum += buffer[i]; + buffer[i] = sum; } } @@ -606,8 +607,10 @@ private void refillFullBlock() throws IOException { for (int i = 0; i < numLongs - 1; ++i) { docCumulativeWordPopCounts[i] = Long.bitCount(docBitSet.getBits()[i]); } + int sum = docCumulativeWordPopCounts[0]; for (int i = 1; i < numLongs - 1; ++i) { - docCumulativeWordPopCounts[i] += docCumulativeWordPopCounts[i - 1]; + sum += docCumulativeWordPopCounts[i]; + docCumulativeWordPopCounts[i] = sum; } docCumulativeWordPopCounts[numLongs - 1] = BLOCK_SIZE; assert docCumulativeWordPopCounts[numLongs - 2] diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/Lucene50CompressingTermVectorsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/Lucene50CompressingTermVectorsReader.java index bee4ea5e3084..3e69d751fd21 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/Lucene50CompressingTermVectorsReader.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/Lucene50CompressingTermVectorsReader.java @@ -547,8 +547,10 @@ public Fields get(int doc) throws IOException { // delta-decode start offsets and patch lengths using term lengths final int termLength = fPrefixLengths[j] + fSuffixLengths[j]; lengths[i][positionIndex[i][j]] += termLength; + int sum = fStartOffsets[positionIndex[i][j]]; for (int k = positionIndex[i][j] + 1; k < positionIndex[i][j + 1]; ++k) { - fStartOffsets[k] += fStartOffsets[k - 1]; + sum += fStartOffsets[k]; + fStartOffsets[k] = sum; fLengths[k] += termLength; } } @@ -565,8 +567,10 @@ public Fields get(int doc) throws IOException { if (fPositions != null) { for (int j = 0, end = (int) numTerms.get(skip + i); j < end; ++j) { // delta-decode start offsets + int sum = fPositions[fpositionIndex[j]]; for (int k = fpositionIndex[j] + 1; k < fpositionIndex[j + 1]; ++k) { - fPositions[k] += fPositions[k - 1]; + sum += fPositions[k]; + fPositions[k] = sum; } } } diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/Lucene84PostingsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/Lucene84PostingsReader.java index 9709c7aa9d7b..2e6d9d7507de 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/Lucene84PostingsReader.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/Lucene84PostingsReader.java @@ -164,9 +164,10 @@ static void readVIntBlock( } static void prefixSum(long[] buffer, int count, long base) { - buffer[0] += base; - for (int i = 1; i < count; ++i) { - buffer[i] += buffer[i - 1]; + long sum = base; + for (int i = 0; i < count; ++i) { + sum += buffer[i]; + buffer[i] = sum; } } diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90PostingsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90PostingsReader.java index 190fe5b1d1d5..ea775ac098f6 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90PostingsReader.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90PostingsReader.java @@ -162,9 +162,10 @@ static void readVIntBlock( } static void prefixSum(long[] buffer, int count, long base) { - buffer[0] += base; - for (int i = 1; i < count; ++i) { - buffer[i] += buffer[i - 1]; + long sum = base; + for (int i = 0; i < count; ++i) { + sum += buffer[i]; + buffer[i] = sum; } } diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/Lucene912PostingsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/Lucene912PostingsReader.java index 77353ed63da6..6e48442d05d8 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/Lucene912PostingsReader.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/Lucene912PostingsReader.java @@ -196,9 +196,10 @@ public void init(IndexInput termsIn, SegmentReadState state) throws IOException } static void prefixSum(long[] buffer, int count, long base) { - buffer[0] += base; - for (int i = 1; i < count; ++i) { - buffer[i] += buffer[i - 1]; + long sum = base; + for (int i = 0; i < count; ++i) { + sum += buffer[i]; + buffer[i] = sum; } } diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/Lucene99PostingsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/Lucene99PostingsReader.java index 1cc41e239263..28617c8cf6ef 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/Lucene99PostingsReader.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/Lucene99PostingsReader.java @@ -145,9 +145,10 @@ public void init(IndexInput termsIn, SegmentReadState state) throws IOException } static void prefixSum(long[] buffer, int count, long base) { - buffer[0] += base; - for (int i = 1; i < count; ++i) { - buffer[i] += buffer[i - 1]; + long sum = base; + for (int i = 0; i < count; ++i) { + sum += buffer[i]; + buffer[i] = sum; } } diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/compressing/Lucene90CompressingTermVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/compressing/Lucene90CompressingTermVectorsReader.java index a39112039570..30fac85a3fb2 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/compressing/Lucene90CompressingTermVectorsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/compressing/Lucene90CompressingTermVectorsReader.java @@ -608,11 +608,13 @@ public Fields get(int doc) throws IOException { final int[] fSuffixLengths = suffixLengths[i]; final int[] fLengths = lengths[i]; for (int j = 0, end = (int) numTerms.get(skip + i); j < end; ++j) { - // delta-decode start offsets and patch lengths using term lengths + // delta-decode start offsets and patch lengths using term lengths final int termLength = fPrefixLengths[j] + fSuffixLengths[j]; lengths[i][positionIndex[i][j]] += termLength; + int sum = fStartOffsets[positionIndex[i][j]]; for (int k = positionIndex[i][j] + 1; k < positionIndex[i][j + 1]; ++k) { - fStartOffsets[k] += fStartOffsets[k - 1]; + sum += fStartOffsets[k]; + fStartOffsets[k] = sum; fLengths[k] += termLength; } } @@ -629,8 +631,10 @@ public Fields get(int doc) throws IOException { if (fPositions != null) { for (int j = 0, end = (int) numTerms.get(skip + i); j < end; ++j) { // delta-decode start offsets + int sum = fPositions[fpositionIndex[j]]; for (int k = fpositionIndex[j] + 1; k < fpositionIndex[j + 1]; ++k) { - fPositions[k] += fPositions[k - 1]; + sum += fPositions[k]; + fPositions[k] = sum; } } }