mirror of https://github.com/jellyfin/jellyfin.git
JsonSerializer deserialize from bytes where possible
This is faster and uses way less memory ``` BenchmarkDotNet=v0.12.1, OS=fedora 32 Intel Core i7-6700HQ CPU 2.60GHz (Skylake), 1 CPU, 8 logical and 4 physical cores .NET Core SDK=5.0.100 [Host] : .NET Core 5.0.0 (CoreCLR 5.0.20.51904, CoreFX 5.0.20.51904), X64 RyuJIT DefaultJob : .NET Core 5.0.0 (CoreCLR 5.0.20.51904, CoreFX 5.0.20.51904), X64 RyuJIT | Method | Mean | Error | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated | |------- |---------:|--------:|--------:|--------:|------:|------:|----------:| | Bytes | 158.4 us | 2.56 us | 2.14 us | 16.8457 | - | - | 52.08 KB | | String | 172.8 us | 0.78 us | 0.70 us | 41.5039 | - | - | 127.82 KB | | Custom | 155.5 us | 2.95 us | 2.76 us | 10.0098 | - | - | 31.27 KB | ```
This commit is contained in:
parent
aaf889f683
commit
1ea2b200c0
|
@ -336,19 +336,19 @@ namespace Emby.Server.Implementations.Channels
|
||||||
return GetChannel(GetInternalChannelId(channel.Name)) ?? GetChannel(channel, CancellationToken.None).Result;
|
return GetChannel(GetInternalChannelId(channel.Name)) ?? GetChannel(channel, CancellationToken.None).Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<MediaSourceInfo> GetSavedMediaSources(BaseItem item)
|
private MediaSourceInfo[] GetSavedMediaSources(BaseItem item)
|
||||||
{
|
{
|
||||||
var path = Path.Combine(item.GetInternalMetadataPath(), "channelmediasourceinfos.json");
|
var path = Path.Combine(item.GetInternalMetadataPath(), "channelmediasourceinfos.json");
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var jsonString = File.ReadAllText(path, Encoding.UTF8);
|
var bytes = File.ReadAllBytes(path);
|
||||||
return JsonSerializer.Deserialize<List<MediaSourceInfo>>(jsonString, _jsonOptions)
|
return JsonSerializer.Deserialize<MediaSourceInfo[]>(bytes, _jsonOptions)
|
||||||
?? new List<MediaSourceInfo>();
|
?? Array.Empty<MediaSourceInfo>();
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
return new List<MediaSourceInfo>();
|
return Array.Empty<MediaSourceInfo>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,11 +47,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var jsonString = File.ReadAllText(_dataPath, Encoding.UTF8);
|
var bytes = File.ReadAllBytes(_dataPath);
|
||||||
_items = JsonSerializer.Deserialize<T[]>(jsonString, _jsonOptions);
|
_items = JsonSerializer.Deserialize<T[]>(bytes, _jsonOptions);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (JsonException ex)
|
||||||
{
|
{
|
||||||
Logger.LogError(ex, "Error deserializing {Path}", _dataPath);
|
Logger.LogError(ex, "Error deserializing {Path}", _dataPath);
|
||||||
}
|
}
|
||||||
|
|
|
@ -514,12 +514,10 @@ namespace Emby.Server.Implementations.Plugins
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var data = File.ReadAllText(metafile, Encoding.UTF8);
|
var data = File.ReadAllBytes(metafile);
|
||||||
manifest = JsonSerializer.Deserialize<PluginManifest>(data, _jsonOptions);
|
manifest = JsonSerializer.Deserialize<PluginManifest>(data, _jsonOptions);
|
||||||
}
|
}
|
||||||
#pragma warning disable CA1031 // Do not catch general exception types
|
catch (JsonException ex)
|
||||||
catch (Exception ex)
|
|
||||||
#pragma warning restore CA1031 // Do not catch general exception types
|
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Error deserializing {Path}.", dir);
|
_logger.LogError(ex, "Error deserializing {Path}.", dir);
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,21 +143,21 @@ namespace Emby.Server.Implementations.ScheduledTasks
|
||||||
{
|
{
|
||||||
if (File.Exists(path))
|
if (File.Exists(path))
|
||||||
{
|
{
|
||||||
try
|
var bytes = File.ReadAllBytes(path);
|
||||||
|
if (bytes.Length > 0)
|
||||||
{
|
{
|
||||||
var jsonString = File.ReadAllText(path, Encoding.UTF8);
|
try
|
||||||
if (!string.IsNullOrWhiteSpace(jsonString))
|
|
||||||
{
|
{
|
||||||
_lastExecutionResult = JsonSerializer.Deserialize<TaskResult>(jsonString, _jsonOptions);
|
_lastExecutionResult = JsonSerializer.Deserialize<TaskResult>(bytes, _jsonOptions);
|
||||||
}
|
}
|
||||||
else
|
catch (JsonException ex)
|
||||||
{
|
{
|
||||||
_logger.LogDebug("Scheduled Task history file {Path} is empty. Skipping deserialization.", path);
|
_logger.LogError(ex, "Error deserializing {File}", path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
else
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Error deserializing {File}", path);
|
_logger.LogDebug("Scheduled Task history file {Path} is empty. Skipping deserialization.", path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -541,8 +541,8 @@ namespace Emby.Server.Implementations.ScheduledTasks
|
||||||
TaskTriggerInfo[] list = null;
|
TaskTriggerInfo[] list = null;
|
||||||
if (File.Exists(path))
|
if (File.Exists(path))
|
||||||
{
|
{
|
||||||
var jsonString = File.ReadAllText(path, Encoding.UTF8);
|
var bytes = File.ReadAllBytes(path);
|
||||||
list = JsonSerializer.Deserialize<TaskTriggerInfo[]>(jsonString, _jsonOptions);
|
list = JsonSerializer.Deserialize<TaskTriggerInfo[]>(bytes, _jsonOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return defaults if file doesn't exist.
|
// Return defaults if file doesn't exist.
|
||||||
|
|
|
@ -90,7 +90,7 @@ namespace Jellyfin.Server.Migrations.Routines
|
||||||
var results = connection.Query("SELECT * FROM userdisplaypreferences");
|
var results = connection.Query("SELECT * FROM userdisplaypreferences");
|
||||||
foreach (var result in results)
|
foreach (var result in results)
|
||||||
{
|
{
|
||||||
var dto = JsonSerializer.Deserialize<DisplayPreferencesDto>(result[3].ToString(), _jsonOptions);
|
var dto = JsonSerializer.Deserialize<DisplayPreferencesDto>(result[3].ToBlob(), _jsonOptions);
|
||||||
if (dto == null)
|
if (dto == null)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in New Issue