New: Main DB is compressed on app start

src/NzbDrone.Api/System/SystemModule.cs

@@ -4,6 +4,7 @@
 using NzbDrone.Api.Extensions;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Api.System
 {
@@ -13,14 +14,16 @@ public class SystemModule : NzbDroneApiModule
         private readonly IRuntimeInfo _runtimeInfo;
         private readonly IRouteCacheProvider _routeCacheProvider;
         private readonly IConfigFileProvider _configFileProvider;
+        private readonly IDatabase _database;
 
-        public SystemModule(IAppFolderInfo appFolderInfo, IRuntimeInfo runtimeInfo, IRouteCacheProvider routeCacheProvider, IConfigFileProvider configFileProvider)
+        public SystemModule(IAppFolderInfo appFolderInfo, IRuntimeInfo runtimeInfo, IRouteCacheProvider routeCacheProvider, IConfigFileProvider configFileProvider, IDatabase database)
             : base("system")
         {
             _appFolderInfo = appFolderInfo;
             _runtimeInfo = runtimeInfo;
             _routeCacheProvider = routeCacheProvider;
             _configFileProvider = configFileProvider;
+            _database = database;
             Get["/status"] = x => GetStatus();
             Get["/routes"] = x => GetRoutes();
         }
@@ -44,6 +47,7 @@ private Response GetStatus()
                     Branch = _configFileProvider.Branch,
                     Authentication = _configFileProvider.AuthenticationEnabled,
                     StartOfWeek = (int)OsInfo.FirstDayOfWeek,
+                    SqliteVersion = _database.Version,
                     UrlBase = _configFileProvider.UrlBase
                 }.AsResponse();
 

src/NzbDrone.Core.Test/Datastore/DatabaseFixture.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Linq;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.Datastore
+{
+    public class DatabaseFixture : DbTest
+    {
+        [Test]
+        public void SingleOrDefault_should_return_null_on_empty_db()
+        {
+            Mocker.Resolve<IDatabase>()
+                .GetDataMapper().Query<Series>()
+                .SingleOrDefault(c => c.CleanTitle == "SomeTitle")
+                .Should()
+                .BeNull();
+        }
+
+
+        [Test]
+        public void vaccume()
+        {
+            Mocker.Resolve<IDatabase>().Vacuum();
+        }
+
+        [Test]
+        public void get_version()
+        {
+            Mocker.Resolve<IDatabase>().Version.Should().BeGreaterThan(new Version("3.0.0"));
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs

@@ -7,24 +7,9 @@
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.Datastore
 {
-
-    public class DatabaseFixture : DbTest
-    {
-        [Test]
-        public void SingleOrDefault_should_return_null_on_empty_db()
-        {
-            Mocker.Resolve<IDatabase>()
-                  .GetDataMapper().Query<Series>()
-                  .SingleOrDefault(c => c.CleanTitle == "SomeTitle")
-                  .Should()
-                  .BeNull();
-        }
-    }
-
     [TestFixture]
     public class ObjectDatabaseFixture : DbTest<BasicRepository<ScheduledTask>, ScheduledTask>
     {

src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -106,6 +106,7 @@
     <Compile Include="DataAugmentationFixture\Scene\SceneMappingServiceFixture.cs" />
     <Compile Include="Datastore\BasicRepositoryFixture.cs" />
     <Compile Include="Datastore\Converters\ProviderSettingConverterFixture.cs" />
+    <Compile Include="Datastore\DatabaseFixture.cs" />
     <Compile Include="Datastore\DatabaseRelationshipFixture.cs" />
     <Compile Include="Datastore\MappingExtentionFixture.cs" />
     <Compile Include="Datastore\ObjectDatabaseFixture.cs" />

src/NzbDrone.Core/Datastore/BasicRepository.cs

@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Datastore
         void InsertMany(IList<TModel> model);
         void UpdateMany(IList<TModel> model);
         void DeleteMany(List<TModel> model);
-        void Purge();
+        void Purge(bool vacuum = false);
         bool HasItems();
         void DeleteMany(IEnumerable<int> ids);
         void SetFields(TModel model, params Expression<Func<TModel, object>>[] properties);
@@ -216,9 +216,18 @@ public void DeleteMany(IEnumerable<int> ids)
             }
         }
 
-        public void Purge()
+        public void Purge(bool vacuum = false)
         {
             DataMapper.Delete<TModel>(c => c.Id > -1);
+            if (vacuum)
+            {
+                Vacuum();
+            }
+        }
+
+        protected void Vacuum()
+        {
+            _database.Vacuum();
         }
 
         public bool HasItems()
@@ -258,11 +267,6 @@ protected virtual SortBuilder<TModel> GetPagedQuery(QueryBuilder<TModel> query,
                         .Take(pagingSpec.PageSize);
         }
 
-        public void DeleteAll()
-        {
-            DataMapper.Delete<TModel>(c => c.Id > 0);
-        }
-
         protected void ModelCreated(TModel model)
         {
             PublishModelEvent(model, ModelAction.Created);

src/NzbDrone.Core/Datastore/Database.cs

@@ -1,25 +1,58 @@
 using System;
+using System.Data.SQLite;
 using Marr.Data;
+using NLog;
+using NzbDrone.Common.Instrumentation;
 
 namespace NzbDrone.Core.Datastore
 {
     public interface IDatabase
     {
         IDataMapper GetDataMapper();
+        Version Version { get; }
+        void Vacuum();
     }
 
     public class Database : IDatabase
     {
-        private readonly Func<IDataMapper> _dataMapperFactory;
+        private readonly string _connectionString;
 
-        public Database(Func<IDataMapper> dataMapperFactory)
+        private Logger logger = NzbDroneLogger.GetLogger();
+
+        public Database(string connectionString)
         {
-            _dataMapperFactory = dataMapperFactory;
+            _connectionString = connectionString;
         }
 
         public IDataMapper GetDataMapper()
         {
-            return _dataMapperFactory();
+            return new DataMapper(SQLiteFactory.Instance, _connectionString)
+                    {
+                        SqlMode = SqlModes.Text,
+                    };
+        }
+
+        public Version Version
+        {
+            get
+            {
+                var version = GetDataMapper().ExecuteScalar("SELECT sqlite_version()").ToString();
+                return new Version(version);
+            }
+        }
+
+        public void Vacuum()
+        {
+            try
+            {
+                logger.Info("Vacuuming database " + _connectionString);
+                GetDataMapper().ExecuteNonQuery("Vacuum;");
+                logger.Info("Database Compressed " + _connectionString);
+            }
+            catch (Exception e)
+            {
+                logger.Error("An Error occurred while vacuuming database. " + _connectionString, e);
+            }
         }
     }
 }

src/NzbDrone.Core/Datastore/DbFactory.cs

@@ -73,15 +73,11 @@ public IDatabase Create(MigrationType migrationType = MigrationType.Main)
 
             _migrationController.MigrateToLatest(connectionString, migrationType);
 
-            return new Database(() =>
+            var db = new Database(connectionString);
-                {
-                    var dataMapper = new DataMapper(SQLiteFactory.Instance, connectionString)
-                    {
-                        SqlMode = SqlModes.Text,
-                    };
 
-                    return dataMapper;
+            db.Vacuum();
-                });
+
+            return db;
         }
     }
 }