diff options
author | Dan Gudmundsson <[email protected]> | 2016-11-17 09:58:38 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2016-11-17 09:58:38 +0100 |
commit | cac366df413a145ee1d75539be608128595af016 (patch) | |
tree | 116ccea3bd68f73986d0462597b46ecf32559bc9 /lib/mnesia/src/mnesia_lib.erl | |
parent | 1c000086275c06596ad402081be12ef95db6ea40 (diff) | |
parent | 98dc4f8c225982cca0bc1fd221167ee9f4031547 (diff) | |
download | otp-cac366df413a145ee1d75539be608128595af016.tar.gz otp-cac366df413a145ee1d75539be608128595af016.tar.bz2 otp-cac366df413a145ee1d75539be608128595af016.zip |
Merge branch 'richcarl/mnesia/mnesia-ext-dont-wrap-cont/PR-1240/OTP-14039'
* richcarl/mnesia/mnesia-ext-dont-wrap-cont/PR-1240/OTP-14039:
Don't wrap continuations from mnesia_ext backends
Diffstat (limited to 'lib/mnesia/src/mnesia_lib.erl')
-rw-r--r-- | lib/mnesia/src/mnesia_lib.erl | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl index 10e232c800..1fdc656600 100644 --- a/lib/mnesia/src/mnesia_lib.erl +++ b/lib/mnesia/src/mnesia_lib.erl @@ -1192,25 +1192,15 @@ db_select(Storage, Tab, Pat) -> end. db_select_init({ext, Alias, Mod}, Tab, Pat, Limit) -> - case Mod:select(Alias, Tab, Pat, Limit) of - {Matches, Continuation} when is_list(Matches) -> - {Matches, {Alias, Continuation}}; - R -> - R - end; + Mod:select(Alias, Tab, Pat, Limit); db_select_init(disc_only_copies, Tab, Pat, Limit) -> dets:select(Tab, Pat, Limit); db_select_init(_, Tab, Pat, Limit) -> ets:select(Tab, Pat, Limit). -db_select_cont({ext, Alias, Mod}, Cont0, Ms) -> +db_select_cont({ext, _Alias, Mod}, Cont0, Ms) -> Cont = Mod:repair_continuation(Cont0, Ms), - case Mod:select(Cont) of - {Matches, Continuation} when is_list(Matches) -> - {Matches, {Alias, Continuation}}; - R -> - R - end; + Mod:select(Cont); db_select_cont(disc_only_copies, Cont0, Ms) -> Cont = dets:repair_continuation(Cont0, Ms), dets:select(Cont); |