HHH-15610 Remove internal CacheKeyValueDescriptor uses from Type and JavaType

Author: beikov

hibernate-core/src/main/java/org/hibernate/cache/internal/CacheKeyImplementation.java

@@ -26,7 +26,6 @@
 @Internal
 public final class CacheKeyImplementation implements Serializable {
 	private final Object id;
-	private final CacheKeyValueDescriptor cacheKeyValueDescriptor;
 	private final String entityOrRoleName;
 	private final String tenantId;
 	private final int hashCode;
@@ -49,24 +48,14 @@ public CacheKeyImplementation(
 			final String entityOrRoleName,
 			final String tenantId,
 			final SessionFactoryImplementor factory) {
-		this.id = id;
+		this.id = type.disassemble( id, factory );
 		this.entityOrRoleName = entityOrRoleName;
 		this.tenantId = tenantId;
-		final CacheKeyValueDescriptor cacheKeyValueDescriptor = type.toCacheKeyDescriptor( factory );
-		// Optimization for the very common case Integer/Long etc. which use the default cache key descriptor
-		// Doing this helps to avoid megamorphic call sites and reduces the cache key serialization size
-		if ( cacheKeyValueDescriptor == DefaultCacheKeyValueDescriptor.INSTANCE ) {
-			this.cacheKeyValueDescriptor = null;
-			this.hashCode = Objects.hashCode( id );
-		}
-		else {
-			this.cacheKeyValueDescriptor = cacheKeyValueDescriptor;
-			this.hashCode = calculateHashCode();
-		}
+		this.hashCode = calculateHashCode( id, type, tenantId );
 	}
 
-	private int calculateHashCode() {
-		int result = cacheKeyValueDescriptor.getHashCode( id );
+	private static int calculateHashCode(Object id, Type type, String tenantId) {
+		int result = type.getHashCode( id );
 		result = 31 * result + ( tenantId != null ? tenantId.hashCode() : 0 );
 		return result;
 	}
@@ -88,18 +77,9 @@ public boolean equals(Object other) {
 			return false;
 		}
 		final CacheKeyImplementation that = (CacheKeyImplementation) other;
-		if ( !entityOrRoleName.equals( that.entityOrRoleName ) ) {
-			return false;
-		}
-		if ( cacheKeyValueDescriptor == null ) {
-			if ( !Objects.equals( id, that.id ) ) {
-				return false;
-			}
-		}
-		else if ( !cacheKeyValueDescriptor.isEqual( id, that.id ) ) {
-			return false;
-		}
-		return Objects.equals( tenantId, that.tenantId );
+		return entityOrRoleName.equals( that.entityOrRoleName )
+				&& Objects.deepEquals( id, that.id )
+				&& Objects.equals( tenantId, that.tenantId );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/cache/internal/CacheKeyValueDescriptor.java

@@ -61,6 +61,16 @@ public Serializable disassemble(Object value, SharedSessionContractImplementor s
 		}
 	}
 
+	@Override
+	public Serializable disassemble(Object value, SessionFactoryImplementor sessionFactory) throws HibernateException {
+		if ( value == null ) {
+			return null;
+		}
+		else {
+			return (Serializable) deepCopy( value, sessionFactory );
+		}
+	}
+
 	@Override
 	public Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner)
 	throws HibernateException {

hibernate-core/src/main/java/org/hibernate/cache/internal/ComponentCacheKeyValueDescriptor.java

@@ -300,6 +300,11 @@ public Serializable disassemble(Object value, SharedSessionContractImplementor s
 		}
 	}
 
