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

minor fixes (#7689)

This commit is contained in:
Jan 2018-12-07 16:22:25 +01:00 committed by GitHub
parent 5bae3742e5
commit 945922ad87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Cache/CacheManagerFeature.cpp
View File

@ -72,7 +72,8 @@ void CacheManagerFeature::collectOptions(
options->addSection("cache", "Configure the hash cache"); options->addSection("cache", "Configure the hash cache");
options->addOption("--cache.size", "size of cache in bytes", options->addOption("--cache.size", "size of cache in bytes",
new UInt64Parameter(&_cacheSize)); new UInt64Parameter(&_cacheSize),
arangodb::options::makeFlags(arangodb::options::Flags::Dynamic));
options->addOption("--cache.rebalancing-interval", options->addOption("--cache.rebalancing-interval",
"microseconds between rebalancing attempts", "microseconds between rebalancing attempts",

5
arangod/VocBase/LogicalCollection.cpp
View File

@ -630,12 +630,9 @@ arangodb::Result LogicalCollection::appendVelocyPack(
result.add("allowUserKeys", VPackValue(_allowUserKeys)); result.add("allowUserKeys", VPackValue(_allowUserKeys));
// keyoptions // keyoptions
result.add(VPackValue("keyOptions")); result.add("keyOptions", VPackValue(VPackValueType::Object));
if (_keyGenerator != nullptr) { if (_keyGenerator != nullptr) {
result.openObject();
_keyGenerator->toVelocyPack(result); _keyGenerator->toVelocyPack(result);
} else {
result.openArray();
} }
result.close(); result.close();

2
lib/ApplicationFeatures/RocksDBOptionFeature.cpp
View File

@ -99,7 +99,7 @@ RocksDBOptionFeature::RocksDBOptionFeature(
if (_totalWriteBufferSize == 0) { if (_totalWriteBufferSize == 0) {
// unlimited write buffer size... now set to some fraction of physical RAM // unlimited write buffer size... now set to some fraction of physical RAM
if (TRI_PhysicalMemory >= (static_cast<uint64_t>(4) << 30)) { if (TRI_PhysicalMemory >= (static_cast<uint64_t>(4) << 30)) {
_totalWriteBufferSize = static_cast<uint64_t>((TRI_PhysicalMemory - (static_cast<uint64_t>(2) << 30)) * 0.5); _totalWriteBufferSize = static_cast<uint64_t>((TRI_PhysicalMemory - (static_cast<uint64_t>(2) << 30)) * 0.4);
} else { } else {
_totalWriteBufferSize = (512 << 20); _totalWriteBufferSize = (512 << 20);
} }