1
0
Fork 0

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

View File

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

View File

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

View File

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

View File

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