HSEARCH-4969 Align the implementation of LongMultiValues on TextMulti…

…Values I'm not sure this fixes a bug, but it makes the code clearer IMO.
hibernate · Sep 25, 2023 · b7019b3 · b7019b3
1 parent f8eb6be
commit b7019b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/...hibernate/search/backend/lucene/lowlevel/docvalues/impl/JoiningLongMultiValuesSource.java b/...hibernate/search/backend/lucene/lowlevel/docvalues/impl/JoiningLongMultiValuesSource.java
@@ -89,43 +89,30 @@ protected LongMultiValues select(SortedNumericDocValues values, ChildDocIds chil
 			return LongMultiValues.EMPTY;
 		}
 
-		return new LongMultiValues() {
-			int currentParentDoc = -1;
-			int remainingValuesForChild = 0;
+		return new LongMultiValues.DocValuesLongMultiValues( values ) {
+			private int currentParentDoc = -1;
 
 			@Override
 			public boolean advanceExact(int parentDoc) throws IOException {
 				assert parentDoc >= currentParentDoc : "can only evaluate current and upcoming parent docs";
 				if ( parentDoc == currentParentDoc ) {
 					return hasNextValue();
 				}
-
 				currentParentDoc = parentDoc;
-				remainingValuesForChild = 0; // To be set in the next call to hasNextValue()
-
-				return childDocsWithValues.advanceExactParent( parentDoc );
+				boolean found = childDocsWithValues.advanceExactParent( parentDoc );
+				updateRemaining( found );
+				return found;
 			}
 
 			@Override
 			public boolean hasNextValue() throws IOException {
-				if ( remainingValuesForChild > 0 ) {
-					return true;
-				}
-
-				if ( childDocsWithValues.nextChild() != DocIdSetIterator.NO_MORE_DOCS ) {
-					remainingValuesForChild = values.docValueCount();
+				if ( super.hasNextValue() ) {
 					return true;
 				}
-				else {
-					remainingValuesForChild = 0;
-					return false;
-				}
-			}
 
-			@Override
-			public long nextValue() throws IOException {
-				--remainingValuesForChild;
-				return values.nextValue();
+				boolean hasNextChildDocWithValue = childDocsWithValues.nextChild() != DocIdSetIterator.NO_MORE_DOCS;
+				updateRemaining( hasNextChildDocWithValue );
+				return hasNextChildDocWithValue;
 			}
 		};
 	}

diff --git a/...ain/java/org/hibernate/search/backend/lucene/lowlevel/docvalues/impl/LongMultiValues.java b/...ain/java/org/hibernate/search/backend/lucene/lowlevel/docvalues/impl/LongMultiValues.java
@@ -65,7 +65,7 @@ public long nextValue() {
 		}
 	};
 
-	private static class DocValuesLongMultiValues extends LongMultiValues {
+	protected static class DocValuesLongMultiValues extends LongMultiValues {
 
 		private final SortedNumericDocValues values;
 		private int remaining;
@@ -77,12 +77,16 @@ private static class DocValuesLongMultiValues extends LongMultiValues {
 		@Override
 		public boolean advanceExact(int doc) throws IOException {
 			boolean found = values.advanceExact( doc );
-			this.remaining = found ? values.docValueCount() : 0;
+			updateRemaining( found );
 			return found;
 		}
 
+		protected final void updateRemaining(boolean hasDocValue) {
+			remaining = hasDocValue ? values.docValueCount() : 0;
+		}
+
 		@Override
-		public boolean hasNextValue() {
+		public boolean hasNextValue() throws IOException {
 			return remaining > 0;
 		}