Skip to content

HHH-19012 completely remove Mapping, and some other cleanups #9572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 6, 2025
Merged

HHH-19012 completely remove Mapping, and some other cleanups #9572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d657fc6
HHH-19021 completely remove Mapping
gavinking Jan 6, 2025
bd5c0a2
remove lots of unnecessary calls to getRuntimeMetamodels()
gavinking Jan 6, 2025
a479451
Some cleanups to Collections
gavinking Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public BulkOperationCleanupAction(SharedSessionContractImplementor session, Enti
public BulkOperationCleanupAction(SharedSessionContractImplementor session, Set<String> tableSpaces) {
final LinkedHashSet<String> spacesList = new LinkedHashSet<>( tableSpaces );

final MappingMetamodelImplementor metamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel();
final MappingMetamodelImplementor metamodel = session.getFactory().getMappingMetamodel();
metamodel.forEachEntityDescriptor( (entityDescriptor) -> {
final String[] entitySpaces = (String[]) entityDescriptor.getQuerySpaces();
if ( affectedEntity( tableSpaces, entitySpaces ) ) {
Expand Down Expand Up @@ -143,7 +143,7 @@ public BulkOperationCleanupAction(SharedSessionContractImplementor session, Set<

public static void schedule(SharedSessionContractImplementor session, SqmDmlStatement<?> statement) {
final List<EntityPersister> entityPersisters = new ArrayList<>( 1 );
final MappingMetamodelImplementor metamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel();
final MappingMetamodelImplementor metamodel = session.getFactory().getMappingMetamodel();
if ( !( statement instanceof InsertSelectStatement ) ) {
entityPersisters.add( metamodel.getEntityDescriptor( statement.getTarget().getEntityName() ) );
}
Expand Down
9 changes: 4 additions & 5 deletions ...rnate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,10 @@ private void logCannotResolveNonNullableTransientDependencies(SharedSessionContr
for ( Map.Entry<Object,Set<AbstractEntityInsertAction>> entry : dependentActionsByTransientEntity.entrySet() ) {
final Object transientEntity = entry.getKey();
final String transientEntityName = session.guessEntityName( transientEntity );
final Object transientEntityId = session.getFactory()
.getRuntimeMetamodels()
.getMappingMetamodel()
.getEntityDescriptor( transientEntityName )
.getIdentifier( transientEntity, session );
final Object transientEntityId =
session.getFactory().getMappingMetamodel()
.getEntityDescriptor( transientEntityName )
.getIdentifier( transientEntity, session );
final String transientEntityString = infoString( transientEntityName, transientEntityId );
final Set<String> dependentEntityStrings = new TreeSet<>();
final Set<String> nonNullableTransientPropertyPaths = new TreeSet<>();
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private void evictCache(Object entity, EntityPersister persister, EventSource se
try {
SessionFactoryImplementor factory = persister.getFactory();

final MappingMetamodelImplementor metamodel = factory.getRuntimeMetamodels().getMappingMetamodel();
final MappingMetamodelImplementor metamodel = factory.getMappingMetamodel();
Set<String> collectionRoles = metamodel.getCollectionRolesByEntityParticipant( persister.getEntityName() );
if ( collectionRoles == null || collectionRoles.isEmpty() ) {
return;
Expand Down
55 changes: 22 additions & 33 deletions hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.metamodel.model.domain.NavigableRole;
import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.pretty.MessageHelper;
Expand Down Expand Up @@ -227,10 +226,9 @@ public boolean containsEntity(Class<?> entityClass, Object identifier) {

@Override
public boolean containsEntity(String entityName, Object identifier) {
final EntityPersister entityDescriptor = sessionFactory
.getRuntimeMetamodels()
.getMappingMetamodel()
.getEntityDescriptor( entityName );
final EntityPersister entityDescriptor =
sessionFactory.getMappingMetamodel()
.getEntityDescriptor( entityName );
final EntityDataAccess cacheAccess = entityDescriptor.getCacheAccessStrategy();
if ( cacheAccess == null ) {
return false;
Expand All @@ -256,10 +254,9 @@ public void evictEntityData(Class<?> entityClass, Object identifier) {

@Override
public void evictEntityData(String entityName, Object identifier) {
final EntityPersister entityDescriptor = sessionFactory
.getRuntimeMetamodels()
.getMappingMetamodel()
.getEntityDescriptor( entityName );
final EntityPersister entityDescriptor =
sessionFactory.getMappingMetamodel()
.getEntityDescriptor( entityName );
final EntityDataAccess cacheAccess = entityDescriptor.getCacheAccessStrategy();
if ( cacheAccess == null ) {
return;
Expand All @@ -283,10 +280,9 @@ public void evictEntityData(Class<?> entityClass) {

@Override
public void evictEntityData(String entityName) {
final EntityPersister entityDescriptor = sessionFactory
.getRuntimeMetamodels()
.getMappingMetamodel()
.getEntityDescriptor( entityName );
final EntityPersister entityDescriptor =
sessionFactory.getMappingMetamodel()
.getEntityDescriptor( entityName );
evictEntityData( entityDescriptor );
}

Expand Down Expand Up @@ -317,10 +313,7 @@ private void evictEntityData(NavigableRole navigableRole, EntityDataAccess cache

@Override
public void evictEntityData() {
final MappingMetamodelImplementor mappingMetamodel = sessionFactory
.getRuntimeMetamodels()
.getMappingMetamodel();
mappingMetamodel.forEachEntityDescriptor( this::evictEntityData );
sessionFactory.getMappingMetamodel().forEachEntityDescriptor( this::evictEntityData );
}


Expand All @@ -335,10 +328,9 @@ public void evictNaturalIdData(Class<?> entityClass) {

@Override
public void evictNaturalIdData(String entityName) {
final EntityPersister entityDescriptor = sessionFactory
.getRuntimeMetamodels()
.getMappingMetamodel()
.getEntityDescriptor( entityName );
final EntityPersister entityDescriptor =
sessionFactory.getMappingMetamodel()
.getEntityDescriptor( entityName );
evictNaturalIdData( entityDescriptor );
}

Expand Down Expand Up @@ -371,10 +363,9 @@ private void evictNaturalIdData(NavigableRole rootEntityRole, NaturalIdDataAcces
@Override
public boolean containsCollection(String role, Object ownerIdentifier) {

final CollectionPersister collectionDescriptor = sessionFactory
.getRuntimeMetamodels()
.getMappingMetamodel()
.getCollectionDescriptor( role );
final CollectionPersister collectionDescriptor =
sessionFactory.getMappingMetamodel()
.getCollectionDescriptor( role );

final CollectionDataAccess cacheAccess = collectionDescriptor.getCacheAccessStrategy();
if ( cacheAccess == null ) {
Expand All @@ -387,10 +378,9 @@ public boolean containsCollection(String role, Object ownerIdentifier) {

@Override
public void evictCollectionData(String role, Object ownerIdentifier) {
final CollectionPersister collectionDescriptor = sessionFactory
.getRuntimeMetamodels()
.getMappingMetamodel()
.getCollectionDescriptor( role );
final CollectionPersister collectionDescriptor =
sessionFactory.getMappingMetamodel()
.getCollectionDescriptor( role );

final CollectionDataAccess cacheAccess = collectionDescriptor.getCacheAccessStrategy();
if ( cacheAccess == null ) {
Expand All @@ -410,10 +400,9 @@ public void evictCollectionData(String role, Object ownerIdentifier) {

@Override
public void evictCollectionData(String role) {
final CollectionPersister collectionDescriptor = sessionFactory
.getRuntimeMetamodels()
.getMappingMetamodel()
.getCollectionDescriptor( role );
final CollectionPersister collectionDescriptor =
sessionFactory.getMappingMetamodel()
.getCollectionDescriptor( role );

evictCollectionData( collectionDescriptor );
}
Expand Down
23 changes: 7 additions & 16 deletions hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,26 @@ public StructuredCacheEntry(EntityPersister persister) {
}

@Override
@SuppressWarnings("unchecked")
public Object destructure(Object structured, SessionFactoryImplementor factory) {
final Map map = (Map) structured;
final var map = (Map<?,?>) structured;
final String subclass = (String) map.get( SUBCLASS_KEY );
final Object version = map.get( VERSION_KEY );

final EntityPersister subclassPersister = factory
.getRuntimeMetamodels()
.getMappingMetamodel()
.getEntityDescriptor( subclass );

final String[] names = subclassPersister.getPropertyNames();
final String[] names =
factory.getMappingMetamodel()
.getEntityDescriptor( subclass )
.getPropertyNames();
final Serializable[] disassembledState = new Serializable[names.length];
for ( int i = 0; i < names.length; i++ ) {
disassembledState[i] = (Serializable) map.get( names[i] );
}
return new StandardCacheEntryImpl(
disassembledState,
subclass,
version
);
return new StandardCacheEntryImpl( disassembledState, subclass, version );
}

@Override
@SuppressWarnings("unchecked")
public Object structure(Object item) {
final CacheEntry entry = (CacheEntry) item;
final String[] names = persister.getPropertyNames();
final Map map = new HashMap( names.length + 3, 1f );
final Map<String,Object> map = new HashMap<>( names.length + 3, 1f );
map.put( SUBCLASS_KEY, entry.getSubclass() );
map.put( VERSION_KEY, entry.getVersion() );
for ( int i=0; i<names.length; i++ ) {
Expand Down
3 changes: 1 addition & 2 deletions hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ protected AbstractEntityEntry(
final PersistenceContext persistenceContext) {
this.persister = factory == null
? null
: factory.getRuntimeMetamodels().getMappingMetamodel()
.getEntityDescriptor( entityName );
: factory.getMappingMetamodel().getEntityDescriptor( entityName );
this.id = id;
setCompressedValue( STATUS, status );
setCompressedValue( PREVIOUS_STATUS, previousStatus );
Expand Down
Loading
Loading