tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 15:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up DbConnection / IdoMysqlConnection.

Browse Source 
Refs #4969
This commit is contained in:
Gunnar Beutner 2013-10-30 14:07:26 +01:00
parent 94b377ff27
commit e020a80bf8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/db_ido_mysql/idomysqlconnection.cpp
View File

@ -65,7 +65,7 @@ void IdoMysqlConnection::Stop(void)
void IdoMysqlConnection::AssertOnWorkQueue(void) void IdoMysqlConnection::AssertOnWorkQueue(void)
{ {
VERIFY(boost::this_thread::get_id() == m_QueryQueue.GetThreadId()); ASSERT(boost::this_thread::get_id() == m_QueryQueue.GetThreadId());
} }
void IdoMysqlConnection::Disconnect(void) void IdoMysqlConnection::Disconnect(void)
@ -570,12 +570,12 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query)
} }
} }
void IdoMysqlConnection::CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) void IdoMysqlConnection::CleanUpExecuteQuery(const String& table, const String& time_column, double max_age)
{ {
m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalCleanUpExecuteQuery, this, table, time_key, time_value)); m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalCleanUpExecuteQuery, this, table, time_column, max_age));
} }
void IdoMysqlConnection::InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value) void IdoMysqlConnection::InternalCleanUpExecuteQuery(const String& table, const String& time_column, double max_age)
{ {
boost::mutex::scoped_lock lock(m_ConnectionMutex); boost::mutex::scoped_lock lock(m_ConnectionMutex);
@ -583,7 +583,6 @@ void IdoMysqlConnection::InternalCleanUpExecuteQuery(const String& table, const
return; return;
Query("DELETE FROM " + GetTablePrefix() + table + " WHERE instance_id = " + Query("DELETE FROM " + GetTablePrefix() + table + " WHERE instance_id = " +
Convert::ToString(static_cast<long>(m_InstanceID)) + " AND " + time_key + Convert::ToString(static_cast<long>(m_InstanceID)) + " AND " + time_column +
"<FROM_UNIXTIME(" + Convert::ToString(static_cast<long>(time_value)) + ")"); " < FROM_UNIXTIME(" + Convert::ToString(static_cast<long>(max_age)) + ")");
} }

2
lib/db_ido/dbconnection.h
View File

@ -75,7 +75,7 @@ protected:
virtual void ActivateObject(const DbObject::Ptr& dbobj) = 0; virtual void ActivateObject(const DbObject::Ptr& dbobj) = 0;
virtual void DeactivateObject(const DbObject::Ptr& dbobj) = 0; virtual void DeactivateObject(const DbObject::Ptr& dbobj) = 0;
virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) = 0; virtual void CleanUpExecuteQuery(const String& table, const String& time_column, double max_age);
void UpdateAllObjects(void); void UpdateAllObjects(void);