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

Ensure U4-8720 is properly merged into v8

Browse Source
This commit is contained in:
Stephan
2016-11-05 12:22:57 +01:00
parent 467ed87c3b
commit 8aa730d986
10 changed files with 179 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
View File

@@ -15,7 +15,7 @@ using Umbraco.Web.Routing;
namespace Umbraco.Web.PublishedCache.NuCache
{
class ContentCache : PublishedCacheBase, IPublishedContentCache, INavigableData, IDisposable
internal class ContentCache : PublishedCacheBase, IPublishedContentCache, INavigableData, IDisposable
{
private readonly ContentStore2.Snapshot _snapshot;
private readonly ICacheProvider _facadeCache;
@@ -209,11 +209,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
: n.Published;
}
public override IPublishedContent GetById(bool preview, Guid nodeId)
public override IPublishedContent GetById(bool preview, Guid contentId)
{
// fixme - implement in a more efficient way
const string xpath = "//* [@isDoc and @key=$guid]";
return GetSingleByXPath(preview, xpath, new[] { new XPathVariable("guid", nodeId.ToString()) });
var n = _snapshot.Get(contentId);
if (n == null) return null;
// both .Draft and .Published cannot be null at the same time
return preview
? n.Draft ?? GetPublishedContentAsPreviewing(n.Published)
: n.Published;
}
public override bool HasById(bool preview, int contentId)

56
src/Umbraco.Web/PublishedCache/NuCache/ContentStore2.cs
View File

@@ -180,7 +180,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
_localDb = null;
});
}
#endregion
#region Content types
@@ -295,7 +295,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
// unknown = bad
if (_contentTypesById.TryGetValue(kit.ContentTypeId, out link) == false || link.Value == null)
return false;
// not checking ByAlias, assuming we don't have internal errors
// register
@@ -560,7 +560,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
// already in the dict
if (link.Gen != _liveGen)
{
// for an older gen - if value is different then insert a new
// for an older gen - if value is different then insert a new
// link for the new gen, with the new value
if (link.Value != value)
dict.TryUpdate(key, new LinkedNode<TValue>(value, _liveGen, link), link);
@@ -619,7 +619,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
break;
link = link.Next;
}
if (link != null && link.Value != null)
if (link?.Value != null)
yield return Get(kvp.Key, gen);
}
}
@@ -638,6 +638,27 @@ namespace Umbraco.Web.PublishedCache.NuCache
return null;
}
public IEnumerable<ContentNode> GetAll(long gen)
{
// enumerating on .Values locks the concurrent dictionary,
// so better get a shallow clone in an array and release
var links = _contentNodes.Values.ToArray();
foreach (var l in links)
{
var link = l;
while (link != null)
{
if (link.Gen <= gen)
{
if (link.Value != null)
yield return link.Value;
break;
}
link = link.Next;
}
}
}
public bool IsEmpty(long gen)
{
var has = _contentNodes.Any(x =>
@@ -737,7 +758,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
if (_collectTask != null)
return _collectTask;
// ReSharper disable InconsistentlySynchronizedField
var task = _collectTask = Task.Run(() => Collect());
_collectTask.ContinueWith(_ =>
@@ -795,7 +816,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
#if DEBUG
//_logger.Debug<ContentStore2>("Collect id:" + kvp.Key + ", gen:" + link.Gen +
// ", nxt:" + (link.Next == null ? "null" : "link") +
// ", nxt:" + (link.Next == null ? "null" : "link") +
// ", val:" + (link.Value == null ? "null" : "value"));
#endif
@@ -807,7 +828,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
if (link.Gen < liveGen && link.Value == null
&& (link.Next == null || link.Gen <= _floorGen))
{
// not live, null value, no next link = remove that one -- but only if
// not live, null value, no next link = remove that one -- but only if
// the dict has not been updated, have to do it via ICollection<> (thanks
// Mr Toub) -- and if the dict has been updated there is nothing to collect
var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode<TValue>>>;
@@ -891,7 +912,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
}
internal TestHelper Test { get { return _unitTesting ?? (_unitTesting = new TestHelper(this)); } }
#endregion
#region Classes
@@ -951,6 +972,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
return _store.Get(id, _gen);
}
public ContentNode Get(Guid id)
{
if (_gen < 0)
throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
// fixme - optimize with an index - getAll/iterating is expensive
return _store.GetAll(_gen).FirstOrDefault(x => x.Uid == id);
}
public IEnumerable<ContentNode> GetAtRoot()
{
if (_gen < 0)
@@ -972,6 +1001,17 @@ namespace Umbraco.Web.PublishedCache.NuCache
return _store.GetContentType(alias, _gen);
}
// this code is here just so you don't try to implement it
// the only way we can iterate over "all" without locking the entire cache forever
// is by shallow cloning the cache, which is quite expensive, so we should probably not do it,
// and implement cache-level indexes
//public IEnumerable<ContentNode> GetAll()
//{
// if (_gen < 0)
// throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
// return _store.GetAll(_gen);
//}
public bool IsEmpty
{
get

9
src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs
View File

@@ -2,9 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Xml.XPath;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Models;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Xml;
using Umbraco.Core.Xml.XPath;
@@ -12,7 +10,7 @@ using Umbraco.Web.PublishedCache.NuCache.Navigable;
namespace Umbraco.Web.PublishedCache.NuCache
{
class MediaCache : PublishedCacheBase, IPublishedMediaCache, INavigableData, IDisposable
internal class MediaCache : PublishedCacheBase, IPublishedMediaCache, INavigableData, IDisposable
{
private readonly ContentStore2.Snapshot _snapshot;
private readonly ICacheProvider _facadeCache;
@@ -40,9 +38,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
public override IPublishedContent GetById(bool preview, Guid contentId)
{
// fixme - test + implement in a more efficient way
const string xpath = "//* [@isDoc and @key=$guid]";
return GetSingleByXPath(preview, xpath, new[] { new XPathVariable("guid", contentId.ToString()) });
var n = _snapshot.Get(contentId);
return n?.Published;
}
public override bool HasById(bool preview, int contentId)

12
src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
View File

@@ -252,16 +252,20 @@ namespace Umbraco.Web.PublishedCache.NuCache
// enumerating on .Values locks the concurrent dictionary,
// so better get a shallow clone in an array and release
var links = _items.Values.ToArray();
return links.Select(link =>
foreach (var l in links)
{
var link = l;
while (link != null)
{
if (link.Gen <= gen)
return link.Value; // may be null
{
if (link.Value != null)
yield return link.Value;
break;
}
link = link.Next;
}
return null;
}).Where(x => x != null);
}
}
public bool IsEmpty(long gen)