Merge commit '94d525d88f713b36419f28bfda4d82ee68637d83' into v9/dev

# Conflicts: # build/NuSpecs/UmbracoCms.Web.nuspec # src/Umbraco.Core/Composing/Current.cs # src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs # src/Umbraco.Core/Runtime/CoreRuntime.cs # src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs # src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs # src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs # src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs # src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs # src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataModel.cs # src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializationResult.cs # src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializerEntityType.cs # src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs # src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs # src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs # src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializer.cs # src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializerFactory.cs # src/Umbraco.PublishedCache.NuCache/DataSource/IDictionaryOfPropertyDataSerializer.cs # src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializer.cs # src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializerFactory.cs # src/Umbraco.PublishedCache.NuCache/DataSource/LazyCompressedString.cs # src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializer.cs # src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializerFactory.cs # src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs # src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComponent.cs # src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComposer.cs # src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs # src/Umbraco.Tests/App.config # src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs # src/Umbraco.Tests/PublishedContent/NuCacheTests.cs # src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml # src/Umbraco.Web.UI/web.Template.Debug.config # src/Umbraco.Web.UI/web.Template.config # src/Umbraco.Web/Composing/ModuleInjector.cs # src/Umbraco.Web/Editors/NuCacheStatusController.cs # src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs # src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs # src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs # src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs # src/Umbraco.Web/Runtime/WebRuntime.cs
2021-06-24 09:43:57 -06:00
parent 4c89d036ac
commit 72671dbca8
139 changed files with 5650 additions and 1593 deletions
--- a/src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializer.cs
+++ b/src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializer.cs
@@ -0,0 +1,91 @@
+using Newtonsoft.Json;
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Infrastructure.Serialization;
+
+namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource
+{
+
+    public class JsonContentNestedDataSerializer : IContentCacheDataSerializer
+    {
+        // by default JsonConvert will deserialize our numeric values as Int64
+        // which is bad, because they were Int32 in the database - take care
+        private readonly JsonSerializerSettings _jsonSerializerSettings = new JsonSerializerSettings
+        {
+            Converters = new List<JsonConverter> { new ForceInt32Converter() },
+
+            // Explicitly specify date handling so that it's consistent and follows the same date handling as MessagePack
+            DateParseHandling = DateParseHandling.DateTime,
+            DateFormatHandling = DateFormatHandling.IsoDateFormat,
+            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+            DateFormatString = "o"
+        };
+        private readonly JsonNameTable _propertyNameTable = new DefaultJsonNameTable();
+        public ContentCacheDataModel Deserialize(IReadOnlyContentBase content, string stringData, byte[] byteData)
+        {
+            if (stringData == null && byteData != null)
+                throw new NotSupportedException($"{typeof(JsonContentNestedDataSerializer)} does not support byte[] serialization");
+
+            JsonSerializer serializer = JsonSerializer.Create(_jsonSerializerSettings);
+            using (JsonTextReader reader = new JsonTextReader(new StringReader(stringData)))
+            {
+                // reader will get buffer from array pool
+                reader.ArrayPool = JsonArrayPool.Instance;
+                reader.PropertyNameTable = _propertyNameTable;
+                return serializer.Deserialize<ContentCacheDataModel>(reader);
+            }
+        }
+
+        public ContentCacheDataSerializationResult Serialize(IReadOnlyContentBase content, ContentCacheDataModel model)
+        {
+            // note that numeric values (which are Int32) are serialized without their
+            // type (eg "value":1234) and JsonConvert by default deserializes them as Int64
+
+            var json = JsonConvert.SerializeObject(model);
+            return new ContentCacheDataSerializationResult(json, null);
+        }
+    }
+    public class JsonArrayPool : IArrayPool<char>
+    {
+        public static readonly JsonArrayPool Instance = new JsonArrayPool();
+
+        public char[] Rent(int minimumLength)
+        {
+            // get char array from System.Buffers shared pool
+            return ArrayPool<char>.Shared.Rent(minimumLength);
+        }
+
+        public void Return(char[] array)
+        {
+            // return char array to System.Buffers shared pool
+            ArrayPool<char>.Shared.Return(array);
+        }
+    }
+    public class AutomaticJsonNameTable : DefaultJsonNameTable
+    {
+        int nAutoAdded = 0;
+        int maxToAutoAdd;
+
+        public AutomaticJsonNameTable(int maxToAdd)
+        {
+            this.maxToAutoAdd = maxToAdd;
+        }
+
+        public override string Get(char[] key, int start, int length)
+        {
+            var s = base.Get(key, start, length);
+
+            if (s == null && nAutoAdded < maxToAutoAdd)
+            {
+                s = new string(key, start, length);
+                Add(s);
+                nAutoAdded++;
+            }
+
+            return s;
+        }
+    }
+}