From 2426e3deac1527c537cf1d36c5cd52ed6889e740 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Mon, 8 Jun 2015 18:43:13 +0200
Subject: stdlib: Fix ets_SUITE:tabfile_ext4

for hosts with long names.
---
 lib/stdlib/test/ets_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index fff6b11a38..d5bf0e4c90 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -4319,7 +4319,7 @@ tabfile_ext4(Config) when is_list(Config) ->
 	       {error,Y} = ets:file2tab(FName,[{verify,true}]),
 	       ets:tab2file(TL,FName,[{extended_info,[md5sum]}]),
 	       {X,Y}
-	   end || N <- lists:seq(400,500) ],
+	   end || N <- lists:seq(500,600) ],
     io:format("~p~n",[Res]),
     file:delete(FName),
     ok.
-- 
cgit v1.2.3


From 71a78935f6c343cf07a623f1ea2b5457e37e9176 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Mon, 15 Jun 2015 11:47:54 +0200
Subject: stdlib: Make ets:file2tab preserve read/write_concurrency

---
 lib/stdlib/src/ets.erl        | 28 +++++++++++++++++++---------
 lib/stdlib/test/ets_SUITE.erl | 13 ++++++++++---
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 0e2d59d0c3..bec64861c3 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -1308,18 +1308,30 @@ create_tab(I, TabArg) ->
     {name, Name} = lists:keyfind(name, 1, I),
     {type, Type} = lists:keyfind(type, 1, I),
     {protection, P} = lists:keyfind(protection, 1, I),
-    {named_table, Val} = lists:keyfind(named_table, 1, I),
     {keypos, _Kp} = Keypos = lists:keyfind(keypos, 1, I),
     {size, Sz} = lists:keyfind(size, 1, I),
-    Comp = case lists:keyfind(compressed, 1, I) of
-	{compressed, true} -> [compressed];
-	{compressed, false} -> [];
-	false -> []
-    end,
+    L1 = [Type, P, Keypos],
+    L2 = case lists:keyfind(named_table, 1, I) of
+             {named_table, true} -> [named_table | L1];
+	     {named_table, false} -> L1
+	 end,
+    L3 = case lists:keyfind(compressed, 1, I) of
+	     {compressed, true} -> [compressed | L2];
+	     {compressed, false} -> L2;
+	     false -> L2
+	 end,
+    L4 = case lists:keyfind(write_concurrency, 1, I) of
+	     {write_concurrency, _}=Wcc -> [Wcc | L3];
+	     _ -> L3
+	 end,
+    L5 = case lists:keyfind(read_concurrency, 1, I) of
+	     {read_concurrency, _}=Rcc -> [Rcc | L4];
+	     false -> L4
+	 end,
     case TabArg of
         [] ->
 	    try
-		Tab = ets:new(Name, [Type, P, Keypos] ++ named_table(Val) ++ Comp),
+		Tab = ets:new(Name, L5),
 		{ok, Tab, Sz}
 	    catch _:_ ->
 		throw(cannot_create_table)
@@ -1328,8 +1340,6 @@ create_tab(I, TabArg) ->
             {ok, TabArg, Sz}
     end.
 
-named_table(true) -> [named_table];
-named_table(false) -> [].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% tabfile_info/1 reads the head information in an ets table dumped to
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index d5bf0e4c90..92c1c07e6d 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -4088,8 +4088,11 @@ tab2file(Config) when is_list(Config) ->
 
 tab2file_do(FName, Opts) ->
     %% Write an empty ets table to a file, read back and check properties.
-    ?line Tab = ets_new(ets_SUITE_foo_tab, [named_table, set, private,
-					    {keypos, 2}]),
+    ?line Tab = ets_new(ets_SUITE_foo_tab, [named_table, set, public,
+					    {keypos, 2},
+					    compressed,
+					    {write_concurrency,true},
+					    {read_concurrency,true}]),
     catch file:delete(FName),
     Res = ets:tab2file(Tab, FName, Opts),
     true = ets:delete(Tab),
@@ -4097,10 +4100,14 @@ tab2file_do(FName, Opts) ->
     %
     ?line EtsMem = etsmem(),
     ?line {ok, Tab2} = ets:file2tab(FName),
-    ?line private = ets:info(Tab2, protection),
+    public = ets:info(Tab2, protection),
     ?line true = ets:info(Tab2, named_table),
     ?line 2 = ets:info(Tab2, keypos),
     ?line set = ets:info(Tab2, type),
+    true = ets:info(Tab2, compressed),
+    Smp = erlang:system_info(smp_support),
+    Smp = ets:info(Tab2, read_concurrency),
+    Smp = ets:info(Tab2, write_concurrency),
     ?line true = ets:delete(Tab2),
     ?line verify_etsmem(EtsMem).
 
-- 
cgit v1.2.3