yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates more of the test to see why the query cache continues to expand... Unfortunatley there's nothing we can do about it at this point due to the 'IN' clause queries. Good thing we now have sliding expiration on each of these!

Browse Source
This commit is contained in:
Shannon
2014-09-26 13:55:25 +10:00
parent 9d5f3089c8
commit 62327a9b58
2 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/Umbraco.Core/Persistence/PetaPoco.cs
View File

@@ -1707,7 +1707,10 @@ namespace Umbraco.Core.Persistence
}
public class PocoData
{
{
//USE ONLY FOR TESTING
internal static bool UseLongKeys = false;
public static PocoData ForObject(object o, string primaryKeyName)
{
var t = o.GetType();
@@ -1848,6 +1851,8 @@ namespace Umbraco.Core.Persistence
return tc >= TypeCode.SByte && tc <= TypeCode.UInt64;
}
// Create factory function that can convert a IDataReader record into a POCO
public Delegate GetFactory(string sql, string connString, bool ForceDateTimesToUtc, int firstColumn, int countColumns, IDataReader r)
{
@@ -1857,16 +1862,24 @@ namespace Umbraco.Core.Persistence
// returning the same structured data:
// SELECT * FROM MyTable ORDER BY MyColumn
// SELECT * FROM MyTable ORDER BY MyColumn DESC
//Create a hashed key, we don't want to store so much string data in memory
var combiner = new HashCodeCombiner();
combiner.AddCaseInsensitiveString(sql);
combiner.AddCaseInsensitiveString(connString);
combiner.AddObject(ForceDateTimesToUtc);
combiner.AddInt(firstColumn);
combiner.AddInt(countColumns);
var key = combiner.GetCombinedHashCode();
string key;
if (UseLongKeys)
{
key = string.Format("{0}:{1}:{2}:{3}:{4}", sql, connString, ForceDateTimesToUtc, firstColumn, countColumns);
}
else
{
//Create a hashed key, we don't want to store so much string data in memory
var combiner = new HashCodeCombiner();
combiner.AddCaseInsensitiveString(sql);
combiner.AddCaseInsensitiveString(connString);
combiner.AddObject(ForceDateTimesToUtc);
combiner.AddInt(firstColumn);
combiner.AddInt(countColumns);
key = combiner.GetCombinedHashCode();
}
var objectCache = _managedCache.GetCache();
@@ -2162,47 +2175,38 @@ namespace Umbraco.Core.Persistence
/// Returns a report of the current cache being utilized by PetaPoco
/// </summary>
/// <returns></returns>
public static string PrintDebugCacheReport(out double totalBytes, out long totalPocoDelegates)
public static string PrintDebugCacheReport(out double totalBytes, out IEnumerable<string> allKeys)
{
var managedCache = new ManagedCache();
totalBytes = 0.0;
var sb = new StringBuilder();
sb.AppendLine("m_PocoDatas:");
foreach (var pocoData in m_PocoDatas)
{
sb.AppendFormat("\t{0}\n", pocoData.Key);
//calc bytes in utf16 (since that is how .net stores strings) based on the strings being stored
// in memory
var strBytes = new StringBuilder();
strBytes
.Append(string.Join("", pocoData.Value.QueryColumns))
.Append(pocoData.Value.TableInfo.PrimaryKey)
.Append(pocoData.Value.TableInfo.SequenceName)
.Append(pocoData.Value.TableInfo.TableName)
.Append(string.Join("", pocoData.Value.Columns.Keys))
.Append(string.Join("", pocoData.Value.Columns.Values.Select(x => x.ColumnName)));
var bytes = Encoding.Unicode.GetByteCount(strBytes.ToString());
totalBytes += bytes;
//utf16 little endian
sb.AppendFormat("\t\tString bytes:{0}\n", bytes);
sb.AppendFormat("\t\tTable:{0} - Col count:{1}\n", pocoData.Value.TableInfo.TableName, pocoData.Value.QueryColumns.Length);
sb.AppendFormat("\t\tTable:{0} - Col count:{1}\n", pocoData.Value.TableInfo.TableName, pocoData.Value.QueryColumns.Length);
}
sb.AppendFormat("\tTotal byte count:{0}\n", totalBytes);
var cache = managedCache.GetCache();
totalPocoDelegates = cache.GetCount();
sb.AppendFormat("\tTotal Poco data count:{0}\n", totalPocoDelegates);
allKeys = cache.Select(x => x.Key).ToArray();
sb.AppendFormat("\tTotal Poco data count:{0}\n", allKeys.Count());
var keys = string.Join("", cache.Select(x => x.Key));
//Bytes in .Net are stored as utf-16 = unicode little endian
totalBytes = Encoding.Unicode.GetByteCount(keys);
sb.AppendFormat("\tTotal byte for keys:{0}\n", totalBytes);
sb.AppendLine("\tAll Poco cache items:");
foreach (var item in cache)
{
sb.AppendFormat("\t\t{0} = {1}\n", item.Key, item.Value);
sb.AppendFormat("\t\t Key -> {0}\n", item.Key);
sb.AppendFormat("\t\t Value -> {0}\n", item.Value);
}
sb.AppendLine("-------------------END REPORT------------------------");
return sb.ToString();
}
}

42
src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
View File

@@ -15,15 +15,28 @@ using Umbraco.Tests.TestHelpers.Entities;
namespace Umbraco.Tests.Persistence
{
[DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
[TestFixture]
[TestFixture, NUnit.Framework.Ignore]
public class PetaPocoCachesTest : BaseServiceTest
{
/// <summary>
/// This tests the peta poco caches
/// </summary>
/// <remarks>
/// This test WILL fail. This is because we cannot stop PetaPoco from creating more cached items for queries such as
/// ContentTypeRepository.GetAll(1,2,3,4);
/// when combined with other GetAll queries that pass in an array of Ids, each query generated for different length
/// arrays will produce a unique query which then gets added to the cache.
///
/// This test confirms this, if you analyze the DIFFERENCE output below you can see why the cached queries grow.
/// </remarks>
[Test]
public void Check_Peta_Poco_Caches()
{
var result = new List<Tuple<double, long>>();
var result = new List<Tuple<double, int, IEnumerable<string>>>();
for (int i = 0; i < 10; i++)
Database.PocoData.UseLongKeys = true;
for (int i = 0; i < 2; i++)
{
int id1, id2, id3;
string alias;
@@ -31,22 +44,33 @@ namespace Umbraco.Tests.Persistence
QueryStuff(id1, id2, id3, alias);
double totalBytes1;
long totalDelegates1;
Console.Write(Database.PocoData.PrintDebugCacheReport(out totalBytes1, out totalDelegates1));
IEnumerable<string> keys;
Console.Write(Database.PocoData.PrintDebugCacheReport(out totalBytes1, out keys));
result.Add(new Tuple<double, long>(totalBytes1, totalDelegates1));
result.Add(new Tuple<double, int, IEnumerable<string>>(totalBytes1, keys.Count(), keys));
}
foreach (var tuple in result)
for (int index = 0; index < result.Count; index++)
{
var tuple = result[index];
Console.WriteLine("Bytes: {0}, Delegates: {1}", tuple.Item1, tuple.Item2);
if (index != 0)
{
Console.WriteLine("----------------DIFFERENCE---------------------");
var diff = tuple.Item3.Except(result[index - 1].Item3);
foreach (var d in diff)
{
Console.WriteLine(d);
}
}
}
var allByteResults = result.Select(x => x.Item1).Distinct();
var allDelegateResults = result.Select(x => x.Item2).Distinct();
var totalKeys = result.Select(x => x.Item2).Distinct();
Assert.AreEqual(1, allByteResults.Count());
Assert.AreEqual(1, allDelegateResults.Count());
Assert.AreEqual(1, totalKeys.Count());
}
private void QueryStuff(int id1, int id2, int id3, string alias1)