Skip to content

HHH-16991 Fix array based id restriction with EnhanceUserType #11306

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 2 commits into from
Nov 21, 2025
+330 −28
Merged

HHH-16991 Fix array based id restriction with EnhanceUserType #11306

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
441b0db
HHH-16991 Fix array based id restriction with EnhanceUserType
beikov Nov 20, 2025
d9ea0a2
Drop container image pre-pull since this is proxied now on CI anyway
beikov Nov 20, 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
3 changes: 0 additions & 3 deletions ci/jpa-3.1-tck.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ pipeline {
stages {
stage('Build') {
steps {
script {
docker.image('openjdk:11-jdk').pull()
}
dir('hibernate') {
checkout scm
sh './gradlew publishToMavenLocal -PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com -DjakartaJpaVersion=3.1.0'
Expand Down
36 changes: 11 additions & 25 deletions ...core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,22 @@ public CollectionBatchLoaderArrayParam(
.buildSelectTranslator( getSessionFactory(), sqlSelect )
.translate( JdbcParameterBindings.NO_BINDINGS, QueryOptions.NONE );
}

@Override
public PersistentCollection<?> load(Object keyBeingLoaded, SharedSessionContractImplementor session) {
final ForeignKeyDescriptor keyDescriptor = getLoadable().getKeyDescriptor();
if ( keyDescriptor.isEmbedded() ) {
if ( keyDescriptor.isEmbedded()
|| keyDescriptor.getKeyPart().getSingleJdbcMapping().getValueConverter() != null ) {
assert keyDescriptor.getJdbcTypeCount() == 1;
return loadEmbeddable( keyBeingLoaded, session, keyDescriptor );
return loadWithConversion( keyBeingLoaded, session, keyDescriptor );
}
else {
return super.load( keyBeingLoaded, session );
}

}

private PersistentCollection<?> loadEmbeddable(
private PersistentCollection<?> loadWithConversion(
Object keyBeingLoaded,
SharedSessionContractImplementor session,
ForeignKeyDescriptor keyDescriptor) {
Expand All @@ -149,14 +151,14 @@ private PersistentCollection<?> loadEmbeddable(
.getComponentType(),
length
);
final Object[] embeddedKeys = (Object[]) Array.newInstance( keyDomainType, length );
final Object[] domainKeys = (Object[]) Array.newInstance( keyDomainType, length );
session.getPersistenceContextInternal().getBatchFetchQueue()
.collectBatchLoadableCollectionKeys(
length,
(index, key) ->
keyDescriptor.forEachJdbcValue( key, (i, value, jdbcMapping) -> {
keysToInitialize[index] = value;
embeddedKeys[index] = key;
domainKeys[index] = key;
}, session )
,
keyBeingLoaded,
Expand All @@ -171,7 +173,7 @@ private PersistentCollection<?> loadEmbeddable(

initializeKeys( keyBeingLoaded, keys, session );

for ( Object initializedKey : embeddedKeys ) {
for ( Object initializedKey : domainKeys ) {
if ( initializedKey != null ) {
finishInitializingKey( initializedKey, session );
}
Expand Down Expand Up @@ -231,25 +233,9 @@ void finishInitializingKeys(Object[] keys, SharedSessionContractImplementor sess

@Override
Object[] resolveKeysToInitialize(Object keyBeingLoaded, SharedSessionContractImplementor session) {
final ForeignKeyDescriptor keyDescriptor = getLoadable().getKeyDescriptor();
if( keyDescriptor.isEmbedded()){
assert keyDescriptor.getJdbcTypeCount() == 1;
final int length = getDomainBatchSize();
final Object[] keysToInitialize = (Object[]) Array.newInstance( keyDescriptor.getSingleJdbcMapping().getJdbcJavaType().getJavaTypeClass(), length );
session.getPersistenceContextInternal().getBatchFetchQueue()
.collectBatchLoadableCollectionKeys(
length,
(index, key) ->
keyDescriptor.forEachJdbcValue( key, (i, value, jdbcMapping) -> {
keysToInitialize[index] = value;
}, session )
,
keyBeingLoaded,
getLoadable()
);
// now trim down the array to the number of keys we found
return trimIdBatch( length, keysToInitialize );
}
assert !getLoadable().getKeyDescriptor().isEmbedded()
&& getLoadable().getKeyDescriptor().getKeyPart().getSingleJdbcMapping().getValueConverter() == null
: "Should use loadWithConversion() instead";
return super.resolveKeysToInitialize( keyBeingLoaded, session );
}
}
Loading
Loading