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

HHH-16733 Use existing SQM copy logic in QuerySplitter

This commit is contained in:
Marco Belladelli 2023-06-05 13:05:05 +02:00
parent 0d3628afd3
commit c06d6053b3
22 changed files with 180 additions and 1424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1326
hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java
View File

File diff suppressed because it is too large Load Diff

22
hibernate-core/src/main/java/org/hibernate/query/sqm/internal/NoParamSqmCopyContext.java Normal file
View File

@ -0,0 +1,22 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.query.sqm.internal;
import org.hibernate.query.sqm.tree.expression.SqmParameter;
/**
* @author Marco Belladelli
*/
public class NoParamSqmCopyContext extends SimpleSqmCopyContext {
@Override
public <T> T getCopy(T original) {
if ( original instanceof SqmParameter<?> ) {
return original;
}
return super.getCopy( original );
}
}

33
hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleSqmCopyContext.java Normal file
View File

@ -0,0 +1,33 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.query.sqm.internal;
import java.util.IdentityHashMap;
import org.hibernate.query.sqm.tree.SqmCopyContext;
/**
* @author Marco Belladelli
*/
public class SimpleSqmCopyContext implements SqmCopyContext {
private final IdentityHashMap<Object, Object> map = new IdentityHashMap<>();
@Override
@SuppressWarnings( "unchecked" )
public <T> T getCopy(T original) {
return (T) map.get( original );
}
@Override
public <T> T registerCopy(T original, T copy) {
final Object old = map.put( original, copy );
if ( old != null ) {
throw new IllegalArgumentException( "Already registered a copy: " + old );
}
return copy;
}
}

109
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmCopyContext.java
View File

