Automatic reindexing - without fine-grained dirty checking

engine/src/main/java/org/hibernate/search/v6poc/backend/index/spi/DocumentContributor.java

@@ -8,7 +8,7 @@
 
 
 /**
- * @author Yoann Rodiere
+ * @param <D> The expected document type.
  */
 public interface DocumentContributor<D> {
 

engine/src/main/java/org/hibernate/search/v6poc/engine/impl/IndexManagerBuildingStateHolder.java

@@ -12,7 +12,6 @@
 
 import org.hibernate.search.v6poc.backend.document.DocumentElement;
 import org.hibernate.search.v6poc.backend.document.model.spi.IndexSchemaCollector;
-import org.hibernate.search.v6poc.backend.index.impl.SimplifyingIndexManager;
 import org.hibernate.search.v6poc.backend.index.spi.IndexManager;
 import org.hibernate.search.v6poc.backend.index.spi.IndexManagerBuilder;
 import org.hibernate.search.v6poc.backend.spi.Backend;
@@ -116,10 +115,7 @@ public IndexModelBindingContext getRootBindingContext() {
 
 		@Override
 		public IndexManager<D> build() {
-			IndexManager<D> result = builder.build();
-			// Optimize changeset execution in the resulting index manager
-			result = new SimplifyingIndexManager<>( result );
-			return result;
+			return builder.build();
 		}
 	}
 

engine/src/main/java/org/hibernate/search/v6poc/engine/impl/SearchMappingRepositoryBuilderImpl.java

@@ -6,8 +6,10 @@
  */
 package org.hibernate.search.v6poc.engine.impl;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -37,11 +39,15 @@
 import org.hibernate.search.v6poc.entity.mapping.spi.MappingImplementor;
 import org.hibernate.search.v6poc.entity.mapping.spi.MappingKey;
 import org.hibernate.search.v6poc.entity.model.spi.MappableTypeModel;
+import org.hibernate.search.v6poc.logging.impl.Log;
 import org.hibernate.search.v6poc.util.AssertionFailure;
 import org.hibernate.search.v6poc.util.SearchException;
+import org.hibernate.search.v6poc.util.impl.common.LoggerFactory;
 
 public class SearchMappingRepositoryBuilderImpl implements SearchMappingRepositoryBuilder {
 
+	private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
+
 	private final ConfigurationPropertySource mainPropertySource;
 	private final Properties overriddenProperties = new Properties();
 	private final Collection<MetadataContributor> contributors = new ArrayList<>();
@@ -98,7 +104,7 @@ public SearchMappingRepository build() {
 		MetadataCollectorImpl metadataCollector = new MetadataCollectorImpl();
 		contributors.forEach( c -> c.contribute( buildContext, metadataCollector ) );
 
-		Map<MappingKey<?>, Mapper<?, ?>> mappers =
+		Map<MappingKey<?>, Mapper<?>> mappers =
 				metadataCollector.createMappers( buildContext, propertySource, indexManagerBuildingStateProvider );
 
 		Map<MappingKey<?>, MappingImplementor<?>> mappings = new HashMap<>();
@@ -143,13 +149,13 @@ public <C> void collectDiscoverer(MapperFactory<C, ?> mapperFactory,
 			getOrCreateContribution( mapperFactory ).collectDiscoverer( metadataDiscoverer );
 		}
 
-		Map<MappingKey<?>, Mapper<?, ?>> createMappers(
+		Map<MappingKey<?>, Mapper<?>> createMappers(
 				BuildContext buildContext, ConfigurationPropertySource propertySource,
 				IndexManagerBuildingStateHolder indexManagerBuildingStateProvider) {
 			frozen = true;
-			Map<MappingKey<?>, Mapper<?, ?>> mappers = new HashMap<>();
+			Map<MappingKey<?>, Mapper<?>> mappers = new HashMap<>();
 			contributionByMappingKey.forEach( (mappingKey, contribution) -> {
-				Mapper<?, ?> mapper = contribution.preBuild( buildContext, propertySource, indexManagerBuildingStateProvider );
+				Mapper<?> mapper = contribution.preBuild( buildContext, propertySource, indexManagerBuildingStateProvider );
 				mappers.put( mappingKey, mapper );
 			} );
 			return mappers;
@@ -191,6 +197,9 @@ private static class MapperContribution<C, M> {
 		}
 
 		public void mapToIndex(MappableTypeModel typeModel, String indexName) {
+			if ( typeModel.isAbstract() ) {
+				throw log.cannotMapAbstractTypeToIndex( typeModel, indexName );
+			}
 			getOrCreateContribution( typeModel ).mapToIndex( indexName );
 		}
 
@@ -202,10 +211,10 @@ public void collectDiscoverer(TypeMetadataDiscoverer<C> metadataDiscoverer) {
 			metadataDiscoverers.add( metadataDiscoverer );
 		}
 
-		public Mapper<C, M> preBuild(BuildContext buildContext, ConfigurationPropertySource propertySource,
+		public Mapper<M> preBuild(BuildContext buildContext, ConfigurationPropertySource propertySource,
 				IndexManagerBuildingStateHolder indexManagerBuildingStateHolder) {
 			ContributorProvider contributorProvider = new ContributorProvider();
-			Mapper<C, M> mapper = mapperFactory.createMapper( buildContext, propertySource );
+			Mapper<M> mapper = mapperFactory.createMapper( buildContext, propertySource, contributorProvider );
 
 			Set<MappableTypeModel> potentiallyMappedToIndexTypes = new LinkedHashSet<>( contributionByType.keySet() );
 			for ( MappableTypeModel typeModel : potentiallyMappedToIndexTypes ) {
@@ -214,8 +223,7 @@ public Mapper<C, M> preBuild(BuildContext buildContext, ConfigurationPropertySou
 				if ( indexName != null ) {
 					mapper.addIndexed(
 							typeModel,
-							indexManagerBuildingStateHolder.startBuilding( indexName ),
-							contributorProvider
+							indexManagerBuildingStateHolder.startBuilding( indexName )
 					);
 				}
 			}
@@ -257,6 +265,11 @@ public void forEach(MappableTypeModel typeModel, Consumer<C> contributorConsumer
 						.flatMap( TypeMappingContribution::getContributors )
 						.forEach( contributorConsumer );
 			}
+
+			@Override
+			public Set<? extends MappableTypeModel> getTypesContributedTo() {
+				return Collections.unmodifiableSet( new HashSet<>( contributionByType.keySet() ) );
+			}
 		}
 	}
 

engine/src/main/java/org/hibernate/search/v6poc/entity/mapping/building/spi/Mapper.java

@@ -9,17 +9,13 @@
 import org.hibernate.search.v6poc.entity.mapping.spi.MappingImplementor;
 import org.hibernate.search.v6poc.entity.model.spi.MappableTypeModel;
 
-public interface Mapper<C, M> {
+public interface Mapper<M> {
 
 	/**
 	 * @param typeModel A model of the type to be mapped
 	 * @param indexManagerBuildingState The building state for the index to be mapped
-	 * @param contributorProvider A provider of composite mapping contributors, with contributions
-	 * guaranteed to be ordered from supertype to subtype, allowing the builder to support overrides if necessary.
 	 */
-	void addIndexed(MappableTypeModel typeModel,
-			IndexManagerBuildingState<?> indexManagerBuildingState,
-			TypeMetadataContributorProvider<C> contributorProvider);
+	void addIndexed(MappableTypeModel typeModel, IndexManagerBuildingState<?> indexManagerBuildingState);
 
 	MappingImplementor<M> build();
 

engine/src/main/java/org/hibernate/search/v6poc/entity/mapping/building/spi/MapperFactory.java

@@ -14,6 +14,7 @@ public interface MapperFactory<C, M> {
 
 	MappingKey<M> getMappingKey();
 
-	Mapper<C, M> createMapper(BuildContext buildContext, ConfigurationPropertySource propertySource);
+	Mapper<M> createMapper(BuildContext buildContext, ConfigurationPropertySource propertySource,
+			TypeMetadataContributorProvider<C> contributorProvider);
 
 }

engine/src/main/java/org/hibernate/search/v6poc/entity/mapping/building/spi/TypeMetadataContributorProvider.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.search.v6poc.entity.mapping.building.spi;
 
+import java.util.Set;
 import java.util.function.Consumer;
 
 import org.hibernate.search.v6poc.entity.model.spi.MappableTypeModel;
@@ -16,9 +17,14 @@
 public interface TypeMetadataContributorProvider<C> {
 
 	/**
-	 * @param typeModel The model of a type to retrieve contributors for.
+	 * @param typeModel The model of a type to retrieve contributors for, including supertype contributors.
 	 * @param contributorConsumer The consumer that will be applied to each contributor.
 	 */
 	void forEach(MappableTypeModel typeModel, Consumer<C> contributorConsumer);
 
+	/**
+	 * @return A set containing all the types that were contributed to so far.
+	 */
+	Set<? extends MappableTypeModel> getTypesContributedTo();
+
 }