Skip to content

Commit d468dd9

Browse files
hairyhumlukebakken
authored andcommitted
Rename ramnesia to mnevis
1 parent ed181c7 commit d468dd9

10 files changed

+25
-24
lines changed

src/gm.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ create_tables() ->
488488
create_tables([]) ->
489489
ok;
490490
create_tables([{Table, Attributes} | Tables]) ->
491-
case ramnesia:create_table(Table, Attributes) of
491+
case mnevis:create_table(Table, Attributes) of
492492
{atomic, ok} -> create_tables(Tables);
493493
{aborted, {already_exists, Table}} -> create_tables(Tables);
494494
Err -> Err
@@ -535,7 +535,7 @@ validate_members(Server, Members) ->
535535
-spec forget_group(group_name()) -> 'ok'.
536536

537537
forget_group(GroupName) ->
538-
{atomic, ok} = ramnesia:transaction(
538+
{atomic, ok} = mnevis:transaction(
539539
fun () ->
540540
mnesia:delete({?GROUP_TABLE, GroupName})
541541
end),

src/rabbit.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ recover() ->
10771077
maybe_insert_default_data() ->
10781078
case rabbit_table:needs_default_data() of
10791079
true ->
1080-
{ok, _, {_, Leader}} = ra:members(ramnesia_node:node_id()),
1080+
{ok, _, {_, Leader}} = ra:members(mnevis_node:node_id()),
10811081
case Leader == node() of
10821082
true ->
10831083
insert_default_data();

src/rabbit_amqqueue.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1509,7 +1509,7 @@ forget_all_durable(Node) ->
15091509
%% Note rabbit is not running so we avoid e.g. the worker pool. Also why
15101510
%% we don't invoke the return from rabbit_binding:process_deletions/1.
15111511
{atomic, ok} =
1512-
ramnesia:transaction(
1512+
mnevis:transaction(
15131513
fun () ->
15141514
Qs = mnesia:match_object(rabbit_durable_queue,
15151515
amqqueue:pattern_match_all(), write),

src/rabbit_connection_tracking.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ ensure_per_vhost_tracked_connections_table_for_this_node() ->
184184

185185
ensure_tracked_connections_table_for_node(Node) ->
186186
TableName = tracked_connection_table_name_for(Node),
187-
case ramnesia:create_table(TableName, [{record_name, tracked_connection},
187+
case mnevis:create_table(TableName, [{record_name, tracked_connection},
188188
{attributes, record_info(fields, tracked_connection)}]) of
189189
{atomic, ok} -> ok;
190190
{aborted, {already_exists, _}} -> ok;
@@ -198,7 +198,7 @@ ensure_tracked_connections_table_for_node(Node) ->
198198

199199
ensure_per_vhost_tracked_connections_table_for_node(Node) ->
200200
TableName = tracked_connection_per_vhost_table_name_for(Node),
201-
case ramnesia:create_table(TableName, [{record_name, tracked_connection_per_vhost},
201+
case mnevis:create_table(TableName, [{record_name, tracked_connection_per_vhost},
202202
{attributes, record_info(fields, tracked_connection_per_vhost)}]) of
203203
{atomic, ok} -> ok;
204204
{aborted, {already_exists, _}} -> ok;
@@ -225,7 +225,7 @@ clear_tracked_connection_tables_for_this_node() ->
225225

226226
delete_tracked_connections_table_for_node(Node) ->
227227
TableName = tracked_connection_table_name_for(Node),
228-
case ramnesia:delete_table(TableName) of
228+
case mnevis:delete_table(TableName) of
229229
{atomic, ok} -> ok;
230230
{aborted, {no_exists, _}} -> ok;
231231
{aborted, Error} ->
@@ -238,7 +238,7 @@ delete_tracked_connections_table_for_node(Node) ->
238238

239239
delete_per_vhost_tracked_connections_table_for_node(Node) ->
240240
TableName = tracked_connection_per_vhost_table_name_for(Node),
241-
case ramnesia:delete_table(TableName) of
241+
case mnevis:delete_table(TableName) of
242242
{atomic, ok} -> ok;
243243
{aborted, {no_exists, _}} -> ok;
244244
{aborted, Error} ->
@@ -344,7 +344,7 @@ count_connections_in(VirtualHost) ->
344344
lists:foldl(fun (Node, Acc) ->
345345
Tab = tracked_connection_per_vhost_table_name_for(Node),
346346
try
347-
N = case ramnesia:transaction(
347+
N = case mnevis:transaction(
348348
fun() ->
349349
case mnesia:dirty_read({Tab, VirtualHost}) of
350350
[] -> 0;

src/rabbit_mnesia.erl

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,15 @@ init() ->
8080
%% Create schema on all nodes
8181
ok = create_schema(),
8282

83-
ramnesia_node:start(),
84-
ramnesia_node:trigger_election(),
83+
%% TODO mnevis: node start
84+
mnevis_node:start(),
85+
mnevis_node:trigger_election(),
8586

86-
{ok, _, _} = ra:members(ramnesia_node:node_id()),
87+
{ok, _, _} = ra:members(mnevis_node:node_id()),
8788

88-
io:format("~nDb nodes ~p~n", [ramnesia:db_nodes()]),
89+
io:format("~nDb nodes ~p~n", [mnevis:db_nodes()]),
8990

90-
io:format("~nRunning Db nodes ~p~n", [ramnesia:running_db_nodes()]),
91+
io:format("~nRunning Db nodes ~p~n", [mnevis:running_db_nodes()]),
9192

9293
io:format("Get cluster status ~n"),
9394
{ok, Status} = cluster_status_from_mnesia(),
@@ -405,7 +406,7 @@ remove_node_offline_node(Node) ->
405406
%% want - we need to know the running nodes *now*. If the current node is a
406407
%% RAM node it will return bogus results, but we don't care since we only do
407408
%% this operation from disc nodes.
408-
case {ramnesia:running_db_nodes() -- [Node], node_type()} of
409+
case {mnevis:running_db_nodes() -- [Node], node_type()} of
409410
{[], disc} ->
410411
start_mnesia(),
411412
try
@@ -509,7 +510,7 @@ cluster_status_from_mnesia() ->
509510
% end,
510511
% case rabbit_table:is_present() of
511512
% true ->
512-
AllNodes = ramnesia:db_nodes(),
513+
AllNodes = mnevis:db_nodes(),
513514

514515
%% Ignoring disk node setting
515516
% DiscCopies = mnesia:table_info(schema, disc_copies),
@@ -519,7 +520,7 @@ cluster_status_from_mnesia() ->
519520
% end,
520521
%% `mnesia:system_info(running_db_nodes)' is safe since
521522
%% we know that mnesia is running
522-
RunningNodes = ramnesia:running_db_nodes(),
523+
RunningNodes = mnevis:running_db_nodes(),
523524
{ok, {AllNodes, AllNodes, RunningNodes}}
524525
% false -> {error, tables_not_present}
525526
% end

src/rabbit_mnesia_rename.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ rename_in_running_mnesia(FromNode, ToNode) ->
254254
ok.
255255

256256
transform_table(Table, Map) ->
257-
ramnesia:transaction(
257+
mnevis:transaction(
258258
fun () ->
259259
mnesia:lock({table, Table}, write),
260260
transform_table(Table, Map, mnesia:first(Table))

src/rabbit_node_monitor.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ legacy_cluster_nodes(Nodes) ->
829829
%% We get all the info that we can, including the nodes from
830830
%% mnesia, which will be there if the node is a disc node (empty
831831
%% list otherwise)
832-
lists:usort(Nodes ++ ramnesia:db_nodes()).
832+
lists:usort(Nodes ++ mnevis:db_nodes()).
833833

834834
legacy_disc_nodes(AllNodes) ->
835835
case AllNodes == [] orelse lists:member(node(), AllNodes) of

src/rabbit_table.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ensure_secondary_indexes() ->
5454
ensure_secondary_index(rabbit_queue, vhost),
5555
ok.
5656

57-
%% TODO ramnesia add table index
57+
%% TODO mnevis add table index
5858
ensure_secondary_index(Table, Field) ->
5959
case mnesia:add_table_index(Table, Field) of
6060
{atomic, ok} -> ok;

src/rabbit_upgrade_functions.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ internal_system_x() ->
418418
-spec cluster_name() -> 'ok'.
419419

420420
cluster_name() ->
421-
{atomic, ok} = ramnesia:transaction(fun cluster_name_tx/0),
421+
{atomic, ok} = mnevis:transaction(fun cluster_name_tx/0),
422422
ok.
423423

424424
cluster_name_tx() ->
@@ -656,7 +656,7 @@ transform(TableName, Fun, FieldList, NewRecordName) ->
656656
ok.
657657

658658
create(Tab, TabDef) ->
659-
{atomic, ok} = ramnesia:create_table(Tab, TabDef),
659+
{atomic, ok} = mnevis:create_table(Tab, TabDef),
660660
ok.
661661

662662
%% Dumb replacement for rabbit_exchange:declare that does not require

test/mirrored_supervisor_SUITE.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ init_per_suite(Config) ->
4848
lists:foreach(
4949
fun ({Tab, TabDef}) ->
5050
TabDef1 = proplists:delete(match, TabDef),
51-
case ramnesia:create_table(Tab, TabDef1) of
51+
case mnevis:create_table(Tab, TabDef1) of
5252
{atomic, ok} ->
5353
ok;
5454
{aborted, Reason} ->
@@ -277,7 +277,7 @@ pid_of(Id) ->
277277
Pid.
278278

279279
tx_fun(Fun) ->
280-
case ramnesia:transaction(Fun) of
280+
case mnevis:transaction(Fun) of
281281
{atomic, Result} -> Result;
282282
{aborted, Reason} -> throw({error, Reason})
283283
end.

0 commit comments

Comments
 (0)