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

Now also the journalSize is checked if it is too small. Also reverted report message for isVolatile to be equal to the pre 3.1 message.

This commit is contained in:
Michael Hackstein 2016-08-30 11:18:36 +02:00
parent 5f067cb1fb
commit 9c0382ed19
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/VocBase/LogicalCollection.cpp
View File

@ -194,7 +194,7 @@ LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase,
_isLocal(isLocal),
// THESE VALUES HAVE ARBITRARY VALUES. FIX THEM.
_isDeleted(false),
_doCompact(false),
_doCompact(true),
_isSystem(LogicalCollection::IsSystemName(name)),
_isVolatile(isVolatile),
_waitForSync(false),
@ -299,7 +299,7 @@ LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase, VPackSlice info)
info, "status", TRI_VOC_COL_STATUS_CORRUPTED)),
_isLocal(!ServerState::instance()->isCoordinator()),
_isDeleted(ReadBooleanValue(info, "deleted", false)),
_doCompact(ReadBooleanValue(info, "doCompact", false)),
_doCompact(ReadBooleanValue(info, "doCompact", true)),
_isSystem(ReadBooleanValue(info, "isSystem", false)),
_isVolatile(ReadBooleanValue(info, "isVolatile", false)),
_waitForSync(ReadBooleanValue(info, "waitForSync", false)),
@ -325,7 +325,11 @@ LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase, VPackSlice info)
// Illegal collection configuration
THROW_ARANGO_EXCEPTION_MESSAGE(
TRI_ERROR_BAD_PARAMETER,
"A collection cannot be volatile and waitForSync at the same time.");
"volatile collections do not support the waitForSync option");
}
if (_journalSize < TRI_JOURNAL_MINIMAL_SIZE) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_BAD_PARAMETER,
"<properties>.journalSize too small");
}
if (info.isObject()) {
// Otherwise the cluster communication is broken.