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

HHH-13189 Restore to have Set#contains efficiency

This commit is contained in:
Sanne Grinovero 2019-01-16 22:22:42 +00:00
parent f383df13a7
commit 2ab24150f0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java
View File

@ -34,10 +34,14 @@ import org.hibernate.type.Type;
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public class ParameterMetadataImpl implements ParameterMetadata { public class ParameterMetadataImpl implements ParameterMetadata {
private final Map<Integer,OrdinalParameterDescriptor> ordinalDescriptorMap; private final Map<Integer,OrdinalParameterDescriptor> ordinalDescriptorMap;
private final Map<String,NamedParameterDescriptor> namedDescriptorMap; private final Map<String,NamedParameterDescriptor> namedDescriptorMap;
private final Collection<QueryParameter> ordinalDescriptorValueCache;
private final Collection<QueryParameter> namedDescriptorValueCache; //Important: queries with large amounts of parameters need the following
//cache to have efficient performance on #containsReference(QueryParameter).
private final Set<QueryParameter> ordinalDescriptorValueCache;
private final Set<QueryParameter> namedDescriptorValueCache;
public ParameterMetadataImpl( public ParameterMetadataImpl(
Map<Integer,OrdinalParameterDescriptor> ordinalDescriptorMap, Map<Integer,OrdinalParameterDescriptor> ordinalDescriptorMap,
@ -47,14 +51,13 @@ public class ParameterMetadataImpl implements ParameterMetadata {
: Collections.unmodifiableMap( ordinalDescriptorMap ); : Collections.unmodifiableMap( ordinalDescriptorMap );
this.ordinalDescriptorValueCache = this.ordinalDescriptorMap.isEmpty() this.ordinalDescriptorValueCache = this.ordinalDescriptorMap.isEmpty()
? Collections.emptySet() ? Collections.emptySet()
: Collections.unmodifiableCollection( this.ordinalDescriptorMap.values() ); : Collections.unmodifiableSet( new HashSet<>( this.ordinalDescriptorMap.values() ) );
this.namedDescriptorMap = namedDescriptorMap == null this.namedDescriptorMap = namedDescriptorMap == null
? Collections.emptyMap() ? Collections.emptyMap()
: Collections.unmodifiableMap( namedDescriptorMap ); : Collections.unmodifiableMap( namedDescriptorMap );
this.namedDescriptorValueCache = this.namedDescriptorMap.isEmpty() this.namedDescriptorValueCache = this.namedDescriptorMap.isEmpty()
? Collections.emptySet() ? Collections.emptySet()
: Collections.unmodifiableCollection( this.namedDescriptorMap.values() ); : Collections.unmodifiableSet( new HashSet<>( this.namedDescriptorMap.values() ) );
if (ordinalDescriptorMap != null && ! ordinalDescriptorMap.isEmpty() ) { if (ordinalDescriptorMap != null && ! ordinalDescriptorMap.isEmpty() ) {
final List<Integer> sortedPositions = new ArrayList<>( ordinalDescriptorMap.keySet() ); final List<Integer> sortedPositions = new ArrayList<>( ordinalDescriptorMap.keySet() );