Skip to content

HHH-19276 - Native query with enum list param leads to OutOfMemory #10876

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

Closed
wants to merge 2 commits into from
Closed

HHH-19276 - Native query with enum list param leads to OutOfMemory #10876

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
079c595
HHH-19276 - Avoid use of == in ArrayAndElementArgumentValidator
gavinking Sep 5, 2025
0a5ab82
HHH-19276 - Native query with enum list param leads to OutOfMemory
gavinking Sep 5, 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: 3 additions & 1 deletion .../src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ public void validate(
final SqmTypedNode<?> elementArgument = arguments.get( elementIndex );
final SqmBindableType<?> expressible = elementArgument.getExpressible();
final SqmExpressible<?> elementType = expressible != null ? expressible.getSqmType() : null;
if ( expectedElementType != null && elementType != null && expectedElementType != elementType ) {
if ( expectedElementType != null && elementType != null
&& !expectedElementType.getJavaType()
.isAssignableFrom( elementType.getExpressibleJavaType().getJavaTypeClass() ) ) {
throw new FunctionArgumentException(
String.format(
"Parameter %d of function '%s()' has type %s, but argument is of type '%s'",
Expand Down
46 changes: 1 addition & 45 deletions hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public class BasicTypeRegistry implements Serializable {

private final TypeConfiguration typeConfiguration;

private final Map<JdbcType, Map<JavaType<?>, BasicType<?>>> registryValues = new ConcurrentHashMap<>();
private boolean primed;

private final Map<String, BasicType<?>> typesByName = new ConcurrentHashMap<>();
Expand Down Expand Up @@ -94,7 +93,6 @@ private <T> BasicType<T> createBasicType(String name, BasicTypeReference<T> type
final var javaType = getJavaTypeRegistry().resolveDescriptor( typeReference.getJavaType() );
final var jdbcType = getJdbcTypeRegistry().getDescriptor( typeReference.getSqlTypeCode() );
final var createdType = createBasicType( typeReference, javaType, jdbcType );
primeRegistryEntry( createdType );
typesByName.put( typeReference.getName(), createdType );
typesByName.put( name, createdType );
return createdType;
Expand Down Expand Up @@ -245,11 +243,7 @@ public <J> BasicType<J> resolve(JavaType<J> javaType, JdbcType jdbcType, String
* JdbcType combo or create (and register) one.
*/
public <J> BasicType<J> resolve(JavaType<J> javaType, JdbcType jdbcType, Supplier<BasicType<J>> creator) {
final var registeredBasicType = registryForJdbcType( jdbcType ).get( javaType );
//noinspection unchecked
return registeredBasicType != null
? (BasicType<J>) registeredBasicType
: createIfUnregistered( javaType, jdbcType, creator );
return createIfUnregistered( javaType, jdbcType, creator );
}

private <J> BasicType<J> createIfUnregistered(
Expand Down Expand Up @@ -277,7 +271,6 @@ private static <J> boolean registeredTypeMatches(JavaType<J> javaType, JdbcType

private <J> void register(JavaType<J> javaType, JdbcType jdbcType, BasicType<J> createdType) {
if ( createdType != null ) {
registryForJdbcType( jdbcType ).put( javaType, createdType );
// if we are still building mappings, register this adhoc
// type via a unique code. (This is to support Envers.)
try {
Expand Down Expand Up @@ -313,8 +306,6 @@ public void register(BasicType<?> type, String... keys) {
throw new HibernateException( "Type to register cannot be null" );
}

applyOrOverwriteEntry( type );

// explicit registration keys
if ( isEmpty( keys ) ) {
LOG.typeDefinedNoRegistrationKeys( type );
Expand All @@ -324,19 +315,6 @@ public void register(BasicType<?> type, String... keys) {
}
}

private void applyOrOverwriteEntry(BasicType<?> type) {
final var jdbcType = type.getJdbcType();
final var existing = registryForJdbcType( jdbcType ).put( type.getMappedJavaType(), type );
if ( existing != null ) {
LOG.tracef(
"BasicTypeRegistry registration overwritten (%s + %s); previous =`%s`",
jdbcType.getFriendlyName(),
type.getJavaTypeDescriptor(),
existing
);
}
}

public <T> CustomType<T> register(UserType<T> type, String... keys) {
final var customType = new CustomType<>( type, keys, typeConfiguration );
register( customType );
Expand Down Expand Up @@ -381,8 +359,6 @@ public void addPrimeEntry(BasicType<?> type, String legacyTypeClassName, String[
throw new HibernateException( "Type to register cannot be null" );
}

primeRegistryEntry( type );

// Legacy name registration
if ( isNotEmpty( legacyTypeClassName ) ) {
typesByName.put( legacyTypeClassName, type );
Expand Down Expand Up @@ -420,26 +396,6 @@ public void addPrimeEntry(BasicTypeReference<?> type, String legacyTypeClassName
}
}

private void primeRegistryEntry(BasicType<?> type) {
final var jdbcType = type.getJdbcType();
final var existing = registryForJdbcType( jdbcType ).get( type.getMappedJavaType() );
if ( existing != null ) {
LOG.tracef(
"Skipping registration of BasicType (%s + %s); still priming. existing = %s",
jdbcType.getFriendlyName(),
type.getJavaTypeDescriptor(),
existing
);
}
else {
registryForJdbcType( jdbcType ).put( type.getMappedJavaType(), type );
}
}

private Map<JavaType<?>, BasicType<?>> registryForJdbcType(JdbcType jdbcType) {
return registryValues.computeIfAbsent( jdbcType, key -> new ConcurrentHashMap<>() );
}

private void applyRegistrationKeys(BasicType<?> type, String[] keys) {
for ( String key : keys ) {
if ( key != null ) {
Expand Down