Skip to content

some cleanup to SqmInterpretationsKey #10052

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 1 commit into from
Apr 18, 2025
Merged

some cleanup to SqmInterpretationsKey #10052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/query/sqm/internal/QuerySqmImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import java.util.function.BooleanSupplier;

import static java.util.Collections.emptyMap;
import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
Expand Down Expand Up @@ -339,7 +339,7 @@ protected boolean resolveJdbcParameterTypeIfNecessary() {
}

@Override
public Supplier<Boolean> hasMultiValuedParameterBindingsChecker() {
public BooleanSupplier hasMultiValuedParameterBindingsChecker() {
return this::hasMultiValuedParameterBindings;
}

Expand Down
62 changes: 28 additions & 34 deletions hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
package org.hibernate.query.sqm.internal;

import java.util.Collection;
import java.util.Iterator;
import java.util.Objects;
import java.util.Set;
import java.util.function.Supplier;
import java.util.function.BooleanSupplier;

import org.hibernate.LockOptions;
import org.hibernate.engine.spi.LoadQueryInfluencers;
Expand All @@ -18,20 +17,19 @@
import org.hibernate.query.spi.QueryOptions;
import org.hibernate.query.sqm.tree.SqmStatement;

import static java.lang.Boolean.TRUE;

/**
* @author Steve Ebersole
*/
public final class SqmInterpretationsKey implements QueryInterpretationCache.Key {
final class SqmInterpretationsKey implements QueryInterpretationCache.Key {
public interface CacheabilityInfluencers {
boolean isQueryPlanCacheable();
String getQueryString();
Object getQueryStringCacheKey();
SqmStatement<?> getSqmStatement();
QueryOptions getQueryOptions();
LoadQueryInfluencers getLoadQueryInfluencers();
Supplier<Boolean> hasMultiValuedParameterBindingsChecker();
BooleanSupplier hasMultiValuedParameterBindingsChecker();
}

public interface InterpretationsKeySource extends CacheabilityInfluencers {
Expand Down Expand Up @@ -61,17 +59,15 @@ private static Collection<String> memoryEfficientDefensiveSetCopy(final Set<Stri
return null;
}
else {
switch ( set.size() ) {
case 0:
return null;
case 1:
return Set.of( set.iterator().next() );
case 2:
final Iterator<String> iterator = set.iterator();
return Set.of( iterator.next(), iterator.next() );
default:
return Set.copyOf( set );
}
return switch ( set.size() ) {
case 0 -> null;
case 1 -> Set.of( set.iterator().next() );
case 2 -> {
final var iterator = set.iterator();
yield Set.of( iterator.next(), iterator.next() );
}
default -> Set.copyOf( set );
};
}
}

Expand All @@ -83,7 +79,7 @@ private static boolean isCacheable(InterpretationsKeySource keySource) {
// parameters are part of the query string; with Criteria, they're not.
return keySource.isQueryPlanCacheable()
// At the moment we cannot cache query plan if there is filter enabled.
&& ! keySource.getLoadQueryInfluencers().hasEnabledFilters()
&& !keySource.getLoadQueryInfluencers().hasEnabledFilters()
// At the moment we cannot cache query plan if it has an entity graph
&& keySource.getQueryOptions().getAppliedGraph().getSemantic() == null
// todo (6.0) : this one may be ok because of how I implemented multi-valued param handling
Expand All @@ -92,7 +88,7 @@ private static boolean isCacheable(InterpretationsKeySource keySource) {
// in ConcreteSqmSelectQueryPlan is a concurrency issue when cached
// - This could be solved by using a method-local clone of domainParameterXref
// when multi-valued params exist
&& ! keySource.hasMultiValuedParameterBindingsChecker().get() == TRUE;
&& !keySource.hasMultiValuedParameterBindingsChecker().getAsBoolean();
}

public static QueryInterpretationCache.Key generateNonSelectKey(InterpretationsKeySource keyDetails) {
Expand All @@ -109,7 +105,7 @@ public static QueryInterpretationCache.Key generateNonSelectKey(InterpretationsK
private final TupleTransformer<?> tupleTransformer;
private final ResultListTransformer<?> resultListTransformer;
private final Collection<String> enabledFetchProfiles;
private final int hashcode;
private final int hashCode;

private SqmInterpretationsKey(
Object query,
Expand All @@ -120,7 +116,7 @@ private SqmInterpretationsKey(
ResultListTransformer<?> resultListTransformer,
Collection<String> enabledFetchProfiles) {
this.query = query;
this.hashcode = hash;
this.hashCode = hash;
this.resultType = resultType;
this.lockOptions = lockOptions;
this.tupleTransformer = tupleTransformer;
Expand All @@ -132,7 +128,7 @@ private SqmInterpretationsKey(
public QueryInterpretationCache.Key prepareForStore() {
return new SqmInterpretationsKey(
query,
hashcode,
hashCode,
resultType,
// Since lock options might be mutable, we need a copy for the cache key
lockOptions.makeDefensiveCopy(),
Expand All @@ -148,26 +144,24 @@ public String getQueryString() {
}

@Override
public boolean equals(Object o) {
if ( this == o ) {
public boolean equals(Object other) {
if ( this == other ) {
return true;
}
if ( o == null || SqmInterpretationsKey.class != o.getClass() ) {
if ( !(other instanceof SqmInterpretationsKey that)) {
return false;
}

final SqmInterpretationsKey that = (SqmInterpretationsKey) o;
return this.hashcode == o.hashCode() //check this first as some other checks are expensive
&& query.equals( that.query )
&& Objects.equals( resultType, that.resultType )
&& Objects.equals( lockOptions, that.lockOptions )
&& Objects.equals( tupleTransformer, that.tupleTransformer )
&& Objects.equals( resultListTransformer, that.resultListTransformer )
&& Objects.equals( enabledFetchProfiles, that.enabledFetchProfiles );
return this.hashCode == that.hashCode //check this first as some other checks are expensive
&& this.query.equals( that.query )
&& Objects.equals( this.resultType, that.resultType )
&& Objects.equals( this.lockOptions, that.lockOptions )
&& Objects.equals( this.tupleTransformer, that.tupleTransformer )
&& Objects.equals( this.resultListTransformer, that.resultListTransformer )
&& Objects.equals( this.enabledFetchProfiles, that.enabledFetchProfiles );
}

@Override
public int hashCode() {
return hashcode;
return hashCode;
}
}
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import java.util.function.BooleanSupplier;

import jakarta.persistence.CacheRetrieveMode;
import jakarta.persistence.CacheStoreMode;
Expand Down Expand Up @@ -522,7 +522,7 @@ public LoadQueryInfluencers getLoadQueryInfluencers() {
}

@Override
public Supplier<Boolean> hasMultiValuedParameterBindingsChecker() {
public BooleanSupplier hasMultiValuedParameterBindingsChecker() {
return this::hasMultiValuedParameterBindings;
}

Expand Down