Fixes issue - when calling Set, we were not setting all node graph elements.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using Umbraco.Core.Models.PublishedContent;
|
||||
using Umbraco.Web.PublishedCache.NuCache.DataSource;
|
||||
|
||||
@@ -6,6 +7,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
|
||||
{
|
||||
// represents a content "node" ie a pair of draft + published versions
|
||||
// internal, never exposed, to be accessed from ContentStore (only!)
|
||||
[DebuggerDisplay("Id: {Id}, Path: {Path}")]
|
||||
internal class ContentNode
|
||||
{
|
||||
// special ctor for root pseudo node
|
||||
|
||||
@@ -549,7 +549,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
|
||||
|
||||
// manage children
|
||||
if (existing != null)
|
||||
{
|
||||
kit.Node.FirstChildContentId = existing.FirstChildContentId;
|
||||
kit.Node.LastChildContentId = existing.LastChildContentId;
|
||||
}
|
||||
|
||||
// set
|
||||
SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);
|
||||
@@ -571,6 +574,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
|
||||
{
|
||||
// replacing existing, handle siblings
|
||||
kit.Node.NextSiblingContentId = existing.NextSiblingContentId;
|
||||
//TODO: What about previous sibling??
|
||||
kit.Node.PreviousSiblingContentId = existing.PreviousSiblingContentId;
|
||||
}
|
||||
|
||||
_xmap[kit.Node.Uid] = kit.Node.Id;
|
||||
@@ -729,7 +734,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
|
||||
// clear
|
||||
if (existing != null)
|
||||
{
|
||||
//this zero's out the branch (recursively), if we're in a new gen this will add a NULL placeholder for the gen
|
||||
ClearBranchLocked(existing);
|
||||
//TODO: This removes the current GEN from the tree - do we really want to do that?
|
||||
RemoveTreeNodeLocked(existing);
|
||||
}
|
||||
|
||||
@@ -1002,11 +1009,19 @@ namespace Umbraco.Web.PublishedCache.NuCache
|
||||
}
|
||||
|
||||
// else it's going somewhere in the middle,
|
||||
// and this is bad, perfs-wise - we only do it when moving
|
||||
// inserting in linked list is slow, optimizing would require trees
|
||||
// but... that should not happen very often - and not on large amount of data
|
||||
// TODO: There was a note about performance when this occurs and that this only happens when moving and not very often, but that is not true,
|
||||
// this also happens anytime a middle node is unpublished or republished (which causes a branch update), i'm unsure if this has perf impacts,
|
||||
// i think this used to but it doesn't seem bad anymore that I can see...
|
||||
while (child.NextSiblingContentId > 0)
|
||||
{
|
||||
if (child.NextSiblingContentId == content.Id)
|
||||
{
|
||||
content.PreviousSiblingContentId = child.Id;
|
||||
child = content;
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// get next child
|
||||
var nextChildLink = GetRequiredLinkedNode(child.NextSiblingContentId, "next child", null);
|
||||
var nextChild = nextChildLink.Value;
|
||||
|
||||
Reference in New Issue
Block a user