Made database optimization faster using pragma analysis_limit

src/libs/services/database/impl/Db.cpp

@@ -33,33 +33,25 @@ Db::Db(const std::filesystem::path& dbPath, std::size_t connectionCount)
     {
         LMS_LOG(DB, INFO) << "Creating connection pool on file " << dbPath.string();
 
-	std::unique_ptr<Wt::Dbo::backend::Sqlite3> connection {std::make_unique<Wt::Dbo::backend::Sqlite3>(dbPath.string())};
+        auto connection{ std::make_unique<Wt::Dbo::backend::Sqlite3>(dbPath.string()) };
         //	connection->setProperty("show-queries", "true");
         connection->executeSql("pragma journal_mode=WAL");
         connection->executeSql("pragma synchronous=normal");
+        connection->executeSql("pragma analysis_limit=1000"); // to help make analyze command faster
 
-	auto connectionPool = std::make_unique<Wt::Dbo::FixedSqlConnectionPool>(std::move(connection), connectionCount);
+        auto connectionPool{ std::make_unique<Wt::Dbo::FixedSqlConnectionPool>(std::move(connection), connectionCount) };
-	connectionPool->setTimeout(std::chrono::seconds(10));
+        connectionPool->setTimeout(std::chrono::seconds{ 10 });
 
         _connectionPool = std::move(connectionPool);
     }
 
-Db::~Db()
+    void Db::executeSql(const std::string& sql)
-{
-	LMS_LOG(DB, DEBUG) << "Optimizing db...";
-	executeSql("pragma optimize");
-	LMS_LOG(DB, DEBUG) << "Optimizing db DONE";
-}
-
-void
-Db::executeSql(const std::string& sql)
     {
         ScopedConnection connection{ *_connectionPool };
         connection->executeSql(sql);
     }
 
-Session&
+    Session& Db::getTLSSession()
-Db::getTLSSession()
     {
         static thread_local Session* tlsSession{};
 

src/libs/services/database/impl/Migration.cpp

@@ -654,7 +654,6 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
             {41, migrateFromV41},
         };
 
-        while (1)
         {
             auto uniqueTransaction{ session.createUniqueTransaction() };
 
@@ -670,19 +669,14 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
                 throw LmsException{ outdatedMsg };
             }
 
-            if (version == LMS_DATABASE_VERSION)
+            if (version > LMS_DATABASE_VERSION)
-            {
-                LMS_LOG(DB, INFO) << "Lms database version " << LMS_DATABASE_VERSION << ": up to date!";
-                return;
-            }
-            else if (version > LMS_DATABASE_VERSION)
-            {
                 throw LmsException{ "Server binary outdated, please upgrade it to handle this database" };
-            }
 
             if (version < migrationFunctions.begin()->first)
                 throw LmsException{ outdatedMsg };
 
+            while (version < LMS_DATABASE_VERSION)
+            {
                 LMS_LOG(DB, INFO) << "Migrating database from version " << version << " to " << version + 1 << "...";
 
                 auto itMigrationFunc{ migrationFunctions.find(version) };
@@ -695,3 +689,4 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
             }
         }
     }
+}

src/libs/services/database/impl/Session.cpp

@@ -83,43 +83,44 @@ SharedTransaction::SharedTransaction(RecursiveSharedMutex& mutex, Wt::Dbo::Sessi
     {
     }
 
-void
+    void Session::checkUniqueLocked()
-Session::checkUniqueLocked()
     {
         assert(_db.getMutex().isUniqueLocked());
     }
 
-void
+    void Session::checkSharedLocked()
-Session::checkSharedLocked()
     {
         assert(_db.getMutex().isSharedLocked());
     }
 
-UniqueTransaction
+    UniqueTransaction Session::createUniqueTransaction()
-Session::createUniqueTransaction()
     {
         return UniqueTransaction{ _db.getMutex(), _session };
     }
 
-SharedTransaction
+    SharedTransaction Session::createSharedTransaction()
-Session::createSharedTransaction()
     {
         return SharedTransaction{ _db.getMutex(), _session };
     }
 
-void
+    void Session::prepareTables()
-Session::prepareTables()
     {
-	// Creation case
+        LMS_LOG(DB, INFO) << "Preparing tables...";
+
+        // Initial creation case
         try
         {
             _session.createTables();
-
             LMS_LOG(DB, INFO) << "Tables created";
         }
         catch (Wt::Dbo::Exception& e)
+        {
+            LMS_LOG(DB, DEBUG) << "Cannot create tables: " << e.what();
+            if (std::string_view{ e.what() }.find("already exists") == std::string_view::npos)
             {
                 LMS_LOG(DB, ERROR) << "Cannot create tables: " << e.what();
+                throw e;
+            }
         }
 
         Migration::doDbMigration(*this);
@@ -176,15 +177,14 @@ Session::prepareTables()
         }
     }
 
