Added query cache statistics when using MultiCriteria, and putting to cache only when put is enabled

Author: whut

src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using NHibernate.Cfg;
 using NHibernate.Criterion;
 using NHibernate.Test.SecondLevelCacheTests;
 using NUnit.Framework;
+using Environment = NHibernate.Cfg.Environment;
 
 namespace NHibernate.Test.QueryTest
 {
@@ -25,6 +27,20 @@ protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
 			return factory.ConnectionProvider.Driver.SupportsMultipleQueries;
 		}
 
+		protected override void Configure(Configuration configuration)
+		{
+			base.Configure(configuration);
+
+			configuration.SetProperty(Environment.GenerateStatistics, "true");
+		}
+
+		protected override void OnSetUp()
+		{
+			base.OnSetUp();
+
+			this.sessions.Statistics.Clear();
+		}
+
 		protected override void OnTearDown()
 		{
 			using (var session = OpenSession())
@@ -151,6 +167,22 @@ public void CanGetMultiQueryFromSecondLevelCache()
 			}
 		}
 
+		[Test]
+		public void CanUpdateStatisticsWhenGetMultiQueryFromSecondLevelCache()
+		{
+			CreateItems();
+
+			DoMutiQueryAndAssert();
+			Assert.AreEqual(0, sessions.Statistics.QueryCacheHitCount);
+			Assert.AreEqual(1, sessions.Statistics.QueryCacheMissCount);
+			Assert.AreEqual(1, sessions.Statistics.QueryCachePutCount);
+
+			DoMutiQueryAndAssert();
+			Assert.AreEqual(1, sessions.Statistics.QueryCacheHitCount);
+			Assert.AreEqual(1, sessions.Statistics.QueryCacheMissCount);
+			Assert.AreEqual(1, sessions.Statistics.QueryCachePutCount);
+		}
+
 		[Test]
 		public void TwoMultiQueriesWithDifferentPagingGetDifferentResultsWhenUsingCachedQueries()
 		{
@@ -248,7 +280,7 @@ public void CanAddCriteriaWithKeyAndRetrieveResultsWithKey()
 			using (var session = OpenSession())
 			{
 				var multiCriteria = session.CreateMultiCriteria();
-				
+
 				var firstCriteria = session.CreateCriteria(typeof(Item))
 					.Add(Restrictions.Lt("id", 50));
 
@@ -275,7 +307,7 @@ public void CanAddDetachedCriteriaWithKeyAndRetrieveResultsWithKey()
 
 				var firstCriteria = DetachedCriteria.For(typeof(Item))
 					.Add(Restrictions.Lt("id", 50));
-					
+
 				var secondCriteria = DetachedCriteria.For(typeof(Item));
 
 				multiCriteria.Add("firstCriteria", firstCriteria);

src/NHibernate/Impl/MultiCriteriaImpl.cs

@@ -120,12 +120,31 @@ private IList ListUsingQueryCache()
 												  queryCache,
 												  key);
 
+			if (factory.Statistics.IsStatisticsEnabled)
+			{
+				if (result == null)
+				{
+					factory.StatisticsImplementor.QueryCacheMiss(key.ToString(), queryCache.RegionName);
+				}
+				else
+				{
+					factory.StatisticsImplementor.QueryCacheHit(key.ToString(), queryCache.RegionName);
+				}
+			}
+
 			if (result == null)
 			{
 				log.Debug("Cache miss for multi criteria query");
 				IList list = DoList();
-				queryCache.Put(key, new ICacheAssembler[] { assembler }, new object[] { list }, combinedParameters.NaturalKeyLookup, session);
 				result = list;
+				if ((session.CacheMode & CacheMode.Put) == CacheMode.Put)
+				{
+					bool put = queryCache.Put(key, new ICacheAssembler[] { assembler }, new object[] { list }, combinedParameters.NaturalKeyLookup, session);
+					if (put && factory.Statistics.IsStatisticsEnabled)
+					{
+						factory.StatisticsImplementor.QueryCachePut(key.ToString(), queryCache.RegionName);
+					}
+				}
 			}
 
 			return GetResultList(result);