File 0002-committing-added-changes.patch of Package jc
From 6e779cd699e11bad7495f0839a425b327e49acd1 Mon Sep 17 00:00:00 2001
From: "Rosenblum, Jim" <jim.rosenblum@gmail.com>
Date: Tue, 10 Oct 2017 09:19:05 -0700
Subject: [PATCH] committing added changes
---
.gitignore | 6 ++++++
src/jc_cluster.erl | 2 +-
src/jc_store.erl | 9 +++------
test/jc_SUITE.erl | 10 ++++++----
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index d9f4a4a..f0c461f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,9 @@ rel/jc
target
*.gz
_build
+*.html
+*.css
+*.js
+variables-ct
+test/ct_run.ct@c4b301cb0a29.2017-10-09_19.10.46
+variables-ct@c4b301cb0a29
diff --git a/src/jc_cluster.erl b/src/jc_cluster.erl
index 146a69f..fc11510 100644
--- a/src/jc_cluster.erl
+++ b/src/jc_cluster.erl
@@ -179,7 +179,7 @@ dynamic_db_init([]) ->
mnesia:create_table(key_to_value,
[{attributes, record_info(fields, key_to_value)},
- {type, ordered_set},
+ {type, set},
{index, [map, key, ref, create_tm]}
]),
mnesia:create_table(seq,
diff --git a/src/jc_store.erl b/src/jc_store.erl
index 4fcbf9b..78b2ea5 100644
--- a/src/jc_store.erl
+++ b/src/jc_store.erl
@@ -130,12 +130,9 @@ maps() ->
-spec clear(map_name()) -> ok.
clear(Map) ->
- F = fun() ->
- Items = mnesia:index_read(key_to_value, Map, #key_to_value.map),
- [mnesia:delete_object(Rec) || Rec <- Items],
- mnesia:delete({seq, Map})
- end,
- mnesia:sync_dirty(F),
+ Items = mnesia:index_read(key_to_value, Map, #key_to_value.map),
+ [mnesia:delete_object(Rec) || Rec <- Items],
+ mnesia:delete({seq, Map}),
ok.
diff --git a/test/jc_SUITE.erl b/test/jc_SUITE.erl
index 898cf35..352d47b 100644
--- a/test/jc_SUITE.erl
+++ b/test/jc_SUITE.erl
@@ -388,9 +388,9 @@ put_all_test(_Config)->
{ok, 100} = bridge({put_all, bed, KVs, 2}),
{ok, TestVs} = bridge({values, bed}),
- lists:sort(Vs) == lists:sort(TestVs),
+ true = (lists:sort(Vs) == lists:sort(TestVs)),
{ok, TestKs} = bridge({key_set, bed}),
- lists:sort(Ks) == lists:sort(TestKs),
+ true = (lists:sort(Ks) == lists:sort(TestKs)),
timer:sleep(2100),
{ok, {[], M}} = bridge({get_all, bed, Ks}),
@@ -754,7 +754,8 @@ remove_items_test(_config) ->
{ok,3} = jc:put_all(bed, [{1, one},{2, two},{3, three}]),
{ok,[{1,one}]} = bridge({remove_items, bed, [1, 22]}),
{ok, []} = bridge({remove_items, bed, [1, 22]}),
- {ok, [2,3]} = jc:key_set(bed),
+ {ok, Result} = jc:key_set(bed),
+ [2,3] = lists:sort(Result),
{ok,[{3, three}, {2, two}]} = bridge({remove_items, bed, [2, 3, 3, 4]}),
{records, 0} = jc:map_size(bed),
jc:flush(),
@@ -762,7 +763,8 @@ remove_items_test(_config) ->
{ok,3} = jc_s:put_all(bed, [{1, one},{2, two},{3, three}], 10),
{ok,[{1,one}]} = bridge({remove_items_s, bed, [1, 22], 11}),
{ok, []} = bridge({remove_items_s, bed, [1, 22], 12}),
- {ok, [2,3]} = jc:key_set(bed),
+ {ok, Result} = jc:key_set(bed),
+ true = ([2,3] == lists:sort(Result)),
{error, out_of_seq} = bridge({remove_items_s, bed, [2, 3, 3, 4], 1}),
{ok,[{3, three}, {2, two}]} = bridge({remove_items_s, bed, [2, 3, 3, 4], 111}),
{records, 0} = jc:map_size(bed).
--
2.16.3