Skip to content

Commit 4c91a64

Browse files
committed
HHH-19556 Introduce SqmCacheable for query caching via #isCompatible and #cacheHashCode instead of equals/hashCode
1 parent d3d5f8c commit 4c91a64

File tree

168 files changed

+3082
-1300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+3082
-1300
lines changed

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.hibernate.query.sqm.tree.domain.SqmPath;
1414
import org.hibernate.spi.NavigablePath;
1515

16-
import java.util.Objects;
1716

1817
public class AnyDiscriminatorSqmPath<T> extends AbstractSqmPath<T> implements DiscriminatorSqmPath<T> {
1918

@@ -48,16 +47,4 @@ public AnyDiscriminatorSqmPathSource<T> getExpressible() {
4847
// return (AnyDiscriminatorSqmPathSource<T>) getNodeType();
4948
return (AnyDiscriminatorSqmPathSource<T>) getReferencedPathSource();
5049
}
51-
52-
53-
@Override
54-
public boolean equals(Object object) {
55-
return object instanceof AnyDiscriminatorSqmPath<?> that
56-
&& Objects.equals( this.getLhs(), that.getLhs() );
57-
}
58-
59-
@Override
60-
public int hashCode() {
61-
return getLhs().hashCode();
62-
}
6350
}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import org.hibernate.query.sqm.tree.domain.SqmPath;
1515
import org.hibernate.spi.NavigablePath;
1616

17-
import java.util.Objects;
18-
1917
/**
2018
* {@link SqmPath} specialization for an embeddable discriminator
2119
*
@@ -62,14 +60,4 @@ public <X> X accept(SemanticQueryWalker<X> walker) {
6260
return walker.visitDiscriminatorPath( this );
6361
}
6462

65-
@Override
66-
public boolean equals(Object object) {
67-
return object instanceof EmbeddedDiscriminatorSqmPath<?> that
68-
&& Objects.equals( this.getLhs(), that.getLhs() );
69-
}
70-
71-
@Override
72-
public int hashCode() {
73-
return getLhs().hashCode();
74-
}
7563
}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.hibernate.query.sqm.tree.domain.SqmEntityDomainType;
1818
import org.hibernate.spi.NavigablePath;
1919

20-
import java.util.Objects;
2120

2221
/**
2322
* {@link SqmPath} specialization for an entity discriminator
@@ -75,15 +74,4 @@ public <X> X accept(SemanticQueryWalker<X> walker) {
7574
? walker.visitDiscriminatorPath( this )
7675
: walker.visitEntityTypeLiteralExpression( new SqmLiteralEntityType( entityDomainType, nodeBuilder() ) );
7776
}
78-
79-
@Override
80-
public boolean equals(Object object) {
81-
return object instanceof EntityDiscriminatorSqmPath<?> that
82-
&& Objects.equals( this.getLhs(), that.getLhs() );
83-
}
84-
85-
@Override
86-
public int hashCode() {
87-
return getLhs().hashCode();
88-
}
8977
}

hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePath.java

Lines changed: 0 additions & 66 deletions
This file was deleted.

hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)