aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2010-11-30 09:32:13 +0100
committerHans Bolinder <[email protected]>2010-11-30 09:32:13 +0100
commit982153fd5f403e116fa5e2f4f0206226206b46fd (patch)
tree350ce939ad30e97161d25b1f2bad10f22b1c01e3
parenta583c16d79b3a5299ce1b5482f1fb0a88d845a51 (diff)
parenta2a191f4cf18979920964f7bf81b4eb10c28ae3b (diff)
downloadotp-982153fd5f403e116fa5e2f4f0206226206b46fd.tar.gz
otp-982153fd5f403e116fa5e2f4f0206226206b46fd.tar.bz2
otp-982153fd5f403e116fa5e2f4f0206226206b46fd.zip
Merge branch 'hb/stdlib/dets_max_no_slots/OTP-8959' into dev
* hb/stdlib/dets_max_no_slots/OTP-8959: Increase default maximum number of slots of Dets tables
-rw-r--r--lib/stdlib/doc/src/dets.xml4
-rw-r--r--lib/stdlib/src/dets.hrl4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index ad100d2cf5..b002af6616 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1996</year><year>2009</year>
+ <year>1996</year><year>2010</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -816,7 +816,7 @@ ok
</item>
<item>
<p><c>{max_no_slots, no_slots()}</c>, the maximum number
- of slots that will be used. The default value is 2 M, and
+ of slots that will be used. The default value as well as
the maximal value is 32 M. Note that a higher value may
increase the fragmentation of the table, and conversely,
that a smaller value may decrease the fragmentation, at
diff --git a/lib/stdlib/src/dets.hrl b/lib/stdlib/src/dets.hrl
index 6e59770753..fbffc9d008 100644
--- a/lib/stdlib/src/dets.hrl
+++ b/lib/stdlib/src/dets.hrl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -18,7 +18,7 @@
%%
-define(DEFAULT_MIN_NO_SLOTS, 256).
--define(DEFAULT_MAX_NO_SLOTS, 2*1024*1024).
+-define(DEFAULT_MAX_NO_SLOTS, 32*1024*1024).
-define(DEFAULT_AUTOSAVE, 3). % minutes
-define(DEFAULT_CACHE, {3000, 14000}). % {delay,size} in {milliseconds,bytes}