Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed use of JdbcValuesSourceProcessingState#findInitializer()

This commit is contained in:
Andrea Boriero 2022-12-14 11:22:32 +01:00 committed by Christian Beikov
parent 0748fff451
commit ce2dc4720e
6 changed files with 4 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java
View File

@ -385,10 +385,6 @@ public abstract class AbstractEntityInitializer extends AbstractFetchParentAcces
// 2) build the EntityKey
this.entityKey = new EntityKey( id, concreteDescriptor );
if ( jdbcValuesSourceProcessingState.findInitializer( entityKey ) == null ) {
jdbcValuesSourceProcessingState.registerInitializer( entityKey, this );
}
// 3) schedule the EntityKey for batch loading, if possible
if ( concreteDescriptor.isBatchLoadable() ) {
if ( !session.getPersistenceContext().containsEntity( entityKey ) ) {

20
hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java
View File

@ -26,7 +26,6 @@ import org.hibernate.spi.EntityIdentifierNavigablePath;
import org.hibernate.sql.results.graph.AbstractFetchParentAccess;
import org.hibernate.sql.results.graph.DomainResultAssembler;
import org.hibernate.sql.results.graph.FetchParentAccess;
import org.hibernate.sql.results.graph.Initializer;
import org.hibernate.sql.results.graph.entity.EntityInitializer;
import org.hibernate.sql.results.graph.entity.EntityLoadingLogging;
import org.hibernate.sql.results.graph.entity.LoadingEntityEntry;
@ -89,6 +88,7 @@ public class EntitySelectFetchInitializer extends AbstractFetchParentAccess impl
if ( np instanceof EntityIdentifierNavigablePath
|| ForeignKeyDescriptor.PART_NAME.equals( np.getLocalName() )
|| ForeignKeyDescriptor.TARGET_PART_NAME.equals( np.getLocalName() )) {
initializeInstance( rowProcessingState );
return;
}
@ -133,24 +133,6 @@ public class EntitySelectFetchInitializer extends AbstractFetchParentAccess impl
return;
}
Initializer initializer = rowProcessingState.getJdbcValuesSourceProcessingState()
.findInitializer( entityKey );
if ( initializer != null ) {
if ( EntityLoadingLogging.DEBUG_ENABLED ) {
EntityLoadingLogging.ENTITY_LOADING_LOGGER.debugf(
"(%s) Found an initializer for entity (%s) : %s",
CONCRETE_NAME,
toLoggableString( getNavigablePath(), entityIdentifier ),
entityIdentifier
);
}
initializer.resolveInstance( rowProcessingState );
entityInstance = initializer.getInitializedInstance();
isInitialized = true;
return;
}
final LoadingEntityEntry existingLoadingEntry = session
.getPersistenceContext()
.getLoadContexts()

5
hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java
View File

@ -16,6 +16,7 @@ import org.hibernate.sql.results.LoadingLogger;
import org.hibernate.sql.results.graph.DomainResultAssembler;
import org.hibernate.sql.results.graph.Initializer;
import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchInitializer;
import org.hibernate.sql.results.graph.entity.internal.EntitySelectFetchInitializer;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
@ -136,14 +137,14 @@ public class StandardRowReader<T> implements RowReader<T> {
for ( int i = 0; i < numberOfInitializers; i++ ) {
Initializer initializer = initializers.get( i );
if ( !( initializer instanceof EntityDelayedFetchInitializer ) ) {
if ( !( initializer instanceof EntityDelayedFetchInitializer ) && ! (initializer instanceof EntitySelectFetchInitializer ) ) {
initializer.resolveInstance( rowProcessingState );
}
}
for ( int i = 0; i < numberOfInitializers; i++ ) {
Initializer initializer = initializers.get( i );
if ( initializer instanceof EntityDelayedFetchInitializer ) {
if ( initializer instanceof EntityDelayedFetchInitializer || initializer instanceof EntitySelectFetchInitializer ) {
initializer.resolveInstance( rowProcessingState );
}
}

17
hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java
View File

@ -47,7 +47,6 @@ public class JdbcValuesSourceProcessingStateStandardImpl implements JdbcValuesSo
private final BiConsumer<EntityKey,LoadingEntityEntry> loadingEntityEntryConsumer;
private Map<EntityKey, LoadingEntityEntry> loadingEntityMap;
private Map<EntityKey, Initializer> initializerMap;
private Map<EntityUniqueKey, Initializer> initializerByUniquKeyMap;
private Map<CollectionKey, LoadingCollectionEntry> loadingCollectionMap;
private List<CollectionInitializer> arrayInitializers;
@ -114,17 +113,6 @@ public class JdbcValuesSourceProcessingStateStandardImpl implements JdbcValuesSo
loadingEntityMap.put( entityKey, loadingEntry );
}
@Override
public void registerInitializer(
EntityKey entityKey,
Initializer initializer) {
if ( initializerMap == null ) {
initializerMap = new HashMap<>();
}
initializerMap.put( entityKey, initializer );
}
@Override
public void registerInitializer(EntityUniqueKey entityKey, Initializer initializer) {
if ( initializerByUniquKeyMap == null ) {
@ -138,11 +126,6 @@ public class JdbcValuesSourceProcessingStateStandardImpl implements JdbcValuesSo
return initializerByUniquKeyMap == null ? null : initializerByUniquKeyMap.get( entityKey );
}
@Override
public Initializer findInitializer(EntityKey entityKey) {
return initializerMap == null ? null : initializerMap.get( entityKey );
}
@Override
public LoadingEntityEntry findLoadingEntityLocally(EntityKey entityKey) {
return loadingEntityMap == null ? null : loadingEntityMap.get( entityKey );

6
hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingState.java
View File

@ -55,16 +55,10 @@ public interface JdbcValuesSourceProcessingState {
EntityKey entityKey,
LoadingEntityEntry loadingEntry);
void registerInitializer(
EntityKey entityKey,
Initializer initializer);
void registerInitializer(
EntityUniqueKey entityKey,
Initializer initializer);
Initializer findInitializer(EntityKey entityKey);
Initializer findInitializer(EntityUniqueKey entityKey);

6
hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java
View File

@ -60,12 +60,6 @@ public class LoadContexts {
);
}
public Initializer findInitializer(EntityKey key){
return jdbcValuesSourceProcessingStateStack.findCurrentFirst(
state -> state.findInitializer( key )
);
}
public Initializer findInitializer(EntityUniqueKey key){
return jdbcValuesSourceProcessingStateStack.findCurrentFirst(
state -> state.findInitializer( key )