Skip to content
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

HHH-18992 pass LockOptions correctly to multiple id loaders #9517

Merged
merged 2 commits into from
Dec 29, 2024
Merged

HHH-18992 pass LockOptions correctly to multiple id loaders #9517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b87628
HHH-18992 pass LockOptions correctly to multiple id loaders
gavinking Dec 29, 2024
d150264
HHH-18992 pass LockOptions correctly to multiple natural id loaders
gavinking Dec 29, 2024
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
8 changes: 7 additions & 1 deletion ...e-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.metamodel.mapping.JdbcMapping;
import org.hibernate.query.spi.QueryOptions;
import org.hibernate.query.spi.QueryOptionsAdapter;
import org.hibernate.sql.ast.tree.expression.JdbcParameter;
import org.hibernate.sql.ast.tree.select.SelectStatement;
import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
Expand Down Expand Up @@ -121,7 +122,12 @@ protected void loadEntitiesById(

getJdbcSelectExecutor().executeQuery(
getSqlAstTranslatorFactory().buildSelectTranslator( getSessionFactory(), sqlAst )
.translate( NO_BINDINGS, QueryOptions.NONE ),
.translate( NO_BINDINGS, new QueryOptionsAdapter() {
@Override
public LockOptions getLockOptions() {
return lockOptions;
}
} ),
jdbcParameterBindings,
new ExecutionContextWithSubselectFetchHandler(
session,
Expand Down
9 changes: 7 additions & 2 deletions ...ate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
import org.hibernate.loader.ast.spi.MultiKeyLoadSizingStrategy;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.query.spi.QueryOptions;
import org.hibernate.query.spi.QueryOptionsAdapter;
import org.hibernate.sql.ast.tree.select.SelectStatement;
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
import org.hibernate.sql.exec.spi.JdbcParameterBindings;
Expand Down Expand Up @@ -163,7 +163,12 @@ private List<T> performRegularMultiLoad(

return getJdbcSelectExecutor().list(
getSqlAstTranslatorFactory().buildSelectTranslator( getSessionFactory(), sqlAst )
.translate( jdbcParameterBindings, QueryOptions.NONE ),
.translate( jdbcParameterBindings, new QueryOptionsAdapter() {
@Override
public LockOptions getLockOptions() {
return lockOptions;
}
} ),
jdbcParameterBindings,
new ExecutionContextWithSubselectFetchHandler(
session,
Expand Down
17 changes: 11 additions & 6 deletions ...-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.util.Collections;
import java.util.List;

import org.hibernate.LockMode;
import org.hibernate.LockOptions;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
Expand All @@ -18,7 +17,7 @@
import org.hibernate.metamodel.mapping.JdbcMapping;
import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
import org.hibernate.metamodel.mapping.internal.SimpleNaturalIdMapping;
import org.hibernate.query.spi.QueryOptions;
import org.hibernate.query.spi.QueryOptionsAdapter;
import org.hibernate.sql.ast.tree.expression.JdbcParameter;
import org.hibernate.sql.ast.tree.select.SelectStatement;
import org.hibernate.sql.exec.internal.JdbcParameterImpl;
Expand Down Expand Up @@ -73,9 +72,10 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions loadOptio
final SessionFactoryImplementor sessionFactory = session.getFactory();
naturalIds = LoaderHelper.normalizeKeys( naturalIds, getNaturalIdAttribute(), session, sessionFactory );

final LockOptions lockOptions = (loadOptions.getLockOptions() == null)
? new LockOptions( LockMode.NONE )
: loadOptions.getLockOptions();
final LockOptions lockOptions =
loadOptions.getLockOptions() == null
? LockOptions.NONE
: loadOptions.getLockOptions();

final BasicTypeRegistry basicTypeRegistry = sessionFactory.getTypeConfiguration().getBasicTypeRegistry();
final BasicType<?> arrayBasicType = basicTypeRegistry.getRegisteredType( keyArrayClass );
Expand All @@ -99,7 +99,12 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions loadOptio
.getJdbcEnvironment()
.getSqlAstTranslatorFactory()
.buildSelectTranslator( sessionFactory, sqlAst )
.translate( JdbcParameterBindings.NO_BINDINGS, QueryOptions.NONE );
.translate( JdbcParameterBindings.NO_BINDINGS, new QueryOptionsAdapter() {
@Override
public LockOptions getLockOptions() {
return lockOptions;
}
} );

return LoaderHelper.loadByArrayParameter(
naturalIds,
Expand Down
24 changes: 13 additions & 11 deletions ...core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderInPredicate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.util.Collections;
import java.util.List;

import org.hibernate.LockMode;
import org.hibernate.LockOptions;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
Expand Down Expand Up @@ -48,24 +47,27 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions options,
maxBatchSize = options.getBatchSize();
}
else {
maxBatchSize = session.getJdbcServices().getJdbcEnvironment().getDialect().getMultiKeyLoadSizingStrategy().determineOptimalBatchLoadSize(
entityDescriptor.getNaturalIdMapping().getJdbcTypeCount(),
naturalIds.length,
sessionFactory.getSessionFactoryOptions().inClauseParameterPaddingEnabled()
);
maxBatchSize =
session.getJdbcServices().getJdbcEnvironment().getDialect()
.getMultiKeyLoadSizingStrategy().determineOptimalBatchLoadSize(
entityDescriptor.getNaturalIdMapping().getJdbcTypeCount(),
naturalIds.length,
sessionFactory.getSessionFactoryOptions().inClauseParameterPaddingEnabled()
);
}

final int batchSize = Math.min( maxBatchSize, naturalIds.length );

final LockOptions lockOptions = (options.getLockOptions() == null)
? new LockOptions( LockMode.NONE )
: options.getLockOptions();
final LockOptions lockOptions =
options.getLockOptions() == null
? LockOptions.NONE
: options.getLockOptions();

final MultiNaturalIdLoadingBatcher batcher = new MultiNaturalIdLoadingBatcher(
entityDescriptor,
entityDescriptor.getNaturalIdMapping(),
batchSize,
(naturalId, session1) -> {
(naturalId, s) -> {
// `naturalId` here is the one passed in by the API as part of the values array
// todo (6.0) : use this to help create the ordered results
return entityDescriptor.getNaturalIdMapping().normalizeInput( naturalId );
Expand All @@ -75,7 +77,7 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions options,
sessionFactory
);

final List<E> results = batcher.multiLoad( naturalIds, options, session );
final List<E> results = batcher.multiLoad( naturalIds, session );

if ( results.size() == 1 ) {
return results;
Expand Down
12 changes: 8 additions & 4 deletions ...te-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.engine.spi.SubselectFetch;
import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.loader.ast.spi.MultiNaturalIdLoadOptions;
import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.metamodel.mapping.ModelPart;
import org.hibernate.query.spi.QueryOptions;
import org.hibernate.query.spi.QueryOptionsAdapter;
import org.hibernate.sql.ast.SqlAstTranslatorFactory;
import org.hibernate.sql.ast.tree.select.SelectStatement;
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
Expand Down Expand Up @@ -83,10 +82,15 @@ public MultiNaturalIdLoadingBatcher(
final SqlAstTranslatorFactory sqlAstTranslatorFactory =
sessionFactory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory();
this.jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlSelect )
.translate( null, QueryOptions.NONE );
.translate( null, new QueryOptionsAdapter() {
@Override
public LockOptions getLockOptions() {
return lockOptions;
}
} );
}

public <E> List<E> multiLoad(Object[] naturalIdValues, MultiNaturalIdLoadOptions options, SharedSessionContractImplementor session) {
public <E> List<E> multiLoad(Object[] naturalIdValues, SharedSessionContractImplementor session) {
final ArrayList<E> multiLoadResults = CollectionHelper.arrayList( naturalIdValues.length );
final JdbcParameterBindingsImpl jdbcParamBindings = new JdbcParameterBindingsImpl( jdbcParameters.size() );

Expand Down
6 changes: 3 additions & 3 deletions hibernate-core/src/main/java/org/hibernate/sql/ForUpdateFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class ForUpdateFragment {
private final Dialect dialect;
private final LockOptions lockOptions;

public ForUpdateFragment(Dialect dialect, LockOptions lockOptions, Map<String, String[]> keyColumnNames) throws QueryException {
public ForUpdateFragment(Dialect dialect, LockOptions lockOptions, Map<String, String[]> keyColumnNames) {
this.dialect = dialect;
LockMode upgradeType = null;
this.lockOptions = lockOptions;
Expand Down Expand Up @@ -62,15 +62,15 @@ public ForUpdateFragment(Dialect dialect, LockOptions lockOptions, Map<String, S
}

public ForUpdateFragment addTableAlias(String alias) {
if ( aliases.length() > 0 ) {
if ( !aliases.isEmpty() ) {
aliases.append( ", " );
}
aliases.append( alias );
return this;
}

public String toFragmentString() {
if ( aliases.length() == 0) {
if ( aliases.isEmpty() ) {
return dialect.getForUpdateString( lockOptions );
}
else {
Expand Down
Loading