Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed method

This commit is contained in:
Jan Steemann 2014-06-27 08:26:40 +02:00
parent dd9e29702c
commit 028f451edd
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arangod/Wal/LogfileManager.cpp
View File

@ -1385,18 +1385,6 @@ void LogfileManager::waitForCollector (Logfile::IdType logfileId) {
} }
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief scan a single logfile
////////////////////////////////////////////////////////////////////////////////
bool LogfileManager::scanLogfile (Logfile const* logfile) {
TRI_ASSERT(logfile != nullptr);
LOG_TRACE("scanning logfile %llu (%s)", (unsigned long long) logfile->id(), logfile->statusText().c_str());
return TRI_IterateDatafile(logfile->df(), &ScanMarker, static_cast<void*>(_recoverState));
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief write abort markers for all open transactions /// @brief write abort markers for all open transactions
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1804,7 +1792,9 @@ int LogfileManager::inspectLogfiles () {
++_recoverState->logfilesToCollect; ++_recoverState->logfilesToCollect;
} }
if (! scanLogfile(logfile)) { LOG_TRACE("scanning logfile %llu (%s)", (unsigned long long) logfile->id(), logfile->statusText().c_str());
if (! TRI_IterateDatafile(logfile->df(), &ScanMarker, static_cast<void*>(_recoverState))) {
LOG_TRACE("WAL inspection failed when scanning logfile '%s'", logfile->filename().c_str()); LOG_TRACE("WAL inspection failed when scanning logfile '%s'", logfile->filename().c_str());
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
} }

6
arangod/Wal/LogfileManager.h
View File

@ -587,12 +587,6 @@ namespace triagens {
void waitForCollector (Logfile::IdType); void waitForCollector (Logfile::IdType);
////////////////////////////////////////////////////////////////////////////////
/// @brief scan a single logfile
////////////////////////////////////////////////////////////////////////////////
bool scanLogfile (Logfile const*);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief write abort markers for all open transactions /// @brief write abort markers for all open transactions
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////