+	@Override
+	public Serializable disassemble(Object value, SessionFactoryImplementor sessionFactory) throws HibernateException {
+		throw new UnsupportedOperationException( "AnyType not supported as part of cache key!" );
+	}
+
 	@Override
 	public Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner, Map<Object, Object> copyCache)
 			throws HibernateException {

hibernate-core/src/main/java/org/hibernate/cache/internal/CustomComponentCacheKeyValueDescriptor.java

@@ -10,7 +10,6 @@
 import java.util.List;
 
 import org.hibernate.Incubating;
-import org.hibernate.cache.internal.CacheKeyValueDescriptor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.mapping.IndexedConsumer;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
@@ -29,7 +28,7 @@
  *
  * @author Steve Ebersole
  */
-public interface BasicType<T> extends Type, BasicDomainType<T>, MappingType, BasicValuedMapping, JdbcMapping, CacheKeyValueDescriptor {
+public interface BasicType<T> extends Type, BasicDomainType<T>, MappingType, BasicValuedMapping, JdbcMapping {
 	/**
 	 * Get the names under which this type should be registered in the type registry.
 	 *

hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeyValueDescriptor.java

@@ -258,6 +258,11 @@ public Serializable disassemble(Object value, SharedSessionContractImplementor s
 		return key == null ? null : getPersister( session ).getKeyType().disassemble( key, session, owner );
 	}
 
+	@Override
+	public Serializable disassemble(Object value, SessionFactoryImplementor sessionFactory) throws HibernateException {
+		throw new UnsupportedOperationException( "CollectionType not supported as part of cache key!" );
+	}
+
 	@Override
 	public Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner)
 			throws HibernateException {

hibernate-core/src/main/java/org/hibernate/cache/internal/JavaTypeCacheKeyValueDescriptor.java

@@ -21,9 +21,6 @@
 import org.hibernate.PropertyNotFoundException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
-import org.hibernate.cache.internal.CacheKeyValueDescriptor;
-import org.hibernate.cache.internal.ComponentCacheKeyValueDescriptor;
-import org.hibernate.cache.internal.CustomComponentCacheKeyValueDescriptor;
 import org.hibernate.engine.spi.CascadeStyle;
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -67,7 +64,6 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
 	private final CompositeUserType<Object> compositeUserType;
 
 	private EmbeddableValuedModelPart mappingModelPart;
-	private transient CacheKeyValueDescriptor cacheKeyValueDescriptor;
 
 	public ComponentType(Component component, int[] originalPropertyOrder, MetadataBuildingContext buildingContext) {
 		this.componentClass = component.isDynamic()
@@ -630,6 +626,23 @@ else if ( compositeUserType != null ) {
 		}
 	}
 
+	@Override
+	public Serializable disassemble(Object value, SessionFactoryImplementor sessionFactory) throws HibernateException {
+		if ( value == null ) {
+			return null;
+		}
+		else if ( compositeUserType != null ) {
+			return compositeUserType.disassemble( value );
+		}
+		else {
+			Object[] values = getPropertyValues( value );
+			for ( int i = 0; i < propertyTypes.length; i++ ) {
+				values[i] = propertyTypes[i].disassemble( values[i], sessionFactory );
+			}
+			return values;
+		}
+	}
+
 	@Override
 	public Object assemble(Serializable object, SharedSessionContractImplementor session, Object owner)
 			throws HibernateException {
@@ -703,22 +716,6 @@ public boolean[] toColumnNullness(Object value, Mapping mapping) {
 		return result;
 	}
 
-	@Override
-	public CacheKeyValueDescriptor toCacheKeyDescriptor(SessionFactoryImplementor sessionFactory) {
-		CacheKeyValueDescriptor cacheKeyValueDescriptor = this.cacheKeyValueDescriptor;
-		if ( cacheKeyValueDescriptor == null ) {
-			if ( compositeUserType != null ) {
-				cacheKeyValueDescriptor = new CustomComponentCacheKeyValueDescriptor( compositeUserType );
-			}
-			else {
-				cacheKeyValueDescriptor = new ComponentCacheKeyValueDescriptor( mappingModelPart, sessionFactory );
-			}
-			this.cacheKeyValueDescriptor = cacheKeyValueDescriptor;
-		}
-
-		return cacheKeyValueDescriptor;
-	}
-
 	@Override
 	public boolean isEmbedded() {
 		return false;