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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Simon Grätzer 2017-03-13 13:02:55 +01:00
parent 7b35f75b23 ecfe18a6ce
commit fb560eece1
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "3rdParty/V8/v8"]
path = 3rdParty/V8/v8
url = https://github.com/arangodb-helper/v8.git
[submodule "3rdParty/rocksdb/rocksdb"]
path = 3rdParty/rocksdb/rocksdb
url = https://github.com/arangodb-helper/rocksdb.git

1
3rdParty/rocksdb/rocksdb vendored Submodule

@ -0,0 +1 @@
Subproject commit a0f4af39229ed6b567745149633d1a75c7f548d7

2
arangod/Cache/Manager.h
View File

@ -216,7 +216,7 @@ class Manager {
// friend class tasks and caches to allow access
friend class Cache;
friend class FreeMemoryTask;
friend class Metadata;
friend struct Metadata;
friend class MigrateTask;
friend class PlainCache;
friend class Rebalancer;

4
tests/Cache/TransactionsWithBackingStore.cpp
View File

@ -320,7 +320,7 @@ TEST_CASE("cache with backing store", "[cache][!hide][longRunning]") {
auto readWorker = [&store1, &store2, &storeBias, &writersDone, writerCount,
totalDocuments, readBatchSize]() -> void {
while (writersDone.load() < writerCount) {
uint32_t r = RandomGenerator::interval(99UL);
uint32_t r = RandomGenerator::interval(static_cast<uint32_t>(99UL));
TransactionalStore* store = (r <= storeBias) ? &store1 : &store2;
auto tx = store->beginTransaction(true);
uint64_t start = static_cast<uint64_t>(
@ -346,7 +346,7 @@ TEST_CASE("cache with backing store", "[cache][!hide][longRunning]") {
uint64_t batches = (upper + 1 - lower) / writeBatchSize;
uint64_t choice = lower;
for (uint64_t batch = 0; batch < batches; batch++) {
uint32_t r = RandomGenerator::interval(99UL);
uint32_t r = RandomGenerator::interval(static_cast<uint32_t>(99UL));
TransactionalStore* store = (r <= storeBias) ? &store1 : &store2;
auto tx = store->beginTransaction(false);
for (uint64_t i = 0; i < writeBatchSize; i++) {