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

Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api

This commit is contained in:
jsteemann 2017-04-03 13:19:55 +02:00
parent 0fcfb4f64d 83e42cf6aa
commit b4f7ebdb2b
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/RestServer/AqlFeature.cpp
View File

@ -42,6 +42,7 @@ AqlFeature::AqlFeature(
: ApplicationFeature(server, "Aql"), _numberLeases(0), _isStopped(false) {
setOptional(false);
requiresElevatedPrivileges(false);
startsAfter("CacheManager");
startsAfter("Scheduler");
startsAfter("MMFilesLogfileManager");
startsAfter("Database");

7
arangod/RocksDBEngine/RocksDBIndex.cpp
View File

@ -50,6 +50,13 @@ RocksDBIndex::RocksDBIndex(TRI_idx_iid_t id, LogicalCollection* collection,
_objectId(TRI_NewTickServer()), // TODO!
_cmp(static_cast<RocksDBEngine*>(EngineSelectorFeature::ENGINE)->cmp()) {}
RocksDBIndex::~RocksDBIndex() {
if (_useCache) {
TRI_ASSERT(_cache != nullptr);
_cacheManager->destroyCache(_cache);
}
}
void RocksDBIndex::createCache() {
TRI_ASSERT(_cacheManager != nullptr);
TRI_ASSERT(_useCache);

3
arangod/RocksDBEngine/RocksDBIndex.h
View File

@ -48,6 +48,9 @@ class RocksDBIndex : public Index {
arangodb::velocypack::Slice const&);
public:
~RocksDBIndex();
uint64_t objectId() const { return _objectId; }
bool isPersistent() const override final { return true; }