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

Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types

This commit is contained in:
jsteemann 2016-08-30 13:46:01 +02:00
parent bdd9d1422e d6a21b20e3
commit 09b611100c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arangod/VocBase/LogicalCollection.cpp
View File

@ -300,12 +300,15 @@ LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase, VPackSlice info)
_isLocal(!ServerState::instance()->isCoordinator()), _isLocal(!ServerState::instance()->isCoordinator()),
_isDeleted(ReadBooleanValue(info, "deleted", false)), _isDeleted(ReadBooleanValue(info, "deleted", false)),
_doCompact(ReadBooleanValue(info, "doCompact", true)), _doCompact(ReadBooleanValue(info, "doCompact", true)),
_isSystem(ReadBooleanValue(info, "isSystem", false)), _isSystem(IsSystemName(_name) &&
ReadBooleanValue(info, "isSystem", false)),
_isVolatile(ReadBooleanValue(info, "isVolatile", false)), _isVolatile(ReadBooleanValue(info, "isVolatile", false)),
_waitForSync(ReadBooleanValue(info, "waitForSync", false)), _waitForSync(ReadBooleanValue(info, "waitForSync", false)),
_journalSize(ReadNumericValue<TRI_voc_size_t>( _journalSize(ReadNumericValue<TRI_voc_size_t>(
info, "maximalSize", // Backwards compatibility. Agency uses journalSize. paramters.json uses maximalSize info, "maximalSize", // Backwards compatibility. Agency uses
ReadNumericValue<TRI_voc_size_t>(info, "journalSize", TRI_JOURNAL_DEFAULT_SIZE))), // journalSize. paramters.json uses maximalSize
ReadNumericValue<TRI_voc_size_t>(info, "journalSize",
TRI_JOURNAL_DEFAULT_SIZE))),
_keyOptions(CopySliceValue(info, "keyOptions")), _keyOptions(CopySliceValue(info, "keyOptions")),
_indexBuckets(ReadNumericValue<uint32_t>(info, "indexBuckets", 1)), _indexBuckets(ReadNumericValue<uint32_t>(info, "indexBuckets", 1)),
_replicationFactor(ReadNumericValue<int>(info, "replicationFactor", 1)), _replicationFactor(ReadNumericValue<int>(info, "replicationFactor", 1)),
@ -381,7 +384,7 @@ LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase, VPackSlice info)
} }
} }
_keyGenerator.reset(KeyGenerator::factory(info)); _keyGenerator.reset(KeyGenerator::factory(info.get("keyOptions")));
createPhysical(); createPhysical();