X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdbmaintenancethread.cpp;fp=src%2Fdbmaintenancethread.cpp;h=4d48786418d2c55ec49728d39eb3e4a8963db9e6;hb=9ae3b1434e51788e6feb72e1415ec800d05c535a;hp=0b1349f1c6f20930d019392a49e5fb72fa6a9efd;hpb=ed0732b2550c23c05fc9faf925620e87ee6dee12;p=fms.git

diff --git a/src/dbmaintenancethread.cpp b/src/dbmaintenancethread.cpp
index 0b1349f..4d48786 100644
--- a/src/dbmaintenancethread.cpp
+++ b/src/dbmaintenancethread.cpp
@@ -4,6 +4,8 @@
 #include "../include/threadbuilder.h"
 #include "../include/dbsetup.h"
 
+#include <vector>
+
 #include <Poco/Timestamp.h>
 #include <Poco/Timespan.h>
 #include <Poco/DateTimeFormatter.h>
@@ -21,40 +23,32 @@ DBMaintenanceThread::DBMaintenanceThread()
 	m_last6hour-=Poco::Timespan(0,5,42,0,0);
 	m_last1day=Poco::Timestamp();
 	m_last1day-=Poco::Timespan(0,23,51,0,0);
-
-
-
 }
 
 
 void DBMaintenanceThread::Do10MinuteMaintenance()
 {
+	std::vector<std::pair<long,long> > m_unthreadedmessages;
 	Option option(m_db);
 	std::string ll("");
 	option.Get("LogLevel",ll);
 
-	// TODO - remove after corruption issue fixed
-	if(ll=="8")
-	{
-		std::string dbres=TestDBIntegrity(m_db);
-		m_log->trace("DBMaintenanceThread::Do10MinuteMaintenance() start TestDBIntegrity returned "+dbres);
-	}
-
 	ThreadBuilder tb(m_db);
 	SQLite3DB::Statement boardst=m_db->Prepare("SELECT BoardID FROM tblBoard WHERE Forum='true';");
 	// select messages for a board that aren't in a thread
+	// This query was causing the db to be locked and a journal file created.
+	// build a list of boards and messageids and then use that instead of keeping the query in use
 	SQLite3DB::Statement selectst=m_db->Prepare("SELECT tblMessage.MessageID FROM tblMessage \
-												INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID\
+												INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID \
 												LEFT JOIN tblThreadPost ON tblMessage.MessageID=tblThreadPost.MessageID \
-												LEFT JOIN tblThread ON tblThreadPost.ThreadID=tblThread.ThreadID\
-												WHERE tblMessageBoard.BoardID=? AND tblThread.BoardID IS NULL;");
+												WHERE tblMessageBoard.BoardID=? AND tblThreadPost.MessageID IS NULL;");
 
 	boardst.Step();
 	while(boardst.RowReturned())
 	{
 		int boardid=-1;
-
 		boardst.ResultInt(0,boardid);
+		boardst.Step();
 
 		selectst.Bind(0,boardid);
 		selectst.Step();
@@ -65,27 +59,46 @@ void DBMaintenanceThread::Do10MinuteMaintenance()
 
 			selectst.ResultInt(0,messageid);
 
-			tb.Build(messageid,boardid,true);
+			m_unthreadedmessages.push_back(std::pair<long,long>(boardid,messageid));
 
 			selectst.Step();
 		}
 		selectst.Reset();
-
-		boardst.Step();
 	}
+	selectst.Finalize();
+	boardst.Finalize();
 
-	// TODO - remove after corruption issue fixed
-	if(ll=="8")
+	for(std::vector<std::pair<long,long> >::iterator i=m_unthreadedmessages.begin(); i!=m_unthreadedmessages.end(); i++)
 	{
-		std::string dbres=TestDBIntegrity(m_db);
-		m_log->trace("DBMaintenanceThread::Do10MinuteMaintenance() middle TestDBIntegrity returned "+dbres);
-		if(dbres!="ok")
+		tb.Build((*i).second,(*i).first,true);
+	}
+	
+	/*
+	while(boardst.RowReturned())
+	{
+		int boardid=-1;
+
+		boardst.ResultInt(0,boardid);
+
+		selectst.Bind(0,boardid);
+		selectst.Step();
+
+		while(selectst.RowReturned())
 		{
-			m_db->Execute("REINDEX;");
-			dbres=TestDBIntegrity(m_db);
-			m_log->trace("DBMaintenanceThread::Do10MinuteMaintenenace() middle after reindex returned "+dbres);
+			int messageid=-1;
+
+			selectst.ResultInt(0,messageid);
+
+			tb.Build(messageid,boardid,true);
+
+			selectst.Step();
 		}
+		selectst.Reset();
+
+		boardst.Step();
+		boardst.Reset();
 	}
+	*/
 
 	// now rebuild threads where the message has been deleted
 	SQLite3DB::Statement st=m_db->Prepare("SELECT tblThreadPost.MessageID, tblThread.BoardID FROM tblThreadPost INNER JOIN tblThread ON tblThreadPost.ThreadID=tblThread.ThreadID LEFT JOIN tblMessage ON tblThreadPost.MessageID=tblMessage.MessageID WHERE tblMessage.MessageID IS NULL;");
@@ -111,6 +124,12 @@ void DBMaintenanceThread::Do10MinuteMaintenance()
 	{
 		std::string dbres=TestDBIntegrity(m_db);
 		m_log->trace("DBMaintenanceThread::Do10MinuteMaintenance() end TestDBIntegrity returned "+dbres);
+		if(dbres!="ok")
+		{
+			m_db->Execute("REINDEX;");
+			dbres=TestDBIntegrity(m_db);
+			m_log->trace("DBMaintenanceThread::Do10MinuteMaintenenace() end after reindex returned "+dbres);
+		}
 	}
 
 	m_log->debug("PeriodicDBMaintenance::Do10MinuteMaintenance");