Index: src/libchcore/TSQLiteSerializerContainer.cpp =================================================================== diff -u -N -r0c5027d5173ab0daeba6aa6b735a2b11d4cd2164 -r31c4b1fc46687ed2cf35dd9fa0acec2543ae1886 --- src/libchcore/TSQLiteSerializerContainer.cpp (.../TSQLiteSerializerContainer.cpp) (revision 0c5027d5173ab0daeba6aa6b735a2b11d4cd2164) +++ src/libchcore/TSQLiteSerializerContainer.cpp (.../TSQLiteSerializerContainer.cpp) (revision 31c4b1fc46687ed2cf35dd9fa0acec2543ae1886) @@ -18,7 +18,7 @@ // ============================================================================ #include "stdafx.h" #include "TSQLiteSerializerContainer.h" -#include "TSQLiteSerializerRowWriter.h" +#include "TSQLiteSerializerRowData.h" #include "ErrorCodes.h" #include "TCoreException.h" #include @@ -27,6 +27,8 @@ BEGIN_CHCORE_NAMESPACE +using namespace sqlite; + TSQLiteSerializerContainer::TSQLiteSerializerContainer(const TString& strName, const sqlite::TSQLiteDatabasePtr& spDB) : m_spColumns(new TSQLiteColumnsDefinition), m_strName(strName), @@ -46,19 +48,19 @@ { } -chcore::ISerializerRowWriterPtr TSQLiteSerializerContainer::AddRow(size_t stRowID) +chcore::ISerializerRowDataPtr TSQLiteSerializerContainer::AddRow(size_t stRowID) { RowMap::iterator iterInsert = m_mapRows.insert( - std::make_pair(stRowID, TSQLiteSerializerRowWriterPtr(new TSQLiteSerializerRowWriter(stRowID, m_spColumns, true))) + std::make_pair(stRowID, TSQLiteSerializerRowDataPtr(new TSQLiteSerializerRowData(stRowID, m_spColumns, true))) ).first; return (*iterInsert).second; } -ISerializerRowWriterPtr TSQLiteSerializerContainer::GetRow(size_t stRowID) +ISerializerRowDataPtr TSQLiteSerializerContainer::GetRow(size_t stRowID) { RowMap::iterator iterFnd = m_mapRows.find(stRowID); if(iterFnd == m_mapRows.end()) - iterFnd = m_mapRows.insert(std::make_pair(stRowID, TSQLiteSerializerRowWriterPtr(new TSQLiteSerializerRowWriter(stRowID, m_spColumns, false)))).first; + iterFnd = m_mapRows.insert(std::make_pair(stRowID, TSQLiteSerializerRowDataPtr(new TSQLiteSerializerRowData(stRowID, m_spColumns, false)))).first; return (*iterFnd).second; } @@ -86,4 +88,39 @@ return m_spColumns; } +void TSQLiteSerializerContainer::Flush() +{ + FlushDeletions(); + + for(RowMap::iterator iterRows = m_mapRows.begin(); iterRows != m_mapRows.end(); ++iterRows) + { + iterRows->second->Flush(m_spDB, m_strName); + } +} + +void TSQLiteSerializerContainer::FlushDeletions() +{ + // delete from m_strName WHERE id IN (???) + TSQLiteStatement tStatement(m_spDB); + + const size_t stMaxToRemoveAtOnce = 10; + + // delete items in chunks + std::set::const_iterator iterToDelete = m_setDeleteItems.begin(); + while(iterToDelete != m_setDeleteItems.end()) + { + TString strItemsToRemove; + size_t stToRemove = stMaxToRemoveAtOnce; + while(iterToDelete != m_setDeleteItems.end() && (--stToRemove) != 0) + { + strItemsToRemove += boost::str(boost::wformat(L"%1%,") % *iterToDelete).c_str(); + } + strItemsToRemove.TrimRightSelf(_T(",")); + + TString strQuery = boost::str(boost::wformat(L"DELETE FROM %1% WHERE id IN (%2%)") % m_strName % strItemsToRemove).c_str(); + tStatement.Prepare(strQuery); + tStatement.Step(); + } +} + END_CHCORE_NAMESPACE