From 48c8fde34591f782be7af77575eaa02dab8659b3 Mon Sep 17 00:00:00 2001
From: Adam Kocoloski <adam@cloudant.com>
Date: Wed, 30 Jun 2010 16:23:38 -0400
Subject: standardize mem3 naming.  app is horribly broken for now

---
 include/mem3.hrl       | 44 ++++++++++++++++++++++++++++++++++++++++++++
 include/membership.hrl | 44 --------------------------------------------
 include/profile.hrl    |  9 ---------
 3 files changed, 44 insertions(+), 53 deletions(-)
 create mode 100644 include/mem3.hrl
 delete mode 100644 include/membership.hrl
 delete mode 100644 include/profile.hrl

(limited to 'include')

diff --git a/include/mem3.hrl b/include/mem3.hrl
new file mode 100644
index 00000000..a1e6f822
--- /dev/null
+++ b/include/mem3.hrl
@@ -0,0 +1,44 @@
+-define(MEMBERSHIP, true).
+
+-ifndef(FABRIC).
+-include("../../fabric/include/fabric.hrl").
+-endif.
+
+-ifndef(COUCH).
+-include("../../couch/src/couch_db.hrl").
+-endif.
+
+-include_lib("eunit/include/eunit.hrl").
+
+%% version 3 of membership state
+-record(mem, {header=3,
+              nodes=[],
+              clock=[],
+              args
+             }).
+
+%% partition record
+-record(shard, {name, node, dbname, range, ref}).
+
+%% types
+-type join_type() :: init | join | replace | leave.
+-type join_order() :: non_neg_integer().
+-type options() :: list().
+-type mem_node() :: {join_order(), node(), options()}.
+-type mem_node_list() :: [mem_node()].
+-type arg_options() :: {test, boolean()}.
+-type args() :: [] | [arg_options()].
+-type mem_state() :: #mem{}.
+-type test() :: undefined | node().
+-type epoch() :: float().
+-type clock() :: {node(), epoch()}.
+-type vector_clock() :: [clock()].
+-type ping_node() :: node() | nil.
+-type gossip_fun() :: call | cast.
+
+-type part() :: #shard{}.
+-type fullmap() :: [part()].
+-type ref_part_map() :: {reference(), part()}.
+-type tref() :: reference().
+-type np() :: {node(), part()}.
+-type beg_acc() :: [integer()].
diff --git a/include/membership.hrl b/include/membership.hrl
deleted file mode 100644
index a1e6f822..00000000
--- a/include/membership.hrl
+++ /dev/null
@@ -1,44 +0,0 @@
--define(MEMBERSHIP, true).
-
--ifndef(FABRIC).
--include("../../fabric/include/fabric.hrl").
--endif.
-
--ifndef(COUCH).
--include("../../couch/src/couch_db.hrl").
--endif.
-
--include_lib("eunit/include/eunit.hrl").
-
-%% version 3 of membership state
--record(mem, {header=3,
-              nodes=[],
-              clock=[],
-              args
-             }).
-
-%% partition record
--record(shard, {name, node, dbname, range, ref}).
-
-%% types
--type join_type() :: init | join | replace | leave.
--type join_order() :: non_neg_integer().
--type options() :: list().
--type mem_node() :: {join_order(), node(), options()}.
--type mem_node_list() :: [mem_node()].
--type arg_options() :: {test, boolean()}.
--type args() :: [] | [arg_options()].
--type mem_state() :: #mem{}.
--type test() :: undefined | node().
--type epoch() :: float().
--type clock() :: {node(), epoch()}.
--type vector_clock() :: [clock()].
--type ping_node() :: node() | nil.
--type gossip_fun() :: call | cast.
-
--type part() :: #shard{}.
--type fullmap() :: [part()].
--type ref_part_map() :: {reference(), part()}.
--type tref() :: reference().
--type np() :: {node(), part()}.
--type beg_acc() :: [integer()].
diff --git a/include/profile.hrl b/include/profile.hrl
deleted file mode 100644
index 2ffd8009..00000000
--- a/include/profile.hrl
+++ /dev/null
@@ -1,9 +0,0 @@
--ifdef(PROF).
--define(balance_prof, dynomite_prof:balance_prof()).
--define(prof(Label), dynomite_prof:start_prof(Label)).
--define(forp(Label), dynomite_prof:stop_prof(Label)).
--else.
--define(prof(Label), true).
--define(forp(Label), true).
--define(balance_prof, true).
--endif.
-- 
cgit v1.2.3