gper/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'v7/dev' into v7/7.15

Browse Source
This commit is contained in:
Sebastiaan Janssen
2020-05-04 12:02:14 +02:00
parent 2f228a6bb2 5efb938785
commit b46b75e920
5 changed files with 67 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
+22 -37
View File
@@ -72,21 +72,16 @@ namespace Umbraco.Core.Cache
/// <returns></returns>
public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
{
return GetCacheItem(cacheKey, getCacheItem, null, dependentFiles: null);
return GetCacheItemInternal(cacheKey, getCacheItem, null);
}
/// <summary>
/// This overload is here for legacy purposes
/// </summary>
/// <param name="cacheKey"></param>
/// <param name="getCacheItem"></param>
/// <param name="timeout"></param>
/// <param name="isSliding"></param>
/// <param name="priority"></param>
/// <param name="removedCallback"></param>
/// <param name="dependency"></param>
/// <returns></returns>
[Obsolete("This is here for legacy reasons only, do not use this method, it has memory leaks")]
internal object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
{
return GetCacheItemInternal(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, () => dependency);
}
private object GetCacheItemInternal(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
{
cacheKey = GetCacheKey(cacheKey);
@@ -141,7 +136,7 @@ namespace Umbraco.Core.Cache
lck.UpgradeToWriteLock();
//NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
_cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
_cache.Insert(cacheKey, result, dependency?.Invoke(), absolute, sliding, priority, removedCallback);
}
}
@@ -160,29 +155,22 @@ namespace Umbraco.Core.Cache
public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
{
CacheDependency dependency = null;
if (dependentFiles != null && dependentFiles.Any())
{
dependency = new CacheDependency(dependentFiles);
}
return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
return GetCacheItemInternal(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback,
// Don't create a CacheDependency object unless we need it, see https://github.com/umbraco/Umbraco-CMS/issues/7773
() => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
}
#endregion
#region Insert
/// <summary>
/// This overload is here for legacy purposes
/// </summary>
/// <param name="cacheKey"></param>
/// <param name="getCacheItem"></param>
/// <param name="timeout"></param>
/// <param name="isSliding"></param>
/// <param name="priority"></param>
/// <param name="removedCallback"></param>
/// <param name="dependency"></param>
[Obsolete("This is here for legacy reasons only, do not use this method, it has memory leaks")]
internal void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
{
InsertCacheItemInternal(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, () => dependency);
}
private void InsertCacheItemInternal(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
{
// NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
// and make sure we don't store a null value.
@@ -199,20 +187,17 @@ namespace Umbraco.Core.Cache
using (new WriteLock(_locker))
{
//NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
_cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
_cache.Insert(cacheKey, result, dependency?.Invoke(), absolute, sliding, priority, removedCallback);
}
}
public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
{
CacheDependency dependency = null;
if (dependentFiles != null && dependentFiles.Any())
{
dependency = new CacheDependency(dependentFiles);
}
InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
InsertCacheItemInternal(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback,
// Don't create a CacheDependency object unless we need it, see https://github.com/umbraco/Umbraco-CMS/issues/7773
() => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
}
#endregion
}
}
}
src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+44 -23
View File
@@ -837,6 +837,8 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
public XmlDocument BuildPreviewXmlCache()
{
var xmlDoc = new XmlDocument();
var doctype = xmlDoc.CreateDocumentType("root", null, null,
ApplicationContext.Current.Services.ContentTypeService.GetContentTypesDtd());
@@ -851,42 +853,61 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
var sql = string.Format(@"select umbracoNode.id, umbracoNode.parentID, umbracoNode.sortOrder, cmsPreviewXml.{0}, umbracoNode.{1} from umbracoNode
inner join cmsPreviewXml on cmsPreviewXml.nodeId = umbracoNode.id and umbracoNode.nodeObjectType = @type
inner join cmsDocument on cmsPreviewXml.versionId = cmsDocument.versionId and cmsDocument.newest=1
where umbracoNode.trashed = 0
order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
where (umbracoNode.trashed = 0)
order by (umbracoNode.{2}), (umbracoNode.parentID), (umbracoNode.sortOrder)",
SqlSyntax.GetQuotedColumnName("xml"),
SqlSyntax.GetQuotedColumnName("level"),
SqlSyntax.GetQuotedColumnName("level"));
var args = new object[] { new { type = NodeObjectTypeId } };
XmlElement last = null;
//NOTE: Query creates a reader - does not load all into memory
foreach (var row in Database.Query<dynamic>(sql, new { type = NodeObjectTypeId }))
const long pageSize = 500;
int? itemCount = null;
long pageIndex = 0;
do
{
string parentId = ((int)row.parentID).ToInvariantString();
string xml = row.xml;
int sortOrder = row.sortOrder;
//if the parentid is changing
if (last != null && last.GetAttribute("parentID") != parentId)
// Get the paged queries
Database.BuildPageQueries<dynamic>(pageIndex * pageSize, pageSize, sql, ref args, out var sqlCount, out var sqlPage);
// get the item count once
if (itemCount == null)
{
parent = xmlDoc.GetElementById(parentId);
if (parent == null)
itemCount = Database.ExecuteScalar<int>(sqlCount, args);
}
pageIndex++;
// iterate over rows without allocating all items to memory (Query vs Fetch)
foreach (var row in Database.Query<dynamic>(sqlPage, args))
{
string parentId = ((int)row.parentID).ToInvariantString();
string xml = row.xml;
int sortOrder = row.sortOrder;
//if the parentid is changing
if (last != null && last.GetAttribute("parentID") != parentId)
{
//Need to short circuit here, if the parent is not there it means that the parent is unpublished
// and therefore the child is not published either so cannot be included in the xml cache
continue;
parent = xmlDoc.GetElementById(parentId);
if (parent == null)
{
//Need to short circuit here, if the parent is not there it means that the parent is unpublished
// and therefore the child is not published either so cannot be included in the xml cache
continue;
}
}
var xmlDocFragment = xmlDoc.CreateDocumentFragment();
xmlDocFragment.InnerXml = xml;
last = (XmlElement)parent.AppendChild(xmlDocFragment);
// fix sortOrder - see notes in UpdateSortOrder
last.Attributes["sortOrder"].Value = sortOrder.ToInvariantString();
}
var xmlDocFragment = xmlDoc.CreateDocumentFragment();
xmlDocFragment.InnerXml = xml;
last = (XmlElement)parent.AppendChild(xmlDocFragment);
// fix sortOrder - see notes in UpdateSortOrder
last.Attributes["sortOrder"].Value = sortOrder.ToInvariantString();
}
} while ((pageIndex * pageSize) < itemCount);
return xmlDoc;
}
src/Umbraco.Web.UI.Client/bower.json
+1 -1
View File
@@ -25,7 +25,7 @@
"jquery-migrate": "1.4.0",
"angular-dynamic-locale": "0.1.28",
"ng-file-upload": "~7.3.8",
"tinymce": "~4.9.4",
"tinymce": "~4.9.9",
"codemirror": "~5.3.0",
"angular-local-storage": "~0.2.3",
"moment": "~2.10.3",
src/umbraco.businesslogic/CacheHelper.cs
-31
View File
@@ -1,31 +0,0 @@
//using System;
//using System.Web.Caching;
//namespace umbraco.BusinessLogic
//{
// internal class CacheHelper
// {
// public delegate TT GetCacheItemDelegate<TT>();
// public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
// CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
// CacheDependency cacheDependency, TimeSpan timeout, GetCacheItemDelegate<TT> getCacheItem)
// {
// object result = System.Web.HttpRuntime.Cache.Get(cacheKey);
// if (result == null)
// {
// lock (syncLock)
// {
// result = System.Web.HttpRuntime.Cache.Get(cacheKey);
// if (result == null)
// {
// result = getCacheItem();
// System.Web.HttpRuntime.Cache.Add(cacheKey, result, cacheDependency,
// DateTime.Now.Add(timeout), TimeSpan.Zero, priority, refreshAction);
// }
// }
// }
// return (TT)result;
// }
// }
//}
src/umbraco.businesslogic/umbraco.businesslogic.csproj
-1
View File
@@ -203,7 +203,6 @@
<Compile Include="BasePages\UmbracoEnsuredPage.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CacheHelper.cs" />
<Compile Include="Exceptions\FileSecurityException.cs" />
<Compile Include="Exceptions\UserAuthorizationException.cs" />
<Compile Include="GlobalSettings.cs">