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

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

This commit is contained in:
Andreas Streichardt 2017-05-17 18:19:26 +02:00
parent 49328dcecb b4d1664023
commit 83dff84be7
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/RocksDBEngine/RocksDBCollection.cpp
View File

@ -86,7 +86,7 @@ RocksDBCollection::RocksDBCollection(LogicalCollection* collection,
_hasGeoIndex(false),
_cache(nullptr),
_cachePresent(false),
_useCache(true) {
_useCache(false) {
addCollectionMapping(_objectId, _logicalCollection->vocbase()->id(),
_logicalCollection->cid());
if (_useCache) {
@ -104,7 +104,7 @@ RocksDBCollection::RocksDBCollection(LogicalCollection* collection,
_hasGeoIndex(false),
_cache(nullptr),
_cachePresent(false),
_useCache(true) {
_useCache(false) {
addCollectionMapping(_objectId, _logicalCollection->vocbase()->id(),
_logicalCollection->cid());
if (_useCache) {

3
arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp
View File

@ -299,7 +299,8 @@ RocksDBPrimaryIndex::RocksDBPrimaryIndex(
StaticStrings::KeyString, false)}}),
true, false,
basics::VelocyPackHelper::stringUInt64(info, "objectId"),
!ServerState::instance()->isCoordinator() /*useCache*/) {
false) {
// !ServerState::instance()->isCoordinator() /*useCache*/) {
TRI_ASSERT(_objectId != 0);
}

4
js/server/tests/shell/shell-foxx-manager-spec.js
View File

@ -32,13 +32,13 @@ describe('Foxx Manager', function () {
json.dependencies = deps1;
fs.writeFileSync(filename, JSON.stringify(json));
FoxxManager.loadServiceFromDisk(mount);
FoxxManager.reloadInstalledService(mount);
service = FoxxManager.lookupService(mount);
expect(service.manifest.dependencies).to.eql(deps1);
json.dependencies = deps2;
fs.writeFileSync(filename, JSON.stringify(json));
FoxxManager.loadServiceFromDisk(mount);
FoxxManager.reloadInstalledService(mount);
service = FoxxManager.lookupService(mount);
expect(service.manifest.dependencies).to.eql(deps2);
});

24
js/server/tests/shell/shell-foxx-swagger-spec.js
View File

@ -263,17 +263,19 @@ function createService () {
return new Service({
path: '/tmp/$dummy$',
mount: '/__dummy__',
manifest: {
name: 'DUMMY APP',
version: '1.0.0',
license: 'The Unlicense',
description: 'Dummy app for Foxx.',
main: '$dummy$',
engines: {
arangodb: '^3.0.0'
}
},
options: {}
options: {
configuration: {},
dependencies: {}
}
}, {
name: 'DUMMY APP',
version: '1.0.0',
license: 'The Unlicense',
description: 'Dummy app for Foxx.',
main: '$dummy$',
engines: {
arangodb: '^3.0.0'
}
});
}