diff options
| author | Ulf Wiger <[email protected]> | 2015-11-05 14:38:30 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-05-09 14:52:11 +0200 |
| commit | 8015bd895687fc021e3861be2abdc8370a31db73 (patch) | |
| tree | d3a880e357490b63099f4e4bf81d09a06cd48529 /lib/mnesia/src/mnesia_controller.erl | |
| parent | 22a1b438a34fcdf6d36019981fa303d8a5162500 (diff) | |
| download | otp-8015bd895687fc021e3861be2abdc8370a31db73.tar.gz otp-8015bd895687fc021e3861be2abdc8370a31db73.tar.bz2 otp-8015bd895687fc021e3861be2abdc8370a31db73.zip | |
mnesia_ext: Add ext copies to records
Diffstat (limited to 'lib/mnesia/src/mnesia_controller.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_controller.erl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl index 69ccc1d2c9..7300c8c648 100644 --- a/lib/mnesia/src/mnesia_controller.erl +++ b/lib/mnesia/src/mnesia_controller.erl @@ -385,6 +385,8 @@ force_load_table(Tab) when is_atom(Tab), Tab /= schema -> do_force_load_table(Tab); disc_only_copies -> do_force_load_table(Tab); + {ext, _, _} -> + do_force_load_table(Tab); unknown -> set({Tab, load_by_force}, true), cast({force_load_updated, Tab}), @@ -1533,8 +1535,8 @@ update_whereabouts(Tab, Node, State) -> Storage == unknown -> %% No own copy, continue to read remotely add_active_replica(Tab, Node), - NodeST = mnesia_lib:storage_type_at_node(Node, Tab), - ReadST = mnesia_lib:storage_type_at_node(Read, Tab), + NodeST = mnesia_lib:semantics(mnesia_lib:storage_type_at_node(Node, Tab), storage), + ReadST = mnesia_lib:semantics(mnesia_lib:storage_type_at_node(Read, Tab), storage), if %% Avoid reading from disc_only_copies NodeST == disc_only_copies -> ignore; @@ -1588,6 +1590,7 @@ last_consistent_replica(Tab, Downs) -> Ram = Cs#cstruct.ram_copies, Disc = Cs#cstruct.disc_copies, DiscOnly = Cs#cstruct.disc_only_copies, + Ext = Cs#cstruct.external_copies, BetterCopies0 = mnesia_lib:remote_copy_holders(Cs) -- Downs, BetterCopies = BetterCopies0 -- Ram, AccessMode = Cs#cstruct.access_mode, @@ -1620,7 +1623,7 @@ last_consistent_replica(Tab, Downs) -> false; Storage == ram_copies -> if - Disc == [], DiscOnly == [] -> + Disc == [], DiscOnly == [], Ext == [] -> %% Nobody has copy on disc {true, {Tab, ram_only}}; true -> @@ -1865,6 +1868,11 @@ info([Tab | Tail]) -> dets:info(Tab, size), dets:info(Tab, file_size), "bytes on disc"); + {ext, Alias, Mod} -> + info_format(Tab, + Mod:info(Alias, Tab, size), + Mod:info(Alias, Tab, memory), + "words of mem"); _ -> info_format(Tab, ?ets_info(Tab, size), |