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

Merge branch 'vpack' of ssh://github.com/ArangoDB/ArangoDB into vpack

This commit is contained in:
Max Neunhoeffer 2015-12-17 12:14:25 +01:00
parent 812994d459 002c876858
commit ec7f6be918
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/V8Server/v8-vocindex.cpp
View File

@ -1579,7 +1579,6 @@ static void CreateVocBase (const v8::FunctionCallbackInfo<v8::Value>& args,
VPackBuilder builder;
builder.openObject();
VPackSlice infoSlice;
if (2 <= args.Length()) {
if (! args[1]->IsObject()) {
@ -1590,7 +1589,6 @@ static void CreateVocBase (const v8::FunctionCallbackInfo<v8::Value>& args,
if (res != TRI_ERROR_NO_ERROR) {
TRI_V8_THROW_EXCEPTION(res);
}
builder.close();
infoSlice = builder.slice();
if (infoSlice.hasKey("journalSize")) {
@ -1608,7 +1606,6 @@ static void CreateVocBase (const v8::FunctionCallbackInfo<v8::Value>& args,
#endif
}
else {
builder.close();
infoSlice = builder.slice();
}

8
arangod/VocBase/document-collection.cpp
View File

@ -2337,8 +2337,12 @@ TRI_document_collection_t* TRI_CreateDocumentCollection (TRI_vocbase_t* vocbase,
// check if we can generate the key generator
std::shared_ptr<arangodb::velocypack::Buffer<uint8_t> const> buffer = parameters.keyOptions();
VPackSlice const slice(buffer->data());
std::unique_ptr<TRI_json_t> json(triagens::basics::VelocyPackHelper::velocyPackToJson(slice));
std::unique_ptr<TRI_json_t> json;
if (buffer != nullptr) {
VPackSlice const slice(buffer->data());
json.reset(triagens::basics::VelocyPackHelper::velocyPackToJson(slice));
}
KeyGenerator* keyGenerator = KeyGenerator::factory(json.get());
if (keyGenerator == nullptr) {