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

U4-8813 - bugfix

Browse Source
This commit is contained in:
Stephan
2016-08-16 14:29:51 +02:00
parent 9dfa9e2fb6
commit 95fb7f97d0
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
View File

@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
using System.Configuration;
using System.IO;
using System.Linq;
using System.Threading;
using System.Xml.XPath;
using Examine;
using Examine.LuceneEngine.SearchCriteria;
@@ -197,18 +198,18 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
{
try
{
//first check in Examine as this is WAY faster
var criteria = searchProvider.CreateSearchCriteria("media");
// first check in Examine as this is WAY faster
//
// the filter will create a query like this:
// +(+__NodeId:3113 -__Path:-1,-21,*) +__IndexType:media
//
// note that since the use of the wildcard, it automatically escapes it in Lucene.
var criteria = searchProvider.CreateSearchCriteria("media");
var filter = criteria.Id(id).Not().Field(UmbracoContentIndexer.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
//the above filter will create a query like this, NOTE: That since the use of the wildcard, it automatically escapes it in Lucene.
//+(+__NodeId:3113 -__Path:-1,-21,*) +__IndexType:media
var results = searchProvider.Search(filter.Compile());
if (results.Any())
{
return ConvertFromSearchResult(results.First());
}
var result = searchProvider.Search(filter.Compile()).FirstOrDefault();
if (result != null) return ConvertFromSearchResult(result);
}
catch (FileNotFoundException ex)
{
@@ -220,17 +221,23 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
}
}
// this is annoying as it can flood the log in case of eg a media picker referencing a media
// that has been deleted, hence is not in the Examine index anymore (for a good reason) - yet
// it can also indicate that the Examine index is corrupted and would need to be rebuilt.
LogHelper.Warn<PublishedMediaCache>(
"Could not retrieve media {0} from Examine index, reverting to looking up media via legacy library.GetMedia method",
() => id);
//var media = global::umbraco.library.GetMedia(id, false);
//return ConvertFromXPathNodeIterator(media, id);
var miss = Interlocked.CompareExchange(ref _examineIndexMiss, 0, 0); // volatile read
if (miss <= ExamineIndexMissMax && Interlocked.Increment(ref _examineIndexMiss) == ExamineIndexMissMax)
LogHelper.Warn<PublishedMediaCache>("bam");
var media = ApplicationContext.Current.Services.MediaService.GetById(id);
return media == null ? null : ConvertFromIMedia(media);
}
private const int ExamineIndexMissMax = 10;
private int _examineIndexMiss;
internal CacheValues ConvertFromXPathNodeIterator(XPathNodeIterator media, int id)
{
if (media != null && media.Current != null)

8
src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
View File

@@ -155,7 +155,7 @@ namespace Umbraco.Web.Routing
var contentCache = GetPublishedCache();
if (contentCache == null) return;
// prepare entities - remove chances of duplicates
// prepare entities
var entities = PrepareEntities(args.PublishedEntities);
foreach (var entity in entities)
@@ -206,8 +206,12 @@ namespace Umbraco.Web.Routing
private static IEnumerable<IContent> PrepareEntities(IEnumerable<IContent> eventEntities)
{
// prepare entities
// - exclude entities without an identity (new entities)
// - exclude duplicates (in case publishing a parent and its children)
var entities = new List<IContent>();
foreach (var e in eventEntities.OrderBy(x => x.Level))
foreach (var e in eventEntities.Where(x => x.HasIdentity).OrderBy(x => x.Level))
{
var pathIds = e.Path.Split(',').Select(int.Parse);
if (entities.Any(x => pathIds.Contains(x.Id))) continue;