diff options
| author | Erlang/OTP <[email protected]> | 2017-12-18 15:36:31 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-12-18 15:36:31 +0100 |
| commit | 59fbff220a6b2ac2f59eaecd480a417b4e24b8bf (patch) | |
| tree | ae7f09d131a014b2efd4fc8a9a7bb319c42817c7 | |
| parent | 3a14bb468b1f3f1f5bef3c18291fe0498429a417 (diff) | |
| parent | 1df585794e2d54a42728ba32d23e41ef3de961d1 (diff) | |
| download | otp-59fbff220a6b2ac2f59eaecd480a417b4e24b8bf.tar.gz otp-59fbff220a6b2ac2f59eaecd480a417b4e24b8bf.tar.bz2 otp-59fbff220a6b2ac2f59eaecd480a417b4e24b8bf.zip | |
Merge branch 'dgud/mnesia/slow-startup/OTP-14829' into maint-20
* dgud/mnesia/slow-startup/OTP-14829:
mnesia: Read schema user properties directly
| -rw-r--r-- | lib/mnesia/src/mnesia_schema.erl | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl index 83cc19c678..71952af31c 100644 --- a/lib/mnesia/src/mnesia_schema.erl +++ b/lib/mnesia/src/mnesia_schema.erl @@ -952,19 +952,9 @@ get_index_plugins() -> get_schema_user_property(mnesia_index_plugins). get_schema_user_property(Key) -> - Tab = schema, - %% Must work reliably both within transactions and outside of transactions - Res = case get(mnesia_activity_state) of - undefined -> - dirty_read_table_property(Tab, Key); - _ -> - do_read_table_property(Tab, Key) - end, - case Res of - undefined -> - []; - {_, Types} -> - Types + case dirty_read_table_property(schema, Key) of + undefined -> []; + {_, Types} -> Types end. get_ext_types_disc() -> |