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

Bug fix/allow creating foxx queues inside transactions (#8339) 

* allow creating a foxx queue from within a transaction

* added tests
This commit is contained in:
Jan 2019-03-07 14:28:39 +01:00 committed by GitHub
parent e28b908bbe
commit 9f9426e36c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/V8Server/v8-dispatcher.cpp
View File

@ -357,7 +357,7 @@ static void JS_CreateQueue(v8::FunctionCallbackInfo<v8::Value> const& args) {
LOG_TOPIC(TRACE, Logger::FIXME) << "Adding queue " << key; LOG_TOPIC(TRACE, Logger::FIXME) << "Adding queue " << key;
ExecContextScope exscope(ExecContext::superuser()); ExecContextScope exscope(ExecContext::superuser());
auto ctx = transaction::V8Context::Create(*vocbase, false); auto ctx = transaction::V8Context::Create(*vocbase, true);
SingleCollectionTransaction trx(ctx, "_queues", AccessMode::Type::EXCLUSIVE); SingleCollectionTransaction trx(ctx, "_queues", AccessMode::Type::EXCLUSIVE);
Result res = trx.begin(); Result res = trx.begin();
@ -410,7 +410,7 @@ static void JS_DeleteQueue(v8::FunctionCallbackInfo<v8::Value> const& args) {
LOG_TOPIC(TRACE, Logger::FIXME) << "Removing queue " << key; LOG_TOPIC(TRACE, Logger::FIXME) << "Removing queue " << key;
ExecContextScope exscope(ExecContext::superuser()); ExecContextScope exscope(ExecContext::superuser());
auto ctx = transaction::V8Context::Create(*vocbase, false); auto ctx = transaction::V8Context::Create(*vocbase, true);
SingleCollectionTransaction trx(ctx, "_queues", AccessMode::Type::WRITE); SingleCollectionTransaction trx(ctx, "_queues", AccessMode::Type::WRITE);
trx.addHint(transaction::Hints::Hint::SINGLE_OPERATION); trx.addHint(transaction::Hints::Hint::SINGLE_OPERATION);
Result res = trx.begin(); Result res = trx.begin();

2
arangod/V8Server/v8-replication.cpp
View File

@ -147,7 +147,7 @@ static void JS_LastLoggerReplication(v8::FunctionCallbackInfo<v8::Value> const&
TRI_V8_THROW_EXCEPTION_USAGE("tickStart < tickEnd"); TRI_V8_THROW_EXCEPTION_USAGE("tickStart < tickEnd");
} }
auto transactionContext = transaction::V8Context::Create(vocbase, false); auto transactionContext = transaction::V8Context::Create(vocbase, true);
auto builderSPtr = std::make_shared<VPackBuilder>(); auto builderSPtr = std::make_shared<VPackBuilder>();
Result res = EngineSelectorFeature::ENGINE->lastLogger(vocbase, transactionContext, Result res = EngineSelectorFeature::ENGINE->lastLogger(vocbase, transactionContext,
tickStart, tickEnd, builderSPtr); tickStart, tickEnd, builderSPtr);

24
tests/js/server/shell/shell-foxx-queues.js
View File

@ -54,6 +54,30 @@ function foxxQueuesSuite () {
queues.delete(qn); queues.delete(qn);
}, },
testCreateQueueInsideTransactionNoCollectionDeclaration : function () {
try {
db._executeTransaction({
collections: {},
action: function() {
queues.create(qn);
}
});
fail();
} catch (err) {
assertEqual(internal.errors.ERROR_TRANSACTION_UNREGISTERED_COLLECTION.code, err.errorNum);
}
},
testCreateQueueInsideTransactionWithCollectionDeclaration : function () {
db._executeTransaction({
collections: { write: ["_queues"] },
action: function() {
queues.create(qn);
}
});
assertEqual([], queues.get(qn).all());
},
testCreateEmptyQueue : function () { testCreateEmptyQueue : function () {
var queue = queues.create(qn); var queue = queues.create(qn);
assertEqual([], queue.all()); assertEqual([], queue.all());