@ -6,10 +6,8 @@
*/
package org.hibernate.query.sqm.tree;
import java.util.IdentityHashMap;
import org.hibernate.query.sqm.tree.domain.SqmPath;
import org.hibernate.query.sqm.tree.expression.SqmParameter;
import org.hibernate.query.sqm.internal.NoParamSqmCopyContext;
import org.hibernate.query.sqm.internal.SimpleSqmCopyContext;
/**
*
@ -21,109 +19,10 @@ public interface SqmCopyContext {
<T> T registerCopy(T original, T copy);
static SqmCopyContext simpleContext() {
final IdentityHashMap<Object, Object> map = new IdentityHashMap<>();
return new SqmCopyContext() {
@Override
@SuppressWarnings("unchecked")
public <T> T getCopy(T original) {
if (original instanceof SqmPath) {
return (T) getPathCopy( (SqmPath<?>) original );
}
else {
return (T) map.get( original );
}
}
@Override
public <T> T registerCopy(T original, T copy) {
final Object old = map.put( original, copy );
if ( old != null ) {
throw new IllegalArgumentException( "Already registered a copy: " + old );
}
return copy;
}
@SuppressWarnings("unchecked")
private <T extends SqmPath<?>> T getPathCopy(T original) {
T existing = (T) map.get( original );
if ( existing != null ) {
return existing;
}
SqmPath<?> root = getRoot( original );
if ( root != original ) {
root.copy( this );
// root path might have already copied original
return (T) map.get( original );
}
else {
return null;
}
}
private SqmPath<?> getRoot(SqmPath<?> path) {
if ( path.getLhs() != null ) {
return getRoot( path.getLhs() );
}
else {
return path;
}
}
};
return new SimpleSqmCopyContext();
}
static SqmCopyContext noParamCopyContext() {
final IdentityHashMap<Object, Object> map = new IdentityHashMap<>();
return new SqmCopyContext() {
@Override
@SuppressWarnings("unchecked")
public <T> T getCopy(T original) {
if ( original instanceof SqmParameter ) {
return original;
}
if (original instanceof SqmPath) {
return (T) getPathCopy( (SqmPath<?>) original );
}
else {
return (T) map.get( original );
}
}
@Override
public <T> T registerCopy(T original, T copy) {
final Object old = map.put( original, copy );
if ( old != null ) {
throw new IllegalArgumentException( "Already registered a copy: " + old );
}
return copy;
}
@SuppressWarnings("unchecked")
private <T extends SqmPath<?>> T getPathCopy(T original) {
T existing = (T) map.get( original );
if ( existing != null ) {
return existing;
}
SqmPath<?> root = getRoot( original );
if ( root != original ) {
root.copy( this );
// root path might have already copied original
return (T) map.get( original );
}
else {
return null;
}
}
private SqmPath<?> getRoot(SqmPath<?> path) {
if ( path.getLhs() != null ) {
return getRoot( path.getLhs() );
}
else {
return path;
}
}
};
return new NoParamSqmCopyContext();
}
}

30
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java
View File

@ -13,6 +13,8 @@ import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import org.hibernate.internal.util.NullnessUtil;
import org.hibernate.metamodel.mapping.CollectionPart;
import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
import org.hibernate.metamodel.model.domain.DomainType;
import org.hibernate.metamodel.model.domain.EntityDomainType;
@ -56,6 +58,8 @@ public abstract class AbstractSqmPath<T> extends AbstractSqmExpression<T> implem
}
protected void copyTo(AbstractSqmPath<T> target, SqmCopyContext context) {
assert lhs == null || lhs.getNavigablePath() == target.getLhs().getNavigablePath()
|| getRoot( lhs ).getNodeType() instanceof SqmPolymorphicRootDescriptor;
super.copyTo( target, context );
if ( reusablePaths != null ) {
target.reusablePaths = new HashMap<>( reusablePaths.size() );
@ -65,6 +69,10 @@ public abstract class AbstractSqmPath<T> extends AbstractSqmExpression<T> implem
}
}
private SqmPath<?> getRoot(SqmPath<?> lhs) {
return lhs.getLhs() == null ? lhs : getRoot( lhs.getLhs() );
}
@Override
public SqmPathSource<T> getNodeType() {
return (SqmPathSource<T>) super.getNodeType();
@ -212,6 +220,28 @@ public abstract class AbstractSqmPath<T> extends AbstractSqmExpression<T> implem
return path;
}
/**
* Utility that checks if this path's parent navigable path is compatible with the specified SQM parent,
* and if not creates a copy of the navigable path with the correct parent.
*/
protected NavigablePath getNavigablePathCopy(SqmPath<?> parent) {
final NavigablePath parentNavigablePath = NullnessUtil.castNonNull( navigablePath.getRealParent() );
if ( parent.getNavigablePath() == parentNavigablePath ) {
return navigablePath;
}
else if ( CollectionPart.Nature.fromNameExact( parentNavigablePath.getLocalName() ) != null ) {
if ( parent.getNavigablePath() == parentNavigablePath.getRealParent() ) {
return navigablePath;
}
else {
return parent.getNavigablePath()
.append( parentNavigablePath.getLocalName() )
.append( navigablePath.getLocalName(), navigablePath.getAlias() );
}
}
return parent.getNavigablePath().append( navigablePath.getLocalName(), navigablePath.getAlias() );
}
@Override
@SuppressWarnings("unchecked")
public <Y> SqmPath<Y> get(SingularAttribute<? super T, Y> jpaAttribute) {

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java
View File

@ -39,12 +39,13 @@ public class NonAggregatedCompositeSimplePath<T> extends SqmEntityValuedSimplePa
return existing;
}
final SqmPath<?> lhsCopy = getLhs().copy( context );
final NonAggregatedCompositeSimplePath<T> path = context.registerCopy(
this,
new NonAggregatedCompositeSimplePath<>(
getNavigablePath(),
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getLhs().copy( context ),
lhsCopy,
nodeBuilder()
)
);

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java
View File

