HSEARCH-5133 Push operations into each Lucene*Aggregation

hibernate · Aug 27, 2024 · 9c15aa2 · 9c15aa2
1 parent 2972d63
commit 9c15aa2
Show file tree

Hide file tree

Showing 11 changed files with 175 additions and 71 deletions.
diff --git a/.../backend/lucene/types/aggregation/impl/AbstractLuceneMetricCompensatedSumAggregation.java b/.../backend/lucene/types/aggregation/impl/AbstractLuceneMetricCompensatedSumAggregation.java
@@ -121,41 +121,30 @@ private TypeSelector(AbstractLuceneNumericFieldCodec<F, ?> codec,
 						.withConvertedType( expectedType, field );
 			}
 
-			return new Builder<>( codec, scope, field,
-					projectionConverter,
-					operation
-			);
+			if ( "sum".equals( operation ) ) {
+				return new LuceneSumCompensatedSumAggregation.Builder<>( codec, scope, field, projectionConverter );
+			}
+			else if ( "avg".equals( operation ) ) {
+				return new LuceneAvgCompensatedSumAggregation.Builder<>( codec, scope, field, projectionConverter );
+			}
+			else {
+				throw new AssertionFailure( "Aggregation operation not supported: " + operation );
+			}
 		}
 	}
 
-	protected static class Builder<F, E extends Number, K> extends AbstractBuilder<K>
+	protected abstract static class Builder<F, E extends Number, K> extends AbstractBuilder<K>
 			implements FieldMetricAggregationBuilder<K> {
 
 		private final AbstractLuceneNumericFieldCodec<F, E> codec;
 		private final ProjectionConverter<F, ? extends K> fromFieldValueConverter;
-		private final String operation;
 
 		public Builder(AbstractLuceneNumericFieldCodec<F, E> codec, LuceneSearchIndexScope<?> scope,
 				LuceneSearchIndexValueFieldContext<F> field,
-				ProjectionConverter<F, ? extends K> fromFieldValueConverter,
-				String operation) {
+				ProjectionConverter<F, ? extends K> fromFieldValueConverter) {
 			super( scope, field );
 			this.codec = codec;
 			this.fromFieldValueConverter = fromFieldValueConverter;
-			this.operation = operation;
-		}
-
-		@Override
-		public AbstractLuceneMetricCompensatedSumAggregation<F, E, K> build() {
-			if ( "sum".equals( operation ) ) {
-				return new LuceneSumCompensatedSumAggregation<>( this );
-			}
-			else if ( "avg".equals( operation ) ) {
-				return new LuceneAvgCompensatedSumAggregation<>( this );
-			}
-			else {
-				throw new AssertionFailure( "Aggregation operation not supported: " + operation );
-			}
 		}
 	}
 }
diff --git a/...ch/backend/lucene/types/aggregation/impl/AbstractLuceneMetricNumericFieldAggregation.java b/...ch/backend/lucene/types/aggregation/impl/AbstractLuceneMetricNumericFieldAggregation.java
@@ -138,47 +138,36 @@ private TypeSelector(AbstractLuceneNumericFieldCodec<F, ?> codec,
 						.withConvertedType( expectedType, field );
 			}
 
-			return new Builder<>( codec, scope, field,
-					projectionConverter,
-					operation
-			);
+			if ( "sum".equals( operation ) ) {
+				return new LuceneSumNumericFieldAggregation.Builder<>( codec, scope, field, projectionConverter );
+			}
+			else if ( "min".equals( operation ) ) {
+				return new LuceneMinNumericFieldAggregation.Builder<>( codec, scope, field, projectionConverter );
+			}
+			else if ( "max".equals( operation ) ) {
+				return new LuceneMaxNumericFieldAggregation.Builder<>( codec, scope, field, projectionConverter );
+			}
+			else if ( "avg".equals( operation ) ) {
+				return new LuceneAvgNumericFieldAggregation.Builder<>( codec, scope, field, projectionConverter );
+			}
+			else {
+				throw new AssertionFailure( "Aggregation operation not supported: " + operation );
+			}
 		}
 	}
 
