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

remove isFullyCollected from LogicalCollection

This commit is contained in:
Jan Christoph Uhde 2017-02-20 10:26:38 +01:00
parent 40a1345f76
commit f3a1f128ee
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/MMFiles/MMFilesCleanupThread.cpp
View File

@ -226,7 +226,7 @@ void MMFilesCleanupThread::cleanupCollection(arangodb::LogicalCollection* collec
} }
} }
if (!collection->isFullyCollected()) { if (!collection->getPhysical()->isFullyCollected()) {
bool isDeleted = false; bool isDeleted = false;
// if there is still some garbage collection to perform, // if there is still some garbage collection to perform,

3
arangod/Utils/CollectionExport.cpp
View File

@ -31,6 +31,7 @@
#include "Transaction/Hints.h" #include "Transaction/Hints.h"
#include "VocBase/Ditch.h" #include "VocBase/Ditch.h"
#include "VocBase/LogicalCollection.h" #include "VocBase/LogicalCollection.h"
#include "VocBase/PhysicalCollection.h"
#include "VocBase/vocbase.h" #include "VocBase/vocbase.h"
using namespace arangodb; using namespace arangodb;
@ -78,7 +79,7 @@ void CollectionExport::run(uint64_t maxWaitTime, size_t limit) {
uint64_t const maxTries = maxWaitTime / SleepTime; uint64_t const maxTries = maxWaitTime / SleepTime;
while (++tries < maxTries) { while (++tries < maxTries) {
if (_collection->isFullyCollected()) { if (_collection->getPhysical()->isFullyCollected()) {
break; break;
} }
usleep(SleepTime); usleep(SleepTime);

5
arangod/VocBase/LogicalCollection.cpp
View File

@ -525,11 +525,6 @@ bool LogicalCollection::IsAllowedName(bool allowSystem,
return true; return true;
} }
/// @brief whether or not a collection is fully collected
bool LogicalCollection::isFullyCollected() {
return getPhysical()->isFullyCollected();
}
uint64_t LogicalCollection::numberDocuments() const { uint64_t LogicalCollection::numberDocuments() const {
// TODO Ask StorageEngine instead // TODO Ask StorageEngine instead
return primaryIndex()->size(); return primaryIndex()->size();

4
arangod/VocBase/LogicalCollection.h
View File

@ -104,10 +104,6 @@ class LogicalCollection {
static bool IsAllowedName(velocypack::Slice parameters); static bool IsAllowedName(velocypack::Slice parameters);
static bool IsAllowedName(bool isSystem, std::string const& name); static bool IsAllowedName(bool isSystem, std::string const& name);
// TODO: MOVE TO PHYSICAL?
bool isFullyCollected(); //should not be exposed
// SECTION: Meta Information // SECTION: Meta Information
uint32_t version() const { return _version; } uint32_t version() const { return _version; }