@ -49,12 +49,13 @@ public class SqmAnyValuedSimplePath<T> extends AbstractSqmSimplePath<T> {
return existing;
}
final SqmPath<?> lhsCopy = getLhs().copy( context );
final SqmAnyValuedSimplePath<T> path = context.registerCopy(
this,
new SqmAnyValuedSimplePath<>(
getNavigablePath(),
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getLhs().copy( context ),
lhsCopy,
getExplicitAlias(),
nodeBuilder()
)

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java
View File

@ -56,11 +56,12 @@ public class SqmBagJoin<O, E> extends AbstractSqmPluralJoin<O,Collection<E>, E>
if ( existing != null ) {
return existing;
}
final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
final SqmBagJoin<O, E> path = context.registerCopy(
this,
new SqmBagJoin<>(
getLhs().copy( context ),
getNavigablePath(),
lhsCopy,
getNavigablePathCopy( lhsCopy ),
getAttribute(),
getExplicitAlias(),
getSqmJoinType(),

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
View File

@ -50,12 +50,13 @@ public class SqmBasicValuedSimplePath<T>
return existing;
}
final SqmPath<?> lhsCopy = getLhs().copy( context );
final SqmBasicValuedSimplePath<T> path = context.registerCopy(
this,
new SqmBasicValuedSimplePath<>(
getNavigablePath(),
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getLhs().copy( context ),
lhsCopy,
getExplicitAlias(),
nodeBuilder()
)

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
View File

@ -59,12 +59,13 @@ public class SqmEmbeddedValuedSimplePath<T>
return existing;
}
final SqmPath<?> lhsCopy = getLhs().copy( context );
final SqmEmbeddedValuedSimplePath<T> path = context.registerCopy(
this,
new SqmEmbeddedValuedSimplePath<>(
getNavigablePath(),
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getLhs().copy( context ),
lhsCopy,
getExplicitAlias(),
nodeBuilder()
)

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
View File

@ -34,12 +34,13 @@ public class SqmEntityValuedSimplePath<T> extends AbstractSqmSimplePath<T> {
return existing;
}
final SqmPath<?> lhsCopy = getLhs().copy( context );
final SqmEntityValuedSimplePath<T> path = context.registerCopy(
this,
new SqmEntityValuedSimplePath<>(
getNavigablePath(),
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getLhs().copy( context ),
lhsCopy,
nodeBuilder()
)
);

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java
View File

@ -42,11 +42,12 @@ public class SqmIndexedCollectionAccessPath<T> extends AbstractSqmPath<T> implem
return existing;
}
final SqmPath<?> lhsCopy = getLhs().copy( context );
final SqmIndexedCollectionAccessPath<T> path = context.registerCopy(
this,
new SqmIndexedCollectionAccessPath<T>(
getNavigablePath(),
getLhs().copy( context ),
getNavigablePathCopy( lhsCopy ),
lhsCopy,
selectorExpression.copy( context )
)
);

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java
View File

@ -59,11 +59,12 @@ public class SqmListJoin<O,E>
if ( existing != null ) {
return existing;
}
final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
final SqmListJoin<O, E> path = context.registerCopy(
this,
new SqmListJoin<>(
getLhs().copy( context ),
getNavigablePath(),
lhsCopy,
getNavigablePathCopy( lhsCopy ),
getAttribute(),
getExplicitAlias(),
getSqmJoinType(),

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java
View File

@ -58,11 +58,12 @@ public class SqmMapJoin<O, K, V>
if ( existing != null ) {
return existing;
}
final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
final SqmMapJoin<O, K, V> path = context.registerCopy(
this,
new SqmMapJoin<>(
getLhs().copy( context ),
getNavigablePath(),
lhsCopy,
getNavigablePathCopy( lhsCopy ),
getAttribute(),
getExplicitAlias(),
getSqmJoinType(),

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java
View File

@ -64,11 +64,12 @@ public class SqmPluralPartJoin<O,T> extends AbstractSqmJoin<O,T> implements SqmQ
if ( existing != null ) {
return existing;
}
final SqmFrom<?, O> lhsCopy = (SqmFrom<?, O>) getLhs().copy( context );
final SqmPluralPartJoin<O, T> path = context.registerCopy(
this,
new SqmPluralPartJoin<>(
(SqmFrom<?, O>) getLhs().copy( context ),
getNavigablePath(),
lhsCopy,
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getExplicitAlias(),
getSqmJoinType(),

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java
View File

@ -56,12 +56,13 @@ public class SqmPluralValuedSimplePath<E> extends AbstractSqmSimplePath<E> {
return existing;
}
final SqmPath<?> lhsCopy = getLhs().copy( context );
final SqmPluralValuedSimplePath<E> path = context.registerCopy(
this,
new SqmPluralValuedSimplePath<>(
getNavigablePath(),
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getLhs().copy( context ),
lhsCopy,
getExplicitAlias(),
nodeBuilder()
)

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java
View File

@ -58,11 +58,12 @@ public class SqmSetJoin<O, E>
if ( existing != null ) {
return existing;
}
final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
final SqmSetJoin<O, E> path = context.registerCopy(
this,
new SqmSetJoin<>(
getLhs().copy( context ),
getNavigablePath(),
lhsCopy,
getNavigablePathCopy( lhsCopy ),
getModel(),
getExplicitAlias(),
getSqmJoinType(),

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
View File

@ -67,11 +67,12 @@ public class SqmSingularJoin<O,T> extends AbstractSqmAttributeJoin<O,T> {
if ( existing != null ) {
return existing;
}
final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
final SqmSingularJoin<O, T> path = context.registerCopy(
this,
new SqmSingularJoin<>(
getLhs().copy( context ),
getNavigablePath(),
lhsCopy,
getNavigablePathCopy( lhsCopy ),
getAttribute(),
getExplicitAlias(),
getSqmJoinType(),

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java
View File

@ -61,13 +61,14 @@ public class SqmCrossJoin<T> extends AbstractSqmFrom<T, T> implements JpaCrossJo
if ( existing != null ) {
return existing;
}
final SqmRoot<?> rootCopy = getRoot().copy( context );
final SqmCrossJoin<T> path = context.registerCopy(
this,
new SqmCrossJoin<>(
getNavigablePath(),
getNavigablePathCopy( rootCopy ),
getReferencedPathSource(),
getExplicitAlias(),
sqmRoot.copy( context )
rootCopy
)
);
copyTo( path, context );

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java
View File

@ -91,16 +91,17 @@ public class SqmDerivedJoin<T> extends AbstractSqmQualifiedJoin<T, T> implements
if ( existing != null ) {
return existing;
}
final SqmRoot<?> rootCopy = findRoot().copy( context );
final SqmDerivedJoin<T> path = context.registerCopy(
this,
new SqmDerivedJoin<>(
getNavigablePath(),
getNavigablePathCopy( rootCopy ),
subQuery,
lateral,
getReferencedPathSource(),
getExplicitAlias(),
getSqmJoinType(),
findRoot().copy( context )
rootCopy
)
);
copyTo( path, context );

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java
View File

@ -65,14 +65,15 @@ public class SqmEntityJoin<T> extends AbstractSqmQualifiedJoin<T, T> implements
if ( existing != null ) {
return existing;
}
final SqmRoot<?> rootCopy = getRoot().copy( context );
final SqmEntityJoin<T> path = context.registerCopy(
this,
new SqmEntityJoin<>(
getNavigablePath(),
getNavigablePathCopy( rootCopy ),
getReferencedPathSource(),
getExplicitAlias(),
getSqmJoinType(),
getRoot().copy( context )
rootCopy
)
);
copyTo( path, context );

4
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java
View File

@ -9,6 +9,7 @@ package org.hibernate.query.sqm.tree.from;
import java.util.ArrayList;
import java.util.List;
import org.hibernate.Internal;
import org.hibernate.metamodel.model.domain.EntityDomainType;
import org.hibernate.spi.NavigablePath;
import org.hibernate.query.PathException;
@ -87,7 +88,8 @@ public class SqmRoot<E> extends AbstractSqmFrom<E,E> implements JpaRoot<E> {
return path;
}
protected void copyTo(SqmRoot<E> target, SqmCopyContext context) {
@Internal
public void copyTo(SqmRoot<E> target, SqmCopyContext context) {
super.copyTo( target, context );
if ( orderedJoins != null ) {
target.orderedJoins = new ArrayList<>( orderedJoins.size() );