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

Merge branch 'v8/feature/more-serialization' of https://github.com/nzdev/Umbraco-CMS into nzdev-v8/feature/more-serialization

Browse Source 
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/LazyCompressedString.cs
This commit is contained in:
Shannon
2021-01-27 15:13:36 +11:00
parent 9200c46cd0 697206188f
commit 0b057d0b3f
2 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs
View File

@@ -48,7 +48,13 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
public ContentCacheDataModel Deserialize(int contentTypeId, string stringData, byte[] byteData)
{
if (stringData != null)
if (byteData != null)
{
var content = MessagePackSerializer.Deserialize<ContentCacheDataModel>(byteData, _options);
Expand(contentTypeId, content);
return content;
}
else if (stringData != null)
{
// NOTE: We don't really support strings but it's possible if manually used (i.e. tests)
var bin = Convert.FromBase64String(stringData);
@@ -56,12 +62,6 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
Expand(contentTypeId, content);
return content;
}
else if (byteData != null)
{
var content = MessagePackSerializer.Deserialize<ContentCacheDataModel>(byteData, _options);
Expand(contentTypeId, content);
return content;
}
else
{
return null;

60
src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
View File

@@ -18,6 +18,12 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
private const char PrefixByte = 'O';
private const char PrefixByteArray = 'A';
private const char PrefixCompressedStringByteArray = 'C';
private const char PrefixSignedByte = 'E';
private const char PrefixBool = 'M';
private const char PrefixGuid = 'G';
private const char PrefixTimeSpan = 'T';
private const char PrefixInt16 = 'Q';
private const char PrefixChar = 'R';
protected string ReadString(Stream stream) => PrimitiveSerializer.String.ReadFrom(stream);
protected int ReadInt(Stream stream) => PrimitiveSerializer.Int32.ReadFrom(stream);
@@ -93,6 +99,18 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
return PrimitiveSerializer.DateTime.ReadFrom(stream);
case PrefixByteArray:
return PrimitiveSerializer.Bytes.ReadFrom(stream);
case PrefixSignedByte:
return PrimitiveSerializer.SByte.ReadFrom(stream);
case PrefixBool:
return PrimitiveSerializer.Boolean.ReadFrom(stream);
case PrefixGuid:
return PrimitiveSerializer.Guid.ReadFrom(stream);
case PrefixTimeSpan:
return PrimitiveSerializer.TimeSpan.ReadFrom(stream);
case PrefixInt16:
return PrimitiveSerializer.Int16.ReadFrom(stream);
case PrefixChar:
return PrimitiveSerializer.Char.ReadFrom(stream);
case PrefixCompressedStringByteArray:
return new LazyCompressedString(PrimitiveSerializer.Bytes.ReadFrom(stream));
default:
@@ -167,8 +185,46 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
}
else if (value is LazyCompressedString lazyCompressedString)
{
PrimitiveSerializer.Char.WriteTo(PrefixCompressedStringByteArray, stream);
PrimitiveSerializer.Bytes.WriteTo(lazyCompressedString.GetBytes(), stream);
if (lazyCompressedString.IsDecompressed)
{
PrimitiveSerializer.Char.WriteTo(PrefixString, stream);
PrimitiveSerializer.String.WriteTo(lazyCompressedString, stream);
}
else
{
PrimitiveSerializer.Char.WriteTo(PrefixCompressedStringByteArray, stream);
PrimitiveSerializer.Bytes.WriteTo(lazyCompressedString.GetBytes(), stream);
}
}
else if (value is sbyte signedByteValue)
{
PrimitiveSerializer.Char.WriteTo(PrefixSignedByte, stream);
PrimitiveSerializer.SByte.WriteTo(signedByteValue, stream);
}
else if (value is bool boolValue)
{
PrimitiveSerializer.Char.WriteTo(PrefixBool, stream);
PrimitiveSerializer.Boolean.WriteTo(boolValue, stream);
}
else if (value is Guid guidValue)
{
PrimitiveSerializer.Char.WriteTo(PrefixGuid, stream);
PrimitiveSerializer.Guid.WriteTo(guidValue, stream);
}
else if (value is TimeSpan timespanValue)
{
PrimitiveSerializer.Char.WriteTo(PrefixTimeSpan, stream);
PrimitiveSerializer.TimeSpan.WriteTo(timespanValue, stream);
}
else if (value is short int16Value)
{
PrimitiveSerializer.Char.WriteTo(PrefixInt16, stream);
PrimitiveSerializer.Int16.WriteTo(int16Value, stream);
}
else if (value is char charValue)
{
PrimitiveSerializer.Char.WriteTo(PrefixChar, stream);
PrimitiveSerializer.Char.WriteTo(charValue, stream);
}
else
throw new NotSupportedException("Value type " + value.GetType().FullName + " cannot be serialized.");