sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sqlite: let sqlite automatically rollback if needed to avoid potential rollback against no transaction

Browse source
This commit is contained in:
Dane Springmeyer 2011-11-13 19:19:22 -08:00
parent ef69f00867
commit 1653fe0b93
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/input/sqlite/sqlite_utils.hpp
View file

@ -207,9 +207,17 @@ public:
bool one_success = false; bool one_success = false;
try try
{ {
ds->execute("PRAGMA synchronous=OFF"); ds->execute("PRAGMA synchronous=OFF");
ds->execute("BEGIN IMMEDIATE TRANSACTION"); ds->execute("BEGIN IMMEDIATE TRANSACTION");
/*
ds->execute("PRAGMA journal_mode=WAL");
ds->execute("PRAGMA fullfsync=1");
ds->execute("PRAGMA locking_mode = EXCLUSIVE");
ds->execute("BEGIN EXCLUSIVE TRANSACTION");
*/
// first drop the index if it already exists // first drop the index if it already exists
std::ostringstream spatial_index_drop_sql; std::ostringstream spatial_index_drop_sql;
spatial_index_drop_sql << "DROP TABLE IF EXISTS " << index_table; spatial_index_drop_sql << "DROP TABLE IF EXISTS " << index_table;
@ -278,7 +286,6 @@ public:
} }
catch (mapnik::datasource_exception const& ex) catch (mapnik::datasource_exception const& ex)
{ {
ds->execute("ROLLBACK");
if (!existed) if (!existed)
{ {
try try
@ -297,7 +304,6 @@ public:
} }
else if (!existed) else if (!existed)
{ {
ds->execute("ROLLBACK");
try try
{ {
boost::filesystem::remove(index_db); boost::filesystem::remove(index_db);