-	protected static class Builder<F, E extends Number, K> extends AbstractBuilder<K>
+	protected abstract static class Builder<F, E extends Number, K> extends AbstractBuilder<K>
 			implements FieldMetricAggregationBuilder<K> {
 
 		private final AbstractLuceneNumericFieldCodec<F, E> codec;
 		private final ProjectionConverter<F, ? extends K> fromFieldValueConverter;
-		private final String operation;
 
 		public Builder(AbstractLuceneNumericFieldCodec<F, E> codec, LuceneSearchIndexScope<?> scope,
 				LuceneSearchIndexValueFieldContext<F> field,
-				ProjectionConverter<F, ? extends K> fromFieldValueConverter,
-				String operation) {
+				ProjectionConverter<F, ? extends K> fromFieldValueConverter) {
 			super( scope, field );
 			this.codec = codec;
 			this.fromFieldValueConverter = fromFieldValueConverter;
-			this.operation = operation;
-		}
-
-		@Override
-		public AbstractLuceneMetricNumericFieldAggregation<F, E, K> build() {
-			if ( "sum".equals( operation ) ) {
-				return new LuceneSumNumericFieldAggregation<>( this );
-			}
-			else if ( "min".equals( operation ) ) {
-				return new LuceneMinNumericFieldAggregation<>( this );
-			}
-			else if ( "max".equals( operation ) ) {
-				return new LuceneMaxNumericFieldAggregation<>( this );
-			}
-			else if ( "avg".equals( operation ) ) {
-				return new LuceneAvgNumericFieldAggregation<>( this );
-			}
-			else {
-				throw new AssertionFailure( "Aggregation operation not supported: " + operation );
-			}
 		}
 	}
 }
diff --git a/...rch/backend/lucene/types/aggregation/impl/AbstractLuceneMetricNumericLongAggregation.java b/...rch/backend/lucene/types/aggregation/impl/AbstractLuceneMetricNumericLongAggregation.java
@@ -24,7 +24,7 @@ public abstract class AbstractLuceneMetricNumericLongAggregation extends Abstrac
 
 	protected CollectorKey<?, Long> collectorKey;
 
