version 0.2.23

[fms.git] / src / freenet / periodicdbmaintenance.cpp

diff --git a/src/freenet/periodicdbmaintenance.cpp b/src/freenet/periodicdbmaintenance.cpp
index f6f501b..f199fd2 100644 (file)
--- a/src/freenet/periodicdbmaintenance.cpp
+++ b/src/freenet/periodicdbmaintenance.cpp
@@ -82,7 +82,19 @@ void PeriodicDBMaintenance::Do1HourMaintenance()
                st.Step();\r
        }\r
 \r
-\r
+       // set null peer trust for identities without a calculated trust\r
+       st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE IdentityID NOT IN (SELECT TargetIdentityID FROM vwCalculatedPeerTrust);");\r
+       upd=m_db->Prepare("UPDATE tblIdentity SET PeerMessageTrust=NULL, PeerTrustListTrust=NULL WHERE IdentityID=?;");\r
+       st.Step();\r
+       while(st.RowReturned())\r
+       {\r
+               int identityid=0;\r
+               st.ResultInt(0,identityid);\r
+               upd.Bind(0,identityid);\r
+               upd.Step();\r
+               upd.Reset();\r
+               st.Step();\r
+       }\r
 \r
        m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"PeriodicDBMaintenance::Do1HourMaintenance");\r
 }\r
@@ -90,6 +102,34 @@ void PeriodicDBMaintenance::Do1HourMaintenance()
 void PeriodicDBMaintenance::Do6HourMaintenance()\r
 {\r
 \r
+       // if we remove a board and the reply boardid is still set to it, we need to replace it with a boardid that does exist\r
+       SQLite3DB::Statement st=m_db->Prepare("SELECT MessageID FROM tblMessage WHERE ReplyBoardID NOT IN (SELECT BoardID FROM tblBoard);");\r
+       SQLite3DB::Statement st2=m_db->Prepare("SELECT BoardID FROM tblMessageBoard WHERE MessageID=?;");\r
+       SQLite3DB::Statement upd=m_db->Prepare("UPDATE tblMessage SET ReplyBoardID=? WHERE MessageID=?;");\r
+       st.Step();\r
+       while(st.RowReturned())\r
+       {\r
+               // find a valid boardid for the message\r
+               int messageid=0;\r
+               int boardid=0;\r
+\r
+               st.ResultInt(0,messageid);\r
+\r
+               st2.Bind(0,messageid);\r
+               st2.Step();\r
+               if(st2.RowReturned())\r
+               {\r
+                       st2.ResultInt(0,boardid);\r
+                       upd.Bind(0,boardid);\r
+                       upd.Bind(1,messageid);\r
+                       upd.Step();\r
+                       upd.Reset();\r
+               }\r
+               st2.Reset();\r
+               \r
+               st.Step();\r
+       }\r
+\r
        m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"PeriodicDBMaintenance::Do6HourMaintenance");\r
 }\r
 \r
@@ -103,8 +143,6 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
        m_db->Execute("DELETE FROM tblIntroductionPuzzleInserts WHERE Day<='"+date.Format("%Y-%m-%d")+"';");\r
        m_db->Execute("DELETE FROM tblIntroductionPuzzleRequests WHERE Day<='"+date.Format("%Y-%m-%d")+"';");\r
 \r
-       m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"PeriodicDBMaintenance::Do1DayMaintenance");\r
-\r
        // delete all identities we've never seen and were added more than 20 days ago\r
        date.SetToGMTime();\r
        date.Add(0,0,0,-20);\r
@@ -115,6 +153,12 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
        date.Add(0,0,0,-2);\r
        m_db->Execute("DELETE FROM tblIdentityRequests WHERE Day<'"+date.Format("%Y-%m-%d")+"';");\r
 \r
+       // delete old board list inserts/requests - we don't need them anymore\r
+       date.SetToGMTime();\r
+       date.Add(0,0,0,-2);\r
+       m_db->Execute("DELETE FROM tblBoardListInserts WHERE Day<'"+date.Format("%Y-%m-%d")+"';");\r
+       m_db->Execute("DELETE FROM tblBoardListRequests WHERE Day<'"+date.Format("%Y-%m-%d")+"';");\r
+\r
        // delete old local identity inserts - we don't need them anymore\r
        date.SetToGMTime();\r
        date.Add(0,0,0,-2);\r
@@ -145,6 +189,7 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
        while(st.RowReturned())\r
        {\r
                std::string name="";\r
+               std::string namepart="";\r
                std::string publickey="";\r
                int identityid=0;\r
                st.ResultText(0,name);\r
@@ -152,9 +197,19 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
                std::vector<std::string> parts;\r
                StringFunctions::Split(name,"@",parts);\r
 \r
+               // name can have a @ in it - so reattach all parts except the last which is the key\r
+               for(long i=0; i<parts.size()-1; i++)\r
+               {\r
+                       if(i!=0)\r
+                       {\r
+                               namepart+="@";\r
+                       }\r
+                       namepart+=parts[i];\r
+               }\r
+\r
                // find identities with this name\r
                SQLite3DB::Statement st2=m_db->Prepare("SELECT IdentityID,PublicKey FROM tblIdentity WHERE Name=?;");\r
-               st2.Bind(0,name);\r
+               st2.Bind(0,namepart);\r
                st2.Step();\r
                while(st2.RowReturned())\r
                {\r
@@ -167,7 +222,7 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
                                // we have the identity - so update the messages table with the identityid\r
                                st2.ResultInt(0,identityid);\r
 \r
-                               SQLite3DB::Statement st3=m_db->Prepare("UPDATE tblMessage SET IdentityID=? WHERE Name=? AND IdentityID IS NULL;");\r
+                               SQLite3DB::Statement st3=m_db->Prepare("UPDATE tblMessage SET IdentityID=? WHERE FromName=? AND IdentityID IS NULL;");\r
                                st3.Bind(0,identityid);\r
                                st3.Bind(1,name);\r
                                st3.Step();\r
@@ -199,6 +254,12 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
        st.Bind(0,date.Format("%Y-%m-%d"));\r
        st.Step();\r
 \r
+       // delete tblIdentityTrust for local identities and identities that have been deleted\r
+       m_db->Execute("DELETE FROM tblIdentityTrust WHERE LocalIdentityID NOT IN (SELECT LocalIdentityID FROM tblLocalIdentity);");\r
+       m_db->Execute("DELETE FROM tblIdentityTrust WHERE IdentityID NOT IN (SELECT IdentityID FROM tblIdentity);");\r
+\r
+       m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"PeriodicDBMaintenance::Do1DayMaintenance");\r
+\r
 }\r
 \r
 void PeriodicDBMaintenance::Process()\r