-void
+    void Session::analyze()
-Session::optimize()
     {
-	LMS_LOG(DB, DEBUG) << "Optimizing db...";
+        LMS_LOG(DB, INFO) << "Analyzing database...";
         {
             auto uniqueTransaction{ createUniqueTransaction() };
             _session.execute("ANALYZE");
         }
-	LMS_LOG(DB, DEBUG) << "Optimized db!";
+        LMS_LOG(DB, INFO) << "Database Analyze complete";
     }
 
 } // namespace Database

src/libs/services/database/include/services/database/Db.hpp

@@ -32,18 +32,15 @@ class Db
     {
     public:
         Db(const std::filesystem::path& dbPath, std::size_t connectionCount = 10);
-		~Db();
-
-		Db(const Db&) = delete;
-		Db(Db&&) = delete;
-		Db& operator=(const Db&) = delete;
-		Db& operator=(Db&&) = delete;
 
         Session& getTLSSession();
 
         void executeSql(const std::string& sql);
 
     private:
+        Db(const Db&) = delete;
+        Db& operator=(const Db&) = delete;
+
         friend class Session;
 
         RecursiveSharedMutex& getMutex() { return _sharedMutex; }
@@ -55,14 +52,12 @@ class Db
             ScopedConnection(Wt::Dbo::SqlConnectionPool& pool);
             ~ScopedConnection();
 
-				ScopedConnection(const ScopedConnection& ) = delete;
-				ScopedConnection(ScopedConnection&& ) = delete;
-				ScopedConnection& operator=(const ScopedConnection& ) = delete;
-				ScopedConnection& operator=(ScopedConnection&& ) = delete;
-
             Wt::Dbo::SqlConnection* operator->() const;
 
         private:
+            ScopedConnection(const ScopedConnection&) = delete;
+            ScopedConnection& operator=(const ScopedConnection&) = delete;
+
             Wt::Dbo::SqlConnectionPool& _connectionPool;
             std::unique_ptr<Wt::Dbo::SqlConnection> _connection;
         };

src/libs/services/database/include/services/database/Session.hpp

@@ -53,11 +53,7 @@ namespace Database
     {
     public:
         Session(Db& database);
-
+        ~Session();
-			Session(const Session&) = delete;
-			Session(Session&&) = delete;
-			Session& operator=(const Session&) = delete;
-			Session& operator=(Session&&) = delete;
 
         [[nodiscard]] UniqueTransaction createUniqueTransaction();
         [[nodiscard]] SharedTransaction createSharedTransaction();
@@ -65,7 +61,7 @@ namespace Database
         void checkUniqueLocked();
         void checkSharedLocked();
 
-			void optimize();
+        void analyze();
 
         void prepareTables(); // need to run only once at startup
 
@@ -87,6 +83,9 @@ namespace Database
         }
 
     private:
+        Session(const Session&) = delete;
+        Session& operator=(const Session&) = delete;
+
         Db& _db;
         Wt::Dbo::Session	_session;
     };

src/libs/services/database/test/Common.cpp

@@ -60,7 +60,7 @@ DatabaseFixture::SetUpTestCase()
 	{
 		Database::Session s {_tmpDb->getDb()};
 		s.prepareTables();
-		s.optimize();
+		s.analyze();
 
 		// remove default created entries
 		{

src/libs/services/scanner/impl/ScannerService.cpp

@@ -299,8 +299,7 @@ ScannerService::scan(bool forceScan)
 
 	LMS_LOG(DBUPDATER, INFO) << "Scan " << (_abortScan ? "aborted" : "complete") << ". Changes = " << stats.nbChanges() << " (added = " << stats.additions << ", removed = " << stats.deletions << ", updated = " << stats.updates << "), Not changed = " << stats.skips << ", Scanned = " << stats.scans << " (errors = " << stats.errors.size() << "), features fetched = " << stats.featuresFetched << ",  duplicates = " << stats.duplicates.size();
 
-	// TODO make it a scan step
+	_dbSession.analyze();
-	_dbSession.optimize();
 
 	if (!_abortScan)
 	{

src/lms/main.cpp

@@ -238,7 +238,10 @@ int main(int argc, char* argv[])
 		{
 			Database::Session session {database};
 			session.prepareTables();
-			session.optimize();
+
+			 // force optimize in case scanner aborted during a large import:
+			 // queries may be too slow to even be able to relaunch a scan sing the web interface
+			session.analyze();
 		}
 
 		UserInterface::LmsApplicationManager appManager;