-	AbstractLuceneMetricNumericLongAggregation(Builder builder) {
+	AbstractLuceneMetricNumericLongAggregation(AbstractBuilder<Long> builder) {
 		super( builder );
 		this.indexNames = builder.scope.hibernateSearchIndexNames();
 		this.absoluteFieldPath = builder.field.absolutePath();
@@ -69,27 +69,11 @@ protected Factory(AbstractLuceneNumericFieldCodec<F, ?> codec, String operation)
 		@Override
 		public FieldMetricAggregationBuilder<Long> create(LuceneSearchIndexScope<?> scope,
 				LuceneSearchIndexValueFieldContext<F> field) {
-			return new Builder( scope, field, operation );
-		}
-	}
-
-	protected static class Builder extends AbstractBuilder<Long> implements FieldMetricAggregationBuilder<Long> {
-		private final String operation;
-
-		public Builder(LuceneSearchIndexScope<?> scope,
-				LuceneSearchIndexValueFieldContext<?> field,
-				String operation) {
-			super( scope, field );
-			this.operation = operation;
-		}
-
-		@Override
-		public AbstractLuceneMetricNumericLongAggregation build() {
 			if ( "value_count".equals( operation ) ) {
-				return new LuceneCountNumericLongAggregation( this );
+				return new LuceneCountNumericLongAggregation.Builder( scope, field );
 			}
 			else if ( "cardinality".equals( operation ) ) {
-				return new LuceneCountDistinctNumericLongAggregation( this );
+				return new LuceneCountDistinctNumericLongAggregation.Builder( scope, field );
 			}
 			else {
 				throw new AssertionFailure( "Aggregation operation not supported: " + operation );

diff --git a/...nate/search/backend/lucene/types/aggregation/impl/LuceneAvgCompensatedSumAggregation.java b/...nate/search/backend/lucene/types/aggregation/impl/LuceneAvgCompensatedSumAggregation.java
@@ -9,8 +9,11 @@
 import org.hibernate.search.backend.lucene.lowlevel.docvalues.impl.JoiningLongMultiValuesSource;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationExtractContext;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationRequestContext;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexScope;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexValueFieldContext;
 import org.hibernate.search.backend.lucene.types.codec.impl.AbstractLuceneNumericFieldCodec;
 import org.hibernate.search.backend.lucene.types.lowlevel.impl.LuceneNumericDomain;
+import org.hibernate.search.engine.backend.types.converter.spi.ProjectionConverter;
 
 public class LuceneAvgCompensatedSumAggregation<F, E extends Number, K>
 		extends AbstractLuceneMetricCompensatedSumAggregation<F, E, K> {
@@ -43,4 +46,20 @@ E extractEncoded(AggregationExtractContext context, LuceneNumericDomain<E> numer
 		double avg = ( sum / counts );
 		return numericDomain.doubleToTerm( avg );
 	}
+
+	protected static class Builder<F, E extends Number, K>
+			extends AbstractLuceneMetricCompensatedSumAggregation.Builder<F, E, K> {
+
+		public Builder(AbstractLuceneNumericFieldCodec<F, E> codec,
+				LuceneSearchIndexScope<?> scope,
+				LuceneSearchIndexValueFieldContext<F> field,
+				ProjectionConverter<F, ? extends K> fromFieldValueConverter) {
+			super( codec, scope, field, fromFieldValueConverter );
+		}
+
+		@Override
+		public AbstractLuceneMetricCompensatedSumAggregation<F, E, K> build() {
+			return new LuceneAvgCompensatedSumAggregation<>( this );
+		}
+	}
 }
diff --git a/...ernate/search/backend/lucene/types/aggregation/impl/LuceneAvgNumericFieldAggregation.java b/...ernate/search/backend/lucene/types/aggregation/impl/LuceneAvgNumericFieldAggregation.java
@@ -8,7 +8,10 @@
 import org.hibernate.search.backend.lucene.lowlevel.aggregation.collector.impl.SumCollectorFactory;
 import org.hibernate.search.backend.lucene.lowlevel.docvalues.impl.JoiningLongMultiValuesSource;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationRequestContext;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexScope;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexValueFieldContext;
 import org.hibernate.search.backend.lucene.types.codec.impl.AbstractLuceneNumericFieldCodec;
+import org.hibernate.search.engine.backend.types.converter.spi.ProjectionConverter;
 
 public class LuceneAvgNumericFieldAggregation<F, E extends Number, K>
 		extends AbstractLuceneMetricNumericFieldAggregation<F, E, K> {
@@ -30,4 +33,20 @@ void fillCollectors(JoiningLongMultiValuesSource source, AggregationRequestConte
 		context.requireCollector( sumCollectorFactory );
 		context.requireCollector( countCollectorFactory );
 	}
+
+	protected static class Builder<F, E extends Number, K>
+			extends AbstractLuceneMetricNumericFieldAggregation.Builder<F, E, K> {
+
+		public Builder(AbstractLuceneNumericFieldCodec<F, E> codec,
+				LuceneSearchIndexScope<?> scope,
+				LuceneSearchIndexValueFieldContext<F> field,
+				ProjectionConverter<F, ? extends K> fromFieldValueConverter) {
+			super( codec, scope, field, fromFieldValueConverter );
+		}
+
+		@Override
+		public AbstractLuceneMetricNumericFieldAggregation<F, E, K> build() {
+			return new LuceneAvgNumericFieldAggregation<>( this );
+		}
+	}
 }
diff --git a/...arch/backend/lucene/types/aggregation/impl/LuceneCountDistinctNumericLongAggregation.java b/...arch/backend/lucene/types/aggregation/impl/LuceneCountDistinctNumericLongAggregation.java
@@ -7,7 +7,10 @@
 import org.hibernate.search.backend.lucene.lowlevel.aggregation.collector.impl.CountDistinctCollectorFactory;
 import org.hibernate.search.backend.lucene.lowlevel.docvalues.impl.JoiningLongMultiValuesSource;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationRequestContext;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexScope;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexValueFieldContext;
 import org.hibernate.search.backend.lucene.types.codec.impl.AbstractLuceneNumericFieldCodec;
+import org.hibernate.search.engine.search.aggregation.spi.FieldMetricAggregationBuilder;
 
 public class LuceneCountDistinctNumericLongAggregation extends AbstractLuceneMetricNumericLongAggregation {
 
@@ -25,4 +28,15 @@ void fillCollectors(JoiningLongMultiValuesSource source, AggregationRequestConte
 		collectorKey = collectorFactory.getCollectorKey();
 		context.requireCollector( collectorFactory );
 	}
+
+	protected static class Builder extends AbstractBuilder<Long> implements FieldMetricAggregationBuilder<Long> {
+		public Builder(LuceneSearchIndexScope<?> scope, LuceneSearchIndexValueFieldContext<?> field) {
+			super( scope, field );
+		}
+
+		@Override
+		public AbstractLuceneMetricNumericLongAggregation build() {
+			return new LuceneCountDistinctNumericLongAggregation( this );
+		}
+	}
 }
diff --git a/...rnate/search/backend/lucene/types/aggregation/impl/LuceneCountNumericLongAggregation.java b/...rnate/search/backend/lucene/types/aggregation/impl/LuceneCountNumericLongAggregation.java
@@ -7,15 +7,18 @@
 import org.hibernate.search.backend.lucene.lowlevel.aggregation.collector.impl.CountCollectorFactory;
 import org.hibernate.search.backend.lucene.lowlevel.docvalues.impl.JoiningLongMultiValuesSource;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationRequestContext;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexScope;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexValueFieldContext;
 import org.hibernate.search.backend.lucene.types.codec.impl.AbstractLuceneNumericFieldCodec;
+import org.hibernate.search.engine.search.aggregation.spi.FieldMetricAggregationBuilder;
 
 public class LuceneCountNumericLongAggregation extends AbstractLuceneMetricNumericLongAggregation {
 
 	public static <F> Factory<F> factory(AbstractLuceneNumericFieldCodec<F, ?> codec) {
 		return new Factory<>( codec, "value_count" );
 	}
 
-	LuceneCountNumericLongAggregation(AbstractLuceneMetricNumericLongAggregation.Builder builder) {
+	LuceneCountNumericLongAggregation(Builder builder) {
 		super( builder );
 	}
 
@@ -25,4 +28,15 @@ void fillCollectors(JoiningLongMultiValuesSource source, AggregationRequestConte
 		collectorKey = collectorFactory.getCollectorKey();
 		context.requireCollector( collectorFactory );
 	}
+
+	protected static class Builder extends AbstractBuilder<Long> implements FieldMetricAggregationBuilder<Long> {
+		public Builder(LuceneSearchIndexScope<?> scope, LuceneSearchIndexValueFieldContext<?> field) {
+			super( scope, field );
+		}
+
+		@Override
+		public AbstractLuceneMetricNumericLongAggregation build() {
+			return new LuceneCountNumericLongAggregation( this );
+		}
+	}
 }
diff --git a/...ernate/search/backend/lucene/types/aggregation/impl/LuceneMaxNumericFieldAggregation.java b/...ernate/search/backend/lucene/types/aggregation/impl/LuceneMaxNumericFieldAggregation.java
@@ -7,7 +7,10 @@
 import org.hibernate.search.backend.lucene.lowlevel.aggregation.collector.impl.MaxCollectorFactory;
 import org.hibernate.search.backend.lucene.lowlevel.docvalues.impl.JoiningLongMultiValuesSource;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationRequestContext;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexScope;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexValueFieldContext;
 import org.hibernate.search.backend.lucene.types.codec.impl.AbstractLuceneNumericFieldCodec;
+import org.hibernate.search.engine.backend.types.converter.spi.ProjectionConverter;
 
 public class LuceneMaxNumericFieldAggregation<F, E extends Number, K>
 		extends AbstractLuceneMetricNumericFieldAggregation<F, E, K> {
@@ -26,4 +29,20 @@ void fillCollectors(JoiningLongMultiValuesSource source, AggregationRequestConte
 		collectorKey = collectorFactory.getCollectorKey();
 		context.requireCollector( collectorFactory );
 	}
+
+	protected static class Builder<F, E extends Number, K>
+			extends AbstractLuceneMetricNumericFieldAggregation.Builder<F, E, K> {
+
+		public Builder(AbstractLuceneNumericFieldCodec<F, E> codec,
+				LuceneSearchIndexScope<?> scope,
+				LuceneSearchIndexValueFieldContext<F> field,
+				ProjectionConverter<F, ? extends K> fromFieldValueConverter) {
+			super( codec, scope, field, fromFieldValueConverter );
+		}
+
+		@Override
+		public AbstractLuceneMetricNumericFieldAggregation<F, E, K> build() {
+			return new LuceneMaxNumericFieldAggregation<>( this );
+		}
+	}
 }
diff --git a/...ernate/search/backend/lucene/types/aggregation/impl/LuceneMinNumericFieldAggregation.java b/...ernate/search/backend/lucene/types/aggregation/impl/LuceneMinNumericFieldAggregation.java
@@ -7,7 +7,10 @@
 import org.hibernate.search.backend.lucene.lowlevel.aggregation.collector.impl.MinCollectorFactory;
 import org.hibernate.search.backend.lucene.lowlevel.docvalues.impl.JoiningLongMultiValuesSource;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationRequestContext;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexScope;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexValueFieldContext;
 import org.hibernate.search.backend.lucene.types.codec.impl.AbstractLuceneNumericFieldCodec;
+import org.hibernate.search.engine.backend.types.converter.spi.ProjectionConverter;
 
 public class LuceneMinNumericFieldAggregation<F, E extends Number, K>
 		extends AbstractLuceneMetricNumericFieldAggregation<F, E, K> {
@@ -26,4 +29,20 @@ void fillCollectors(JoiningLongMultiValuesSource source, AggregationRequestConte
 		collectorKey = collectorFactory.getCollectorKey();
 		context.requireCollector( collectorFactory );
 	}
+
+	protected static class Builder<F, E extends Number, K>
+			extends AbstractLuceneMetricNumericFieldAggregation.Builder<F, E, K> {
+
+		public Builder(AbstractLuceneNumericFieldCodec<F, E> codec,
+				LuceneSearchIndexScope<?> scope,
+				LuceneSearchIndexValueFieldContext<F> field,
+				ProjectionConverter<F, ? extends K> fromFieldValueConverter) {
+			super( codec, scope, field, fromFieldValueConverter );
+		}
+
+		@Override
+		public AbstractLuceneMetricNumericFieldAggregation<F, E, K> build() {
+			return new LuceneMinNumericFieldAggregation<>( this );
+		}
+	}
 }
diff --git a/...nate/search/backend/lucene/types/aggregation/impl/LuceneSumCompensatedSumAggregation.java b/...nate/search/backend/lucene/types/aggregation/impl/LuceneSumCompensatedSumAggregation.java
@@ -8,8 +8,11 @@
 import org.hibernate.search.backend.lucene.lowlevel.docvalues.impl.JoiningLongMultiValuesSource;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationExtractContext;
 import org.hibernate.search.backend.lucene.search.aggregation.impl.AggregationRequestContext;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexScope;
+import org.hibernate.search.backend.lucene.search.common.impl.LuceneSearchIndexValueFieldContext;
 import org.hibernate.search.backend.lucene.types.codec.impl.AbstractLuceneNumericFieldCodec;
 import org.hibernate.search.backend.lucene.types.lowlevel.impl.LuceneNumericDomain;
+import org.hibernate.search.engine.backend.types.converter.spi.ProjectionConverter;
 
 public class LuceneSumCompensatedSumAggregation<F, E extends Number, K>
 		extends AbstractLuceneMetricCompensatedSumAggregation<F, E, K> {
@@ -18,7 +21,7 @@ public static <F> Factory<F> factory(AbstractLuceneNumericFieldCodec<F, ?> codec
 		return new Factory<>( codec, "sum" );
 	}
 
-	LuceneSumCompensatedSumAggregation(AbstractLuceneMetricCompensatedSumAggregation.Builder<F, E, K> builder) {
+	LuceneSumCompensatedSumAggregation(Builder<F, E, K> builder) {
 		super( builder );
 	}
 
@@ -36,4 +39,20 @@ E extractEncoded(AggregationExtractContext context, LuceneNumericDomain<E> numer
 		Double sum = context.getFacets( compensatedSumCollectorKey );
 		return numericDomain.doubleToTerm( sum );
 	}
+
+	protected static class Builder<F, E extends Number, K>
+			extends AbstractLuceneMetricCompensatedSumAggregation.Builder<F, E, K> {
+
+		public Builder(AbstractLuceneNumericFieldCodec<F, E> codec,
+				LuceneSearchIndexScope<?> scope,
+				LuceneSearchIndexValueFieldContext<F> field,
+				ProjectionConverter<F, ? extends K> fromFieldValueConverter) {
+			super( codec, scope, field, fromFieldValueConverter );
+		}
+
+		@Override
+		public AbstractLuceneMetricCompensatedSumAggregation<F, E, K> build() {
+			return new LuceneSumCompensatedSumAggregation<>( this );
+		}
+	}
 }