You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by lu...@apache.org on 2022/06/16 15:14:53 UTC
[lucene] branch branch_9x updated: LUCENE-10600: SortedSetDocValues#docValueCount should be an int, not long (#960)
This is an automated email from the ASF dual-hosted git repository.
luxugang pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new d79c30b524d LUCENE-10600: SortedSetDocValues#docValueCount should be an int, not long (#960)
d79c30b524d is described below
commit d79c30b524d036e2e615673371b18b3f3d75a606
Author: Lu Xugang <lu...@apache.org>
AuthorDate: Thu Jun 16 23:14:48 2022 +0800
LUCENE-10600: SortedSetDocValues#docValueCount should be an int, not long (#960)
---
lucene/CHANGES.txt | 2 ++
.../lucene70/Lucene70DocValuesProducer.java | 14 +++++++-------
.../lucene80/Lucene80DocValuesProducer.java | 14 +++++++-------
.../codecs/simpletext/SimpleTextDocValuesReader.java | 2 +-
.../java/org/apache/lucene/codecs/DocValuesConsumer.java | 2 +-
.../lucene/codecs/lucene90/Lucene90DocValuesProducer.java | 2 +-
.../core/src/java/org/apache/lucene/index/CheckIndex.java | 4 ++--
.../org/apache/lucene/index/FilterSortedSetDocValues.java | 2 +-
.../src/java/org/apache/lucene/index/MultiDocValues.java | 2 +-
.../apache/lucene/index/SingletonSortedSetDocValues.java | 2 +-
.../java/org/apache/lucene/index/SortedSetDocValues.java | 2 +-
.../org/apache/lucene/index/SortedSetDocValuesWriter.java | 6 +++---
.../apache/lucene/search/join/GenericTermsCollector.java | 2 +-
.../java/org/apache/lucene/index/memory/MemoryIndex.java | 2 +-
.../org/apache/lucene/tests/index/AssertingLeafReader.java | 2 +-
15 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 3acbbb463fb..e89850ae882 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -106,6 +106,8 @@ Bug Fixes
* LUCENE-10598: SortedSetDocValues#docValueCount() should be always greater than zero. (Lu Xugang)
+* LUCENE-10600: SortedSetDocValues#docValueCount should be an int, not long (Lu Xugang)
+
Other
---------------------
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java
index a0b53316e21..5ead96eb646 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java
@@ -1368,7 +1368,7 @@ final class Lucene70DocValuesProducer extends DocValuesProducer {
int doc = -1;
long start, end;
- long count;
+ int count;
@Override
public int nextDoc() throws IOException {
@@ -1392,7 +1392,7 @@ final class Lucene70DocValuesProducer extends DocValuesProducer {
}
start = addresses.get(target);
end = addresses.get(target + 1L);
- count = (end - start);
+ count = (int) (end - start);
return doc = target;
}
@@ -1400,7 +1400,7 @@ final class Lucene70DocValuesProducer extends DocValuesProducer {
public boolean advanceExact(int target) throws IOException {
start = addresses.get(target);
end = addresses.get(target + 1L);
- count = (end - start);
+ count = (int) (end - start);
doc = target;
return true;
}
@@ -1414,7 +1414,7 @@ final class Lucene70DocValuesProducer extends DocValuesProducer {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return count;
}
};
@@ -1428,7 +1428,7 @@ final class Lucene70DocValuesProducer extends DocValuesProducer {
boolean set;
long start;
long end = 0;
- long count;
+ int count;
@Override
public int nextDoc() throws IOException {
@@ -1463,7 +1463,7 @@ final class Lucene70DocValuesProducer extends DocValuesProducer {
final int index = disi.index();
start = addresses.get(index);
end = addresses.get(index + 1L);
- count = end - start;
+ count = (int) (end - start);
set = true;
return true;
}
@@ -1482,7 +1482,7 @@ final class Lucene70DocValuesProducer extends DocValuesProducer {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
set();
return count;
}
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene80/Lucene80DocValuesProducer.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene80/Lucene80DocValuesProducer.java
index 60c6b36fbc6..28fda7f3a08 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene80/Lucene80DocValuesProducer.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene80/Lucene80DocValuesProducer.java
@@ -1561,7 +1561,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
int doc = -1;
long start, end;
- long count;
+ int count;
@Override
public int nextDoc() throws IOException {
@@ -1585,7 +1585,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
}
start = addresses.get(target);
end = addresses.get(target + 1L);
- count = (end - start);
+ count = (int) (end - start);
return doc = target;
}
@@ -1593,7 +1593,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
public boolean advanceExact(int target) throws IOException {
start = addresses.get(target);
end = addresses.get(target + 1L);
- count = (end - start);
+ count = (int) (end - start);
doc = target;
return true;
}
@@ -1607,7 +1607,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return count;
}
};
@@ -1626,7 +1626,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
boolean set;
long start;
long end = 0;
- long count;
+ int count;
@Override
public int nextDoc() throws IOException {
@@ -1661,7 +1661,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
final int index = disi.index();
start = addresses.get(index);
end = addresses.get(index + 1L);
- count = end - start;
+ count = (int) (end - start);
set = true;
return true;
}
@@ -1680,7 +1680,7 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
set();
return count;
}
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
index c5a7c8bca4f..708392a2af3 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
@@ -728,7 +728,7 @@ class SimpleTextDocValuesReader extends DocValuesProducer {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return currentOrds.length;
}
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java
index 407cba0bb62..5e24cf43b3c 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java
@@ -948,7 +948,7 @@ public abstract class DocValuesConsumer implements Closeable {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return currentSub.values.docValueCount();
}
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducer.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducer.java
index 2bb71aa32aa..a7146f26fe3 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducer.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducer.java
@@ -1453,7 +1453,7 @@ final class Lucene90DocValuesProducer extends DocValuesProducer {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return ords.docValueCount();
}
diff --git a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
index 81e9eb2cd48..83b31ea1ece 100644
--- a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
+++ b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
@@ -3337,7 +3337,7 @@ public final class CheckIndex implements Closeable {
LongBitSet seenOrds = new LongBitSet(dv.getValueCount());
long maxOrd2 = -1;
for (int docID = dv.nextDoc(); docID != NO_MORE_DOCS; docID = dv.nextDoc()) {
- long count = dv.docValueCount();
+ int count = dv.docValueCount();
if (count == 0) {
throw new CheckIndexException(
"sortedset dv for field: "
@@ -3348,7 +3348,7 @@ public final class CheckIndex implements Closeable {
if (dv2.advanceExact(docID) == false) {
throw new CheckIndexException("advanceExact did not find matching doc ID: " + docID);
}
- long count2 = dv2.docValueCount();
+ int count2 = dv2.docValueCount();
if (count != count2) {
throw new CheckIndexException(
"advanceExact reports different value count: " + count + " != " + count2);
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java
index cf970d666c5..92c5d344e57 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java
@@ -44,7 +44,7 @@ public class FilterSortedSetDocValues extends SortedSetDocValues {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return in.docValueCount();
}
diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
index 145c0e34f3e..f528f9c4083 100644
--- a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
+++ b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
@@ -938,7 +938,7 @@ public class MultiDocValues {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return currentValues.docValueCount();
}
diff --git a/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java
index 754f3fc231d..3186d5b76fd 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java
@@ -58,7 +58,7 @@ final class SingletonSortedSetDocValues extends SortedSetDocValues {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return 1;
}
diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java
index 4ebd938551e..422964c46df 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java
@@ -49,7 +49,7 @@ public abstract class SortedSetDocValues extends DocValuesIterator {
* zero. It is illegal to call this method after {@link #advanceExact(int)} returned {@code
* false}.
*/
- public abstract long docValueCount();
+ public abstract int docValueCount();
/**
* Retrieves the value for the specified ordinal. The returned {@link BytesRef} may be re-used
diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java
index eaba6e5bc30..6ebe69c62b3 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java
@@ -311,7 +311,7 @@ class SortedSetDocValuesWriter extends DocValuesWriter<SortedSetDocValues> {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return ordCount;
}
@@ -397,8 +397,8 @@ class SortedSetDocValuesWriter extends DocValuesWriter<SortedSetDocValues> {
}
@Override
- public long docValueCount() {
- return ords.ords.size();
+ public int docValueCount() {
+ return (int) ords.ords.size();
}
@Override
diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GenericTermsCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/GenericTermsCollector.java
index 383cce1cdb9..7a5405f67c8 100644
--- a/lucene/join/src/java/org/apache/lucene/search/join/GenericTermsCollector.java
+++ b/lucene/join/src/java/org/apache/lucene/search/join/GenericTermsCollector.java
@@ -94,7 +94,7 @@ interface GenericTermsCollector extends Collector {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return target.docValueCount();
}
diff --git a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
index 482cb5fee41..d4ba82e553a 100644
--- a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
+++ b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
@@ -1155,7 +1155,7 @@ public class MemoryIndex {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return values.size();
}
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java
index b464cb7cdc8..85c71ad5727 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java
@@ -1065,7 +1065,7 @@ public class AssertingLeafReader extends FilterLeafReader {
}
@Override
- public long docValueCount() {
+ public int docValueCount() {
return in.docValueCount();
}