From f546f09c71d34c5cefb64b47837594f50abcc92a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 23 May 2013 11:39:48 -0400 Subject: bulk save items when possible --- .../Library/LibraryManager.cs | 50 +++++++++++++--------- .../Sqlite/SQLiteItemRepository.cs | 44 ++++++++++++++----- .../Sqlite/SQLiteRepository.cs | 2 - 3 files changed, 63 insertions(+), 33 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 72cf42c14..fbf2dfc70 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -1036,21 +1036,40 @@ namespace MediaBrowser.Server.Implementations.Library /// The item. /// The cancellation token. /// Task. - 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); + /// + /// Creates the items. + /// + /// The items. + /// The cancellation token. + /// Task. + public async Task CreateItems(IEnumerable 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 - { - ItemAdded(this, new ItemChangeEventArgs { Item = item }); - } - catch (Exception ex) + foreach (var item in list) { - _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 /// Task. 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 } } - /// - /// Saves the item. - /// - /// The item. - /// The cancellation token. - /// Task. - private Task SaveItem(BaseItem item, CancellationToken cancellationToken) - { - return ItemRepository.SaveItem(item, cancellationToken); - } - /// /// Retrieves the item. /// diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs index 23ab10499..0ca4dda77 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs @@ -135,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// /// The _write lock /// - private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1,1); + private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1); /// /// Prepares the statements. @@ -172,13 +172,34 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// The cancellation token. /// Task. /// item - 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); + } + + /// + /// Saves the items. + /// + /// The items. + /// The cancellation token. + /// Task. + /// + /// items + /// or + /// cancellationToken + /// + public async Task SaveItems(IEnumerable 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; diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs index bd60c834f..ee2fcc10c 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs @@ -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 -- cgit v1.2.3