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

Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 

* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixing transaction-no-commit
  Fixing create collections
This commit is contained in:
Jan Christoph Uhde 2017-04-11 15:04:14 +02:00
parent 028afb782d bcea7b62b0
commit 4c4d491eac
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/RocksDBEngine/RocksDBTransactionState.cpp
View File

@ -159,6 +159,7 @@ Result RocksDBTransactionState::commitTransaction(
<< " transaction";
TRI_ASSERT(_status == transaction::Status::RUNNING);
TRI_IF_FAILURE("TransactionWriteCommitMarker") { return Result(TRI_ERROR_DEBUG); }
arangodb::Result result;

8
js/server/tests/recovery/create-collections.js
View File

@ -126,12 +126,8 @@ function recoverySuite () {
assertEqual(3, idx.length);
c = db._collection('UnitTestsRecovery2');
if (db._engine().name == "mmfiles") {
// is volatile
assertEqual(0, c.count());
} else {
assertEqual(1, c.count());
}
// isVolatile has no effect on rocksdb
assertEqual(db._engine().name == "mmfiles" ? 0 : 1, c.count());
prop = c.properties();
assertFalse(prop.waitForSync);
assertEqual(2, c.type());