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

remove revision id from storage engine if write locker cannot be acquired

This commit is contained in:
jsteemann 2017-01-05 16:53:00 +01:00
parent 8d3f411cae
commit 9889e9f91f
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
arangod/VocBase/LogicalCollection.cpp
View File

@ -2064,55 +2064,56 @@ int LogicalCollection::insert(Transaction* trx, VPackSlice const slice,
try {
insertRevision(revisionId, marker->vpack(), 0, true);
// and go on with the insertion...
} catch (basics::Exception const& ex) {
res = ex.code();
return ex.code();
} catch (std::bad_alloc const&) {
res = TRI_ERROR_OUT_OF_MEMORY;
return TRI_ERROR_OUT_OF_MEMORY;
} catch (...) {
res = TRI_ERROR_INTERNAL;
}
if (res != TRI_ERROR_NO_ERROR) {
try {
removeRevision(revisionId, false);
} catch (basics::Exception const& ex) {
res = ex.code();
} catch (std::bad_alloc const&) {
res = TRI_ERROR_OUT_OF_MEMORY;
} catch (...) {
res = TRI_ERROR_INTERNAL;
}
return res;
return TRI_ERROR_INTERNAL;
}
{
// use lock
// use lock?
bool const useDeadlockDetector =
(lock && !trx->isSingleOperationTransaction());
arangodb::CollectionWriteLocker collectionLocker(this, useDeadlockDetector,
lock);
try {
// insert into indexes
res = insertDocument(trx, revisionId, doc, operation, marker,
options.waitForSync);
} catch (basics::Exception const& ex) {
res = ex.code();
} catch (std::bad_alloc const&) {
res = TRI_ERROR_OUT_OF_MEMORY;
arangodb::CollectionWriteLocker collectionLocker(this, useDeadlockDetector,
lock);
try {
// insert into indexes
res = insertDocument(trx, revisionId, doc, operation, marker,
options.waitForSync);
} catch (basics::Exception const& ex) {
res = ex.code();
} catch (std::bad_alloc const&) {
res = TRI_ERROR_OUT_OF_MEMORY;
} catch (...) {
res = TRI_ERROR_INTERNAL;
}
} catch (...) {
res = TRI_ERROR_INTERNAL;
// the collectionLocker may have thrown in its constructor...
// if it did, then we need to manually remove the revision id
// from the list of revisions
try {
removeRevision(revisionId, false);
} catch (...) {
}
throw;
}
if (res != TRI_ERROR_NO_ERROR) {
operation.revert(trx);
}
}
if (res == TRI_ERROR_NO_ERROR) {
readRevision(trx, result, revisionId);
// store the tick that was used for writing the document
resultMarkerTick = operation.tick();
}
}
return res;
}