aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mnesia
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-12-15 16:03:30 +0100
committerErlang/OTP <[email protected]>2017-12-15 16:03:30 +0100
commitcb45b92217dd06dbba3762059da56ecac9be600b (patch)
tree65ac68d1020307587900d9ac65200a592bd80220 /lib/mnesia
parenteb196bf31e9e387d02bca50eaf4542525a7582ae (diff)
parent1df585794e2d54a42728ba32d23e41ef3de961d1 (diff)
downloadotp-cb45b92217dd06dbba3762059da56ecac9be600b.tar.gz
otp-cb45b92217dd06dbba3762059da56ecac9be600b.tar.bz2
otp-cb45b92217dd06dbba3762059da56ecac9be600b.zip
Merge branch 'dgud/mnesia/slow-startup/OTP-14829' into maint-19
* dgud/mnesia/slow-startup/OTP-14829: mnesia: Read schema user properties directly
Diffstat (limited to 'lib/mnesia')
-rw-r--r--lib/mnesia/src/mnesia_schema.erl16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index 0e4017e4c3..bb5e38f7c1 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() ->