Apache Lucene open-source search software
LUCENE-10188: Give SortedSetDocValues a docValueCount() (#663)
spike.liud9d2cb6f09ae
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.javaindex 118b91a3011..ad047456e14 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@@ -1603,6 +1603,11 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {}return ords.get(start++);}++ @Override+ public long docValueCount() {+ return end - start;+ }};} else {// sparse@@ -1663,6 +1668,11 @@ final class Lucene80DocValuesProducer extends DocValuesProducer {return ords.get(start++);}}++ @Override+ public long docValueCount() {+ return end - start;+ }};}}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.javaindex a9b0fd5943e..c5a7c8bca4f 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@@ -727,6 +727,11 @@ class SimpleTextDocValuesReader extends DocValuesProducer {}}+ @Override+ public long docValueCount() {+ return currentOrds.length;+ }+@Overridepublic BytesRef lookupOrd(long ord) throws IOException {if (ord < 0 || ord >= field.numValues) {diff --git a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.javaindex 132feccebcd..407cba0bb62 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java@@ -947,6 +947,11 @@ public abstract class DocValuesConsumer implements Closeable {return currentSub.map.get(subOrd);}+ @Override+ public long docValueCount() {+ return currentSub.values.docValueCount();+ }+@Overridepublic long cost() {return finalCost;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.javaindex f1647d26273..5989334de38 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@@ -1448,6 +1448,11 @@ final class Lucene90DocValuesProducer extends DocValuesProducer {return ords.nextValue();}+ @Override+ public long docValueCount() {+ return count;+ }+@Overridepublic boolean advanceExact(int target) throws IOException {set = false;diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.javaindex 9a3706fe4f6..cf970d666c5 100644--- a/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java+++ b/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java@@ -43,6 +43,11 @@ public class FilterSortedSetDocValues extends SortedSetDocValues {return in.nextOrd();}+ @Override+ public long docValueCount() {+ return in.docValueCount();+ }+@Overridepublic BytesRef lookupOrd(long ord) throws IOException {return in.lookupOrd(ord);diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.javaindex a5981425997..b085dd775a9 100644--- a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java+++ b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java@@ -927,6 +927,11 @@ public class MultiDocValues {}}+ @Override+ public long docValueCount() {+ return currentValues.docValueCount();+ }+@Overridepublic BytesRef lookupOrd(long ord) throws IOException {int subIndex = mapping.getFirstSegmentNumber(ord);diff --git a/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.javaindex 5fcb2136e69..754f3fc231d 100644--- a/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java+++ b/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java@@ -57,6 +57,11 @@ final class SingletonSortedSetDocValues extends SortedSetDocValues {return v;}+ @Override+ public long docValueCount() {+ return 1;+ }+@Overridepublic int nextDoc() throws IOException {int docID = in.nextDoc();diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.javaindex fad7f52af38..a44b8b0b560 100644--- a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java+++ b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java@@ -44,7 +44,11 @@ public abstract class SortedSetDocValues extends DocValuesIterator {*/public abstract long nextOrd() throws IOException;- // TODO: should we have a docValueCount, like SortedNumeric?+ /**+ * Retrieves the number of values for the current document. This must always be greater than zero.+ * It is illegal to call this method after {@link #advanceExact(int)} returned {@code false}.+ */+ public abstract long docValueCount();/*** Retrieves the value for the specified ordinal. The returned {@link BytesRef} may be re-useddiff --git a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.javaindex 6ffc7a18750..eaba6e5bc30 100644--- a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java+++ b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java@@ -310,6 +310,11 @@ class SortedSetDocValuesWriter extends DocValuesWriter<SortedSetDocValues> {}}+ @Override+ public long docValueCount() {+ return ordCount;+ }+@Overridepublic long cost() {return docsWithField.cost();@@ -391,6 +396,11 @@ class SortedSetDocValuesWriter extends DocValuesWriter<SortedSetDocValues> {}}+ @Override+ public long docValueCount() {+ return ords.ords.size();+ }+@Overridepublic long cost() {return in.cost();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.javaindex e674a1d1578..383cce1cdb9 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@@ -93,6 +93,11 @@ interface GenericTermsCollector extends Collector {return target.nextOrd();}+ @Override+ public long docValueCount() {+ return target.docValueCount();+ }+@Overridepublic BytesRef lookupOrd(long ord) throws IOException {final BytesRef val = target.lookupOrd(ord);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.javaindex 7171d20ca8b..482cb5fee41 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@@ -1154,6 +1154,11 @@ public class MemoryIndex {return ord++;}+ @Override+ public long docValueCount() {+ return values.size();+ }+@Overridepublic BytesRef lookupOrd(long ord) throws IOException {return values.get(bytesIds[(int) ord], scratch);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.javaindex a3f8b9650a1..b464cb7cdc8 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@@ -1064,6 +1064,11 @@ public class AssertingLeafReader extends FilterLeafReader {return ord;}+ @Override+ public long docValueCount() {+ return in.docValueCount();+ }+@Overridepublic BytesRef lookupOrd(long ord) throws IOException {assertThread("Sorted set doc values", creationThread);