HSEARCH-4567 Rework stub backend to allow for projections that don't …

…consume content from the index
hibernate · May 9, 2022 · 0ea092c · 0ea092c
1 parent e0e394f
commit 0ea092c
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 15 deletions.
diff --git a/.../main/java/org/hibernate/search/util/impl/integrationtest/common/rule/SearchWorkCall.java b/.../main/java/org/hibernate/search/util/impl/integrationtest/common/rule/SearchWorkCall.java
@@ -99,7 +99,8 @@ static <H> List<H> getResults(StubSearchProjectionContext actualProjectionContex
 		for ( Object rawHit : rawHits ) {
 			actualProjectionContext.reset();
 			extractedElements.add(
-					actualRootProjection.extract( actualProjectionHitMapper, rawHit, actualProjectionContext )
+					actualRootProjection.extract( actualProjectionHitMapper, Collections.singleton( rawHit ).iterator(),
+							actualProjectionContext )
 			);
 		}
 

diff --git a/...l/integrationtest/common/stub/backend/search/projection/impl/StubCompositeProjection.java b/...l/integrationtest/common/stub/backend/search/projection/impl/StubCompositeProjection.java
@@ -7,6 +7,7 @@
 package org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.projection.impl;
 
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
@@ -36,13 +37,13 @@ public String toString() {
 	}
 
 	@Override
-	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Object projectionFromIndex,
+	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Iterator<?> projectionFromIndex,
 			StubSearchProjectionContext context) {
 		E extractedData = compositor.createInitial();
 
-		List<?> listFromIndex = (List<?>) projectionFromIndex;
+		Iterator<?> innerProjectionFromIndex = ( (List<?>) projectionFromIndex.next() ).iterator();
 		for ( int i = 0; i < inners.length; i++ ) {
-			Object extractedDataForInner = inners[i].extract( projectionHitMapper, listFromIndex.get( i ), context );
+			Object extractedDataForInner = inners[i].extract( projectionHitMapper, innerProjectionFromIndex, context );
 			extractedData = compositor.set( extractedData, i, extractedDataForInner );
 		}
 

diff --git a/...mpl/integrationtest/common/stub/backend/search/projection/impl/StubDefaultProjection.java b/...mpl/integrationtest/common/stub/backend/search/projection/impl/StubDefaultProjection.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.projection.impl;
 
+import java.util.Iterator;
+
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
 
@@ -23,9 +25,9 @@ private StubDefaultProjection() {
 	}
 
 	@Override
-	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Object projectionFromIndex,
+	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Iterator<?> projectionFromIndex,
 			StubSearchProjectionContext context) {
-		return projectionFromIndex;
+		return projectionFromIndex.next();
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/...impl/integrationtest/common/stub/backend/search/projection/impl/StubEntityProjection.java b/...impl/integrationtest/common/stub/backend/search/projection/impl/StubEntityProjection.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.projection.impl;
 
+import java.util.Iterator;
+
 import org.hibernate.search.engine.backend.common.DocumentReference;
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
@@ -24,9 +26,9 @@ private StubEntityProjection() {
 	}
 
 	@Override
-	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Object projectionFromIndex,
+	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Iterator<?> projectionFromIndex,
 			StubSearchProjectionContext context) {
-		return projectionHitMapper.planLoading( (DocumentReference) projectionFromIndex );
+		return projectionHitMapper.planLoading( (DocumentReference) projectionFromIndex.next() );
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/.../impl/integrationtest/common/stub/backend/search/projection/impl/StubFieldProjection.java b/.../impl/integrationtest/common/stub/backend/search/projection/impl/StubFieldProjection.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.projection.impl;
 
+import java.util.Iterator;
+
 import org.hibernate.search.engine.backend.types.converter.spi.ProjectionConverter;
 import org.hibernate.search.engine.search.common.ValueConvert;
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
@@ -29,9 +31,9 @@ private StubFieldProjection(Class<F> valueClass, ProjectionConverter<F, ? extend
 	}
 
 	@Override
-	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Object projectionFromIndex,
+	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Iterator<?> projectionFromIndex,
 			StubSearchProjectionContext context) {
-		return converter.fromDocumentValue( valueClass.cast( projectionFromIndex ),
+		return converter.fromDocumentValue( valueClass.cast( projectionFromIndex.next() ),
 				context.fromDocumentValueConvertContext() );
 	}
 

diff --git a/...til/impl/integrationtest/common/stub/backend/search/projection/impl/StubIdProjection.java b/...til/impl/integrationtest/common/stub/backend/search/projection/impl/StubIdProjection.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.projection.impl;
 
+import java.util.Iterator;
+
 import org.hibernate.search.engine.backend.common.DocumentReference;
 import org.hibernate.search.engine.backend.types.converter.spi.ProjectionConverter;
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
@@ -20,9 +22,9 @@ public class StubIdProjection<I> implements StubSearchProjection<I> {
 	}
 
 	@Override
-	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Object projectionFromIndex,
+	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Iterator<?> projectionFromIndex,
 			StubSearchProjectionContext context) {
-		return projectionFromIndex;
+		return projectionFromIndex.next();
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/...l/integrationtest/common/stub/backend/search/projection/impl/StubReferenceProjection.java b/...l/integrationtest/common/stub/backend/search/projection/impl/StubReferenceProjection.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.projection.impl;
 
+import java.util.Iterator;
+
 import org.hibernate.search.engine.backend.common.DocumentReference;
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
@@ -24,9 +26,9 @@ private StubReferenceProjection() {
 	}
 
 	@Override
-	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Object projectionFromIndex,
+	public Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Iterator<?> projectionFromIndex,
 			StubSearchProjectionContext context) {
-		return projectionFromIndex;
+		return projectionFromIndex.next();
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/...impl/integrationtest/common/stub/backend/search/projection/impl/StubSearchProjection.java b/...impl/integrationtest/common/stub/backend/search/projection/impl/StubSearchProjection.java
@@ -6,14 +6,16 @@
  */
 package org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.projection.impl;
 
+import java.util.Iterator;
+
 import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
 import org.hibernate.search.util.common.AssertionFailure;
 
 public interface StubSearchProjection<P> extends SearchProjection<P> {
 
-	Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Object projectionFromIndex,
+	Object extract(ProjectionHitMapper<?, ?> projectionHitMapper, Iterator<?> projectionFromIndex,
 			StubSearchProjectionContext context);
 
 	P transform(LoadingResult<?, ?> loadingResult, Object extractedData, StubSearchProjectionContext context);