tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Const map/set iteration.

Browse Source 
Summary: In the current state, it was not possible to iterate, or even access a const map, or const set structure because of an incorrect implementation of "ConstAccessors".

Reviewers: mislav.bradac, teon.banek, buda

Reviewed By: teon.banek, buda

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D902
This commit is contained in:
Dominik Gleich
2017-10-12 16:02:57 +02:00
parent fcecb14545
commit ebc7b2b1b9
11 changed files with 84 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/concurrent/common.hpp
View File

@@ -40,7 +40,7 @@ auto rand_gen_bool(size_t n = 1) {
// Checks for all owned keys if there data is data.
template <typename S>
void check_present_same(typename S::Accessor &acc, size_t data,
void check_present_same(typename S::template Accessor<> &acc, size_t data,
std::vector<size_t> &owned) {
for (auto num : owned) {
CHECK(acc.find(num)->second == data) << "My data is present and my";
@@ -49,7 +49,7 @@ void check_present_same(typename S::Accessor &acc, size_t data,
// Checks for all owned.second keys if there data is owned.first.
template <typename S>
void check_present_same(typename S::Accessor &acc,
void check_present_same(typename S::template Accessor<> &acc,
std::pair<size_t, std::vector<size_t>> &owned) {
check_present_same<S>(acc, owned.first, owned.second);
}
@@ -74,7 +74,7 @@ void check_size_list(S &acc, long long size) {
<< iterator_counter;
}
template <typename S>
void check_size(typename S::Accessor &acc, long long size) {
void check_size(typename S::template Accessor<> &acc, long long size) {
// check size
CHECK(acc.size() == size)
@@ -94,7 +94,7 @@ void check_size(typename S::Accessor &acc, long long size) {
// Checks if order in list is maintened. It expects map
template <typename S>
void check_order(typename S::Accessor &acc) {
void check_order(typename S::template Accessor<> &acc) {
if (acc.begin() != acc.end()) {
auto last = acc.begin()->first;
for (auto elem : acc) {
@@ -122,10 +122,9 @@ void check_set(DynamicBitset<> &db, std::vector<bool> &set) {
// Runs given function in threads_no threads and returns vector of futures for
// there
// results.
template <class R, typename S>
std::vector<std::future<std::pair<size_t, R>>> run(
size_t threads_no, S &skiplist,
std::function<R(typename S::Accessor, size_t)> f) {
template <class R, typename S, class FunT>
std::vector<std::future<std::pair<size_t, R>>> run(size_t threads_no,
S &skiplist, FunT f) {
std::vector<std::future<std::pair<size_t, R>>> futures;
for (size_t thread_i = 0; thread_i < threads_no; ++thread_i) {
@@ -181,7 +180,7 @@ std::vector<bool> collect_set(
// Returns object which tracs in owned which (key,data) where added and
// downcounts.
template <class K, class D, class S>
auto insert_try(typename S::Accessor &acc, long long &downcount,
auto insert_try(typename S::template Accessor<> &acc, long long &downcount,
std::vector<K> &owned) {
return [&](K key, D data) mutable {
if (acc.insert(key, data).second) {

1
tests/concurrent/sl_set.cpp
View File

@@ -16,6 +16,7 @@ int main(int argc, char **argv) {
auto futures =
run<std::vector<long>>(THREADS_NO, skiplist, [](auto acc, auto index) {
auto rand = rand_gen(key_range);
auto rand_op = rand_gen_bool(no_insert_for_one_delete);
long long downcount = op_per_thread;