HHH-13331 : Query Cache should not be allowed for queris having Non Cacheable Query Spaces

hibernate-core/src/main/java/org/hibernate/cache/spi/UpdateTimestampsCache.java

@@ -13,7 +13,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.CoreMessageLogger;
-
+import org.hibernate.loader.Loader;
 import org.jboss.logging.Logger;
 
 /**
@@ -68,7 +68,9 @@ public void preInvalidate(Serializable[] spaces, SharedSessionContractImplemento
 			if ( DEBUG_ENABLED ) {
 				LOG.debugf( "Pre-invalidating space [%s], timestamp: %s", space, ts );
 			}
-
+			if (!Loader.validateSpace(space)) {
+				continue;
+			}
 			try {
 				session.getEventListenerManager().cachePutStart();
 
@@ -104,6 +106,9 @@ public void invalidate(Serializable[] spaces, SharedSessionContractImplementor s
 			if ( DEBUG_ENABLED ) {
 				LOG.debugf( "Invalidating space [%s], timestamp: %s", space, ts );
 			}
+			if (!Loader.validateSpace(space)) {
+				continue;
+			}
 
 			try {
 				session.getEventListenerManager().cachePutStart();

hibernate-core/src/main/java/org/hibernate/loader/Loader.java

@@ -102,6 +102,9 @@ public abstract class Loader {
 
 	protected static final CoreMessageLogger LOG = CoreLogging.messageLogger( Loader.class );
 	protected static final boolean DEBUG_ENABLED = LOG.isDebugEnabled();
+
+	private static Boolean metadataInitialized = false;
+	private static final Set<Serializable> cacheableSpacesSet = new HashSet<>();
 
 	private final SessionFactoryImplementor factory;
 	private volatile ColumnNameCache columnNameCache;
@@ -2415,10 +2418,13 @@ protected List list(
 			final QueryParameters queryParameters,
 			final Set<Serializable> querySpaces,
 			final Type[] resultTypes) throws HibernateException {
+		if (!metadataInitialized) {
+			initializeMetadata();
+		}
 		final boolean cacheable = factory.getSessionFactoryOptions().isQueryCacheEnabled() &&
 				queryParameters.isCacheable();
-
-		if ( cacheable ) {
+		
+		if ( cacheable && validateSpaces(querySpaces) ) {
 			return listUsingQueryCache( session, queryParameters, querySpaces, resultTypes );
 		}
 		else {
@@ -2809,4 +2815,46 @@ protected String processDistinctKeyword(
 		}
 		return sql;
 	}
+
+	public static boolean validateSpaces(Set<Serializable> querySpaces) {
+		if(querySpaces==null || querySpaces.isEmpty()) {
+			return true;
+		}
+		for(Serializable space : querySpaces) {
+			if(!cacheableSpacesSet.contains(space)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public static boolean validateSpace(Serializable space) {
+		return (space != null && cacheableSpacesSet.contains(space)) ? true : false;
+	}
+
+	private synchronized void initializeMetadata() {
+		if (!metadataInitialized && factory != null && factory.getMetamodel() != null
+				&& factory.getMetamodel().entityPersisters() != null
+				&& factory.getMetamodel().collectionPersisters() != null) {
+
+			Map<String, EntityPersister> entityPersisters = factory.getMetamodel().entityPersisters();
+			for (Map.Entry<String, EntityPersister> entry : entityPersisters.entrySet()) {
+				if (entry.getValue().getCacheAccessStrategy() != null) {
+					for (Serializable space : entry.getValue().getQuerySpaces()) {
+						cacheableSpacesSet.add(space);
+					}
+				}
+			}
+
+			Map<String, CollectionPersister> collectionPersister = factory.getMetamodel().collectionPersisters();
+			for (Map.Entry<String, CollectionPersister> entry : collectionPersister.entrySet()) {
+				if (entry.getValue().getCacheAccessStrategy() != null) {
+					for (Serializable space : entry.getValue().getCollectionSpaces()) {
+						cacheableSpacesSet.add(space);
+					}
+				}
+			}
+		}
+		metadataInitialized = true;
+	}
 }