cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

bulk save items when possible

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-23 11:39:48 -04:00
parent 6253578629
commit f546f09c71
6 changed files with 80 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -691,16 +691,10 @@ namespace MediaBrowser.Controller.Entities
}
}
var saveTasks = new List<Task>();
await LibraryManager.CreateItems(newItems, cancellationToken).ConfigureAwait(false);
foreach (var item in newItems)
{
if (saveTasks.Count > 50)
{
await Task.WhenAll(saveTasks).ConfigureAwait(false);
saveTasks.Clear();
}
if (!_children.TryAdd(item.Id, item))
{
Logger.Error("Failed to add {0}", item.Name);
@ -709,12 +703,8 @@ namespace MediaBrowser.Controller.Entities
{
Logger.Debug("** " + item.Name + " Added to library.");
}
saveTasks.Add(LibraryManager.CreateItem(item, CancellationToken.None));
}
await Task.WhenAll(saveTasks).ConfigureAwait(false);
await LibraryManager.SaveChildren(Id, newChildren, CancellationToken.None).ConfigureAwait(false);
//force the indexes to rebuild next time

8
MediaBrowser.Controller/Library/ILibraryManager.cs
View File

@ -184,6 +184,14 @@ namespace MediaBrowser.Controller.Library
/// <returns>Task.</returns>
Task CreateItem(BaseItem item, CancellationToken cancellationToken);
/// <summary>
/// Creates the items.
/// </summary>
/// <param name="items">The items.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task CreateItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken);
/// <summary>
/// Updates the item.
/// </summary>

8
MediaBrowser.Controller/Persistence/IItemRepository.cs
View File

@ -64,5 +64,13 @@ namespace MediaBrowser.Controller.Persistence
/// <param name="criticReviews">The critic reviews.</param>
/// <returns>Task.</returns>
Task SaveCriticReviews(Guid itemId, IEnumerable<ItemReview> criticReviews);
/// <summary>
/// Saves the items.
/// </summary>
/// <param name="items">The items.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task SaveItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken);
}
}

50
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -1036,21 +1036,40 @@ namespace MediaBrowser.Server.Implementations.Library
/// <param name="item">The item.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
public async Task CreateItem(BaseItem item, CancellationToken cancellationToken)
public Task CreateItem(BaseItem item, CancellationToken cancellationToken)
{
await SaveItem(item, cancellationToken).ConfigureAwait(false);
return CreateItems(new[] { item }, cancellationToken);
}
UpdateItemInLibraryCache(item);
/// <summary>
/// Creates the items.
/// </summary>
/// <param name="items">The items.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
public async Task CreateItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken)
{
var list = items.ToList();
await ItemRepository.SaveItems(list, cancellationToken).ConfigureAwait(false);
foreach (var item in list)
{
UpdateItemInLibraryCache(item);
}
if (ItemAdded != null)
{
try
foreach (var item in list)
{
ItemAdded(this, new ItemChangeEventArgs { Item = item });
}
catch (Exception ex)
{
_logger.ErrorException("Error in ItemUpdated event handler", ex);
try
{
ItemAdded(this, new ItemChangeEventArgs { Item = item });
}
catch (Exception ex)
{
_logger.ErrorException("Error in ItemUpdated event handler", ex);
}
}
}
}
@ -1063,7 +1082,7 @@ namespace MediaBrowser.Server.Implementations.Library
/// <returns>Task.</returns>
public async Task UpdateItem(BaseItem item, CancellationToken cancellationToken)
{
await SaveItem(item, cancellationToken).ConfigureAwait(false);
await ItemRepository.SaveItem(item, cancellationToken).ConfigureAwait(false);
UpdateItemInLibraryCache(item);
@ -1099,17 +1118,6 @@ namespace MediaBrowser.Server.Implementations.Library
}
}
/// <summary>
/// Saves the item.
/// </summary>
/// <param name="item">The item.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
private Task SaveItem(BaseItem item, CancellationToken cancellationToken)
{
return ItemRepository.SaveItem(item, cancellationToken);
}
/// <summary>
/// Retrieves the item.
/// </summary>

44
MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs
View File

@ -135,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
/// <summary>
/// The _write lock
/// </summary>
private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1,1);
private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1);
/// <summary>
/// Prepares the statements.
@ -172,13 +172,34 @@ namespace MediaBrowser.Server.Implementations.Sqlite
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
/// <exception cref="System.ArgumentNullException">item</exception>
public async Task SaveItem(BaseItem item, CancellationToken cancellationToken)
public Task SaveItem(BaseItem item, CancellationToken cancellationToken)
{
if (item == null)
{
throw new ArgumentNullException("item");
}
return SaveItems(new[] { item }, cancellationToken);
}
/// <summary>
/// Saves the items.
/// </summary>
/// <param name="items">The items.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
/// <exception cref="System.ArgumentNullException">
/// items
/// or
/// cancellationToken
/// </exception>
public async Task SaveItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken)
{
if (items == null)
{
throw new ArgumentNullException("items");
}
if (cancellationToken == null)
{
throw new ArgumentNullException("cancellationToken");
@ -186,8 +207,6 @@ namespace MediaBrowser.Server.Implementations.Sqlite
cancellationToken.ThrowIfCancellationRequested();
var serialized = _jsonSerializer.SerializeToBytes(item);
await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
SQLiteTransaction transaction = null;
@ -196,13 +215,18 @@ namespace MediaBrowser.Server.Implementations.Sqlite
{
transaction = Connection.BeginTransaction();
_saveItemCommand.Parameters[0].Value = item.Id;
_saveItemCommand.Parameters[1].Value = item.GetType().FullName;
_saveItemCommand.Parameters[2].Value = serialized;
foreach (var item in items)
{
cancellationToken.ThrowIfCancellationRequested();
_saveItemCommand.Parameters[0].Value = item.Id;
_saveItemCommand.Parameters[1].Value = item.GetType().FullName;
_saveItemCommand.Parameters[2].Value = _jsonSerializer.SerializeToBytes(item);
_saveItemCommand.Transaction = transaction;
_saveItemCommand.Transaction = transaction;
await _saveItemCommand.ExecuteNonQueryAsync(cancellationToken);
await _saveItemCommand.ExecuteNonQueryAsync(cancellationToken);
}
transaction.Commit();
}
@ -400,7 +424,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
foreach (var child in children)
{
_saveChildrenCommand.Transaction = transaction;
_saveChildrenCommand.Parameters[0].Value = id;
_saveChildrenCommand.Parameters[1].Value = child.Id;

2
MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs
View File

@ -1,11 +1,9 @@
using MediaBrowser.Model.Logging;
using System;
using System.Collections.Concurrent;
using System.Data;
using System.Data.Common;
using System.Data.SQLite;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.Sqlite