Merge 'origin/replicator', closes #16
Conflicts:
src/mem3_rep_manager.erl
src/mem3_sup.erl
src/mem3_util.erl
Case 13884
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/e54ae8d5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/e54ae8d5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/e54ae8d5
Branch: refs/heads/import
Commit: e54ae8d527b69332b85747d2315c7d857c1b9604
Parents: cd7c32a 1fdae28
Author: Adam Kocoloski <[email protected]>
Authored: Wed Jun 6 15:51:58 2012 -0400
Committer: Adam Kocoloski <[email protected]>
Committed: Wed Jun 6 15:51:58 2012 -0400
----------------------------------------------------------------------
src/mem3_rep_manager.erl | 626 ------------------------------------------
src/mem3_sup.erl | 3 +-
src/mem3_util.erl | 10 +
3 files changed, 11 insertions(+), 628 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/e54ae8d5/src/mem3_sup.erl
----------------------------------------------------------------------
diff --cc src/mem3_sup.erl
index bad651a,0587ebc..ae38d7d
--- a/src/mem3_sup.erl
+++ b/src/mem3_sup.erl
@@@ -22,11 -22,9 +22,10 @@@ start_link() -
init(_Args) ->
Children = [
child(mem3_events),
- child(mem3_cache),
child(mem3_nodes),
- child(mem3_sync)
+ child(mem3_sync_nodes), % Order important?
+ child(mem3_sync),
- child(mem3_shards),
- child(mem3_rep_manager)
++ child(mem3_shards)
],
{ok, {{one_for_one,10,1}, Children}}.
http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/e54ae8d5/src/mem3_util.erl
----------------------------------------------------------------------
diff --cc src/mem3_util.erl
index 27f67bc,0aa598c..d733006
--- a/src/mem3_util.erl
+++ b/src/mem3_util.erl
@@@ -16,7 -16,8 +16,8 @@@
-export([hash/1, name_shard/2, create_partition_map/5, build_shards/2,
n_val/2, z_val/3, to_atom/1, to_integer/1, write_db_doc/1,
delete_db_doc/1,
- load_shards_from_disk/1, load_shards_from_disk/2, shard_info/1,
- ensure_exists/1, open_db_doc/1, owner/2]).
+ shard_info/1, ensure_exists/1, open_db_doc/1]).
++-export([owner/2]).
-export([create_partition_map/4, name_shard/1]).
-deprecated({create_partition_map, 4, eventually}).
