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

fix bug in import handler

This commit is contained in:
Jan Christoph Uhde 2017-03-30 15:00:46 +02:00
parent 329af8fa62
commit 36fb83efae
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arangod/RestHandler/RestImportHandler.cpp
View File

@ -366,7 +366,7 @@ bool RestImportHandler::createFromJson(std::string const& type) {
Result res = trx.begin(); Result res = trx.begin();
if (!res.ok()) { if (res.fail()) {
generateTransactionError(collectionName, res, ""); generateTransactionError(collectionName, res, "");
return false; return false;
} }
@ -459,7 +459,7 @@ bool RestImportHandler::createFromJson(std::string const& type) {
res = handleSingleDocument(trx, result, babies, builder->slice(), res = handleSingleDocument(trx, result, babies, builder->slice(),
isEdgeCollection, i); isEdgeCollection, i);
if (res.ok()) { if (res.fail()) {
if (complete) { if (complete) {
// only perform a full import: abort // only perform a full import: abort
break; break;
@ -499,7 +499,7 @@ bool RestImportHandler::createFromJson(std::string const& type) {
res = handleSingleDocument(trx, result, babies, slice, isEdgeCollection, res = handleSingleDocument(trx, result, babies, slice, isEdgeCollection,
static_cast<size_t>(i + 1)); static_cast<size_t>(i + 1));
if (!res.ok()) { if (res.fail()) {
if (complete) { if (complete) {
// only perform a full import: abort // only perform a full import: abort
break; break;
@ -520,7 +520,7 @@ bool RestImportHandler::createFromJson(std::string const& type) {
res = trx.finish(res); res = trx.finish(res);
if (!res.ok()) { if (res.fail()) {
generateTransactionError(collectionName, res, ""); generateTransactionError(collectionName, res, "");
} else { } else {
generateDocumentsCreated(result); generateDocumentsCreated(result);
@ -571,7 +571,7 @@ bool RestImportHandler::createFromVPack(std::string const& type) {
// ............................................................................. // .............................................................................
Result res = trx.begin(); Result res = trx.begin();
if (!res.ok()) { if (res.fail()) {
generateTransactionError(collectionName, res, ""); generateTransactionError(collectionName, res, "");
return false; return false;
} }
@ -604,7 +604,7 @@ bool RestImportHandler::createFromVPack(std::string const& type) {
res = handleSingleDocument(trx, result, babies, slice, isEdgeCollection, res = handleSingleDocument(trx, result, babies, slice, isEdgeCollection,
static_cast<size_t>(i + 1)); static_cast<size_t>(i + 1));
if (!res.ok()) { if (res.fail()) {
if (complete) { if (complete) {
// only perform a full import: abort // only perform a full import: abort
break; break;
@ -624,7 +624,7 @@ bool RestImportHandler::createFromVPack(std::string const& type) {
res = trx.finish(res); res = trx.finish(res);
if (!res.ok()) { if (res.fail()) {
generateTransactionError(collectionName, res, ""); generateTransactionError(collectionName, res, "");
} else { } else {
generateDocumentsCreated(result); generateDocumentsCreated(result);
@ -746,7 +746,7 @@ bool RestImportHandler::createFromKeyValueList() {
Result res = trx.begin(); Result res = trx.begin();
if (!res.ok()) { if (res.fail()) {
generateTransactionError(collectionName, res, ""); generateTransactionError(collectionName, res, "");
return false; return false;
} }
@ -827,7 +827,7 @@ bool RestImportHandler::createFromKeyValueList() {
} }
} }
if (!res.ok()) { if (res.fail()) {
if (complete) { if (complete) {
// only perform a full import: abort // only perform a full import: abort
break; break;
@ -847,7 +847,7 @@ bool RestImportHandler::createFromKeyValueList() {
res = trx.finish(res); res = trx.finish(res);
if (!res.ok()) { if (res.fail()) {
generateTransactionError(collectionName, res, ""); generateTransactionError(collectionName, res, "");
} else { } else {
generateDocumentsCreated(result); generateDocumentsCreated(result);