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

Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

This commit is contained in:
jsteemann 2016-02-23 22:26:44 +01:00
parent 886dca61b0 b2ecc039c6
commit c9974b60ab
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arangod/VocBase/vocbase.cpp
View File

@ -41,6 +41,7 @@
#include "Basics/tri-strings.h" #include "Basics/tri-strings.h"
#include "Basics/threads.h" #include "Basics/threads.h"
#include "Basics/Exceptions.h" #include "Basics/Exceptions.h"
#include "Basics/FileUtils.h"
#include "Utils/CollectionKeysRepository.h" #include "Utils/CollectionKeysRepository.h"
#include "Utils/CursorRepository.h" #include "Utils/CursorRepository.h"
#include "Utils/transactions.h" #include "Utils/transactions.h"
@ -785,20 +786,12 @@ static int ScanPath(TRI_vocbase_t* vocbase, char const* path, bool isUpgrade,
for (auto const& name : files) { for (auto const& name : files) {
TRI_ASSERT(!name.empty()); TRI_ASSERT(!name.empty());
if (!StringUtils::isSuffix(name, "collection-")) { if (!StringUtils::isPrefix(name, "collection-")) {
// no match, ignore this file // no match, ignore this file
continue; continue;
} }
char* filePtr = TRI_Concatenate2File(path, name.c_str()); std::string file = FileUtils::buildFilename(path, name);
if (filePtr == nullptr) {
LOG(FATAL) << "out of memory";
FATAL_ERROR_EXIT();
}
std::string file = filePtr;
TRI_FreeString(TRI_CORE_MEM_ZONE, filePtr);
if (TRI_IsDirectory(file.c_str())) { if (TRI_IsDirectory(file.c_str())) {
if (!TRI_IsWritable(file.c_str())) { if (!TRI_IsWritable(file.c_str())) {