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

minor code cleanups in AbstractEntityPersister 

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-08-16 12:49:00 +02:00
parent 4a447ac819
commit afca93158e
2 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
View File

@ -9,10 +9,13 @@ package org.hibernate.internal.util;
import java.io.Serializable;
/**
* @deprecated This is a legacy of very ancient versions of Hibernate.
*
* @author Gavin King
*/
@Deprecated
public class MarkerObject implements Serializable {
private String name;
private final String name;
public MarkerObject(String name) {
this.name = name;

115
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -117,9 +117,9 @@ import org.hibernate.internal.FilterAliasGenerator;
import org.hibernate.internal.FilterHelper;
import org.hibernate.internal.util.IndexedConsumer;
import org.hibernate.internal.util.LazyValue;
import org.hibernate.internal.util.MarkerObject;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.internal.util.collections.LockModeEnumMap;
import org.hibernate.jdbc.Expectation;
import org.hibernate.jdbc.TooManyRowsAffectedException;
@ -158,7 +158,6 @@ import org.hibernate.metamodel.mapping.Association;
import org.hibernate.metamodel.mapping.AttributeMapping;
import org.hibernate.metamodel.mapping.AttributeMappingsList;
import org.hibernate.metamodel.mapping.AttributeMappingsMap;
import org.hibernate.metamodel.mapping.AttributeMetadata;
import org.hibernate.metamodel.mapping.DiscriminatorConverter;
import org.hibernate.metamodel.mapping.DiscriminatorType;
import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
@ -253,7 +252,6 @@ import org.hibernate.sql.ast.tree.from.TableReferenceJoin;
import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
import org.hibernate.sql.ast.tree.predicate.InListPredicate;
import org.hibernate.sql.ast.tree.predicate.Junction;
import org.hibernate.sql.ast.tree.predicate.NegatedPredicate;
import org.hibernate.sql.ast.tree.predicate.NullnessPredicate;
import org.hibernate.sql.ast.tree.predicate.Predicate;
import org.hibernate.sql.ast.tree.select.QuerySpec;
@ -313,6 +311,7 @@ import static org.hibernate.internal.util.collections.ArrayHelper.toTypeArray;
import static org.hibernate.internal.util.collections.CollectionHelper.combine;
import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
import static org.hibernate.internal.util.collections.CollectionHelper.toSmallList;
import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.supportsSqlArrayType;
import static org.hibernate.metamodel.RepresentationMode.POJO;
import static org.hibernate.persister.entity.DiscriminatorHelper.NOT_NULL_DISCRIMINATOR;
@ -905,27 +904,25 @@ public abstract class AbstractEntityPersister
}
}
private boolean shouldUseShallowCacheLayout(CacheLayout entityQueryCacheLayout, SessionFactoryOptions options) {
final CacheLayout queryCacheLayout;
if ( entityQueryCacheLayout == null ) {
queryCacheLayout = options.getQueryCacheLayout();
}
else {
queryCacheLayout = entityQueryCacheLayout;
}
return queryCacheLayout == CacheLayout.SHALLOW || queryCacheLayout == CacheLayout.SHALLOW_WITH_DISCRIMINATOR
|| queryCacheLayout == CacheLayout.AUTO && ( canUseReferenceCacheEntries() || canReadFromCache() );
private static CacheLayout queryCacheLayout(CacheLayout entityQueryCacheLayout, SessionFactoryOptions options) {
return entityQueryCacheLayout == null ? options.getQueryCacheLayout() : entityQueryCacheLayout;
}
private boolean shouldStoreDiscriminatorInShallowQueryCacheLayout(CacheLayout entityQueryCacheLayout, SessionFactoryOptions options) {
final CacheLayout queryCacheLayout;
if ( entityQueryCacheLayout == null ) {
queryCacheLayout = options.getQueryCacheLayout();
private boolean shouldUseShallowCacheLayout(CacheLayout entityQueryCacheLayout, SessionFactoryOptions options) {
switch ( queryCacheLayout( entityQueryCacheLayout, options ) ) {
case FULL:
return false;
case AUTO:
return canUseReferenceCacheEntries()
|| canReadFromCache();
default:
return true;
}
else {
queryCacheLayout = entityQueryCacheLayout;
}
return queryCacheLayout == CacheLayout.SHALLOW_WITH_DISCRIMINATOR;
private static boolean shouldStoreDiscriminatorInShallowQueryCacheLayout(
CacheLayout entityQueryCacheLayout, SessionFactoryOptions options) {
return queryCacheLayout( entityQueryCacheLayout, options ) == CacheLayout.SHALLOW_WITH_DISCRIMINATOR;
}
protected abstract String[] getSubclassTableNames();
@ -1170,10 +1167,10 @@ public abstract class AbstractEntityPersister
@Override
public Iterable<UniqueKeyEntry> uniqueKeyEntries() {
if ( this.uniqueKeyEntries == null ) {
this.uniqueKeyEntries = initUniqueKeyEntries( this );
if ( uniqueKeyEntries == null ) {
uniqueKeyEntries = initUniqueKeyEntries( this );
}
return this.uniqueKeyEntries;
return uniqueKeyEntries;
}
private static List<UniqueKeyEntry> initUniqueKeyEntries(final AbstractEntityPersister aep) {
@ -1192,7 +1189,7 @@ public abstract class AbstractEntityPersister
}
}
}
return CollectionHelper.toSmallList( uniqueKeys );
return toSmallList( uniqueKeys );
}
protected Map<String, SingleIdArrayLoadPlan> getLazyLoadPlanByFetchGroup() {
@ -1230,7 +1227,7 @@ public abstract class AbstractEntityPersister
return null;
}
else {
JdbcParametersList.Builder jdbcParametersBuilder = JdbcParametersList.newBuilder();
final JdbcParametersList.Builder jdbcParametersBuilder = JdbcParametersList.newBuilder();
final SelectStatement select = LoaderSelectBuilder.createSelect(
this,
partsToSelect,
@ -1242,12 +1239,11 @@ public abstract class AbstractEntityPersister
jdbcParametersBuilder::add,
factory
);
JdbcParametersList jdbcParameters = jdbcParametersBuilder.build();
return new SingleIdArrayLoadPlan(
this,
getIdentifierMapping(),
select,
jdbcParameters,
jdbcParametersBuilder.build(),
LockOptions.NONE,
factory
);
@ -2921,17 +2917,16 @@ public abstract class AbstractEntityPersister
return new NullnessPredicate( sqlExpression );
}
else if ( value == NOT_NULL_DISCRIMINATOR ) {
return new NegatedPredicate( new NullnessPredicate( sqlExpression ) );
return new NullnessPredicate( sqlExpression, true );
}
else {
final QueryLiteral<Object> literal = new QueryLiteral<>( value, discriminatorType );
return new ComparisonPredicate( sqlExpression, ComparisonOperator.EQUAL, literal );
return new ComparisonPredicate( sqlExpression, ComparisonOperator.EQUAL,
new QueryLiteral<>( value, discriminatorType ) );
}
}
}
private Predicate createInListPredicate(BasicType<?> discriminatorType, Expression sqlExpression) {
final List<Expression> values = new ArrayList<>( fullDiscriminatorValues.length );
boolean hasNull = false, hasNonNull = false;
for ( Object discriminatorValue : fullDiscriminatorValues ) {
if ( discriminatorValue == NULL_DISCRIMINATOR ) {
@ -2940,43 +2935,48 @@ public abstract class AbstractEntityPersister
else if ( discriminatorValue == NOT_NULL_DISCRIMINATOR ) {
hasNonNull = true;
}
else {
values.add( new QueryLiteral<>( discriminatorValue, discriminatorType) );
}
}
final Predicate predicate = new InListPredicate( sqlExpression, values );
if ( hasNull || hasNonNull ) {
final Junction junction = new Junction( Junction.Nature.DISJUNCTION );
if ( hasNull && hasNonNull ) {
// This means we need to select everything, we don't need a predicate at all
// Return an empty Junction
return junction;
// This means we need to select all rows,
// and so we don't need a predicate at all
// Just return an empty Junction
return new Junction( Junction.Nature.DISJUNCTION );
}
if ( hasNonNull ) {
else if ( hasNonNull ) {
// we need every row with a non-null discriminator
return new NullnessPredicate( sqlExpression, true );
}
else if ( hasNull ) {
final Junction junction = new Junction( Junction.Nature.DISJUNCTION );
junction.add( new NullnessPredicate( sqlExpression ) );
}
junction.add( predicate );
junction.add( discriminatorValuesPredicate( discriminatorType, sqlExpression ) );
return junction;
}
return predicate;
else {
return discriminatorValuesPredicate( discriminatorType, sqlExpression );
}
}
private InListPredicate discriminatorValuesPredicate(BasicType<?> discriminatorType, Expression sqlExpression) {
final List<Expression> values = new ArrayList<>( fullDiscriminatorValues.length );
for ( Object discriminatorValue : fullDiscriminatorValues ) {
if ( !(discriminatorValue instanceof MarkerObject) ) {
values.add( new QueryLiteral<>( discriminatorValue, discriminatorType) );
}
}
return new InListPredicate( sqlExpression, values);
}
protected String getPrunedDiscriminatorPredicate(
Map<String, EntityNameUse> entityNameUses,
MappingMetamodelImplementor mappingMetamodel,
String alias) {
final InFragment frag = new InFragment();
final InFragment fragment = new InFragment();
if ( isDiscriminatorFormula() ) {
frag.setFormula( alias, getDiscriminatorFormulaTemplate() );
fragment.setFormula( alias, getDiscriminatorFormulaTemplate() );
}
else {
frag.setColumn( alias, getDiscriminatorColumnName() );
fragment.setColumn( alias, getDiscriminatorColumnName() );
}
boolean containsNotNull = false;
for ( Map.Entry<String, EntityNameUse> entry : entityNameUses.entrySet() ) {
@ -2991,11 +2991,12 @@ public abstract class AbstractEntityPersister
// as the query will contain a filter for that already anyway
if ( !persister.isAbstract() && ( this == persister || !isTypeOrSuperType( persister ) ) ) {
containsNotNull = containsNotNull || InFragment.NOT_NULL.equals( persister.getDiscriminatorSQLValue() );
frag.addValue( persister.getDiscriminatorSQLValue() );
fragment.addValue( persister.getDiscriminatorSQLValue() );
}
}
final List<String> discriminatorSQLValues = Arrays.asList( ( (AbstractEntityPersister) getRootEntityDescriptor() ).fullDiscriminatorSQLValues );
if ( frag.getValues().size() == discriminatorSQLValues.size() ) {
final AbstractEntityPersister rootEntityDescriptor = (AbstractEntityPersister) getRootEntityDescriptor();
final List<String> discriminatorSQLValues = Arrays.asList( rootEntityDescriptor.fullDiscriminatorSQLValues );
if ( fragment.getValues().size() == discriminatorSQLValues.size() ) {
// Nothing to prune if we filter for all subtypes
return null;
}
@ -3010,7 +3011,7 @@ public abstract class AbstractEntityPersister
}
final List<String> actualDiscriminatorSQLValues = new ArrayList<>( discriminatorSQLValues.size() );
for ( String value : discriminatorSQLValues ) {
if ( !frag.getValues().contains( value ) && !InFragment.NULL.equals( value ) ) {
if ( !fragment.getValues().contains( value ) && !InFragment.NULL.equals( value ) ) {
actualDiscriminatorSQLValues.add( value );
}
}
@ -3021,11 +3022,11 @@ public abstract class AbstractEntityPersister
sb.append( ") and " );
}
sb.append( lhs ).append( " is not null" );
frag.getValues().remove( InFragment.NOT_NULL );
return frag.toFragmentString() + sb;
fragment.getValues().remove( InFragment.NOT_NULL );
return fragment.toFragmentString() + sb;
}
else {
return frag.toFragmentString();
return fragment.toFragmentString();
}
}