yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace deprecated Xapian::Database::flush() with commit() (name change only)

Browse source
This commit is contained in:
Jean-Francois Dockes 2016-12-11 09:40:29 +01:00
parent 6670b36bb7
commit a79bbba2db
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/rcldb/rcldb.cpp
View file

@ -1670,7 +1670,7 @@ void Db::waitUpdIdle()
// We flush here just for correct measurement of the thread work time // We flush here just for correct measurement of the thread work time
string ermsg; string ermsg;
try { try {
m_ndb->xwdb.flush(); m_ndb->xwdb.commit();
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::waitUpdIdle: flush() failed: " << (ermsg) << "\n" ); LOGERR("Db::waitUpdIdle: flush() failed: " << (ermsg) << "\n" );
@ -1702,7 +1702,7 @@ bool Db::doFlush()
} }
string ermsg; string ermsg;
try { try {
m_ndb->xwdb.flush(); m_ndb->xwdb.commit();
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::doFlush: flush() failed: " << (ermsg) << "\n" ); LOGERR("Db::doFlush: flush() failed: " << (ermsg) << "\n" );
@ -1907,7 +1907,7 @@ bool Db::purge()
// that any added document would go to the index. Kept here // that any added document would go to the index. Kept here
// because it doesn't really hurt. // because it doesn't really hurt.
try { try {
m_ndb->xwdb.flush(); m_ndb->xwdb.commit();
} catch (...) { } catch (...) {
LOGERR("Db::purge: 1st flush failed\n" ); LOGERR("Db::purge: 1st flush failed\n" );
@ -1952,7 +1952,7 @@ bool Db::purge()
} }
try { try {
m_ndb->xwdb.flush(); m_ndb->xwdb.commit();
} catch (...) { } catch (...) {
LOGERR("Db::purge: 2nd flush failed\n" ); LOGERR("Db::purge: 2nd flush failed\n" );
} }