Merge branch 'release/0.8.10'

leo-project · May 21, 2015 · 173d346 · 173d346
2 parents 775eacf + 5f55a07
commit 173d346
Show file tree

Hide file tree

Showing 17 changed files with 110 additions and 87 deletions.
diff --git a/src/savanna_commons.app.src b/src/savanna_commons.app.src
@@ -3,7 +3,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -23,7 +23,7 @@
 {application, savanna_commons,
  [
   {description, "Savanna's common library"},
-  {vsn, "0.8.9"},
+  {vsn, "0.8.10"},
   {modules, [
              savanna_commons
             ]},

diff --git a/src/savanna_commons.erl b/src/savanna_commons.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/savanna_commons_sup.erl b/src/savanna_commons_sup.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/svc_metric_server.erl b/src/svc_metric_server.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/svc_metrics_counter.erl b/src/svc_metrics_counter.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/svc_metrics_gauge.erl b/src/svc_metrics_gauge.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/svc_metrics_histogram.erl b/src/svc_metrics_histogram.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/svc_notify_behaviour.erl b/src/svc_notify_behaviour.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/svc_operate_behaviour.erl b/src/svc_operate_behaviour.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/svc_tbl_column.erl b/src/svc_tbl_column.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - Savanna Commons
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -47,23 +47,30 @@
 %% @doc Create a table of system-configutation
 %%
 create_table(Mode, Nodes) ->
-    mnesia:create_table(
-      ?TBL_COLUMNS,
-      [{Mode, Nodes},
-       {type, set},
-       {record_name, ?SV_COLUMN},
-       {attributes, record_info(fields, ?SV_COLUMN)},
-       {user_properties,
-        [{id,           tuple,   primary},
-         {schema_name,  binary,  false  },
-         {name,         binary,  false  },
-         {type,         atom,    false  },
-         {constraint,   list,    false  },
-         {updated_at,   integer, false  },
-         {created_at,   integer, false  },
-         {del,          boolean, false  }
-        ]}
-      ]).
+    case mnesia:create_table(
+           ?TBL_COLUMNS,
+           [{Mode, Nodes},
+            {type, set},
+            {record_name, ?SV_COLUMN},
+            {attributes, record_info(fields, ?SV_COLUMN)},
+            {user_properties,
+             [{id,           tuple,   primary},
+              {schema_name,  binary,  false  },
+              {name,         binary,  false  },
+              {type,         atom,    false  },
+              {constraint,   list,    false  },
+              {updated_at,   integer, false  },
+              {created_at,   integer, false  },
+              {del,          boolean, false  }
+             ]}
+           ]) of
+        {atomic, ok} ->
+            ok;
+        {aborted,{already_exists,_}} ->
+            ok;
+        {aborted,Error} ->
+            {error, Error}
+    end.
 
 %% @doc Retrieve all records
 %%

diff --git a/src/svc_tbl_metric_group.erl b/src/svc_tbl_metric_group.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - SavannaDB
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -44,22 +44,30 @@
 %% @doc Create a table of system-configutation
 %%
 create_table(Mode, Nodes) ->
-    mnesia:create_table(
-      ?TBL_NAME,
-      [{Mode, Nodes},
-       {type, set},
-       {record_name, sv_metric_group},
-       {attributes, record_info(fields, sv_metric_group)},
-       {user_properties,
-        [
-         {id,           tuple,    primary},
-         {schema_name,  binary,   false  },
-         {name,         binary,   false  },
-         {window,       integer,  false  },
-         {callback,     atom,     false  },
-         {created_at,   integer,  false  }
-        ]}
-      ]).
+    case mnesia:create_table(
+           ?TBL_NAME,
+           [{Mode, Nodes},
+            {type, set},
+            {record_name, sv_metric_group},
+            {attributes, record_info(fields, sv_metric_group)},
+            {user_properties,
+             [
+              {id,           tuple,    primary},
+              {schema_name,  binary,   false  },
+              {name,         binary,   false  },
+              {window,       integer,  false  },
+              {callback,     atom,     false  },
+              {created_at,   integer,  false  }
+             ]}
+           ]) of
+        {atomic, ok} ->
+            ok;
+        {aborted,{already_exists,_}} ->
+            ok;
+        {aborted,Error} ->
+            {error, Error}
+    end.
+
 
 %% @doc Retrieve all records
 %%

diff --git a/src/svc_tbl_schema.erl b/src/svc_tbl_schema.erl
@@ -2,7 +2,7 @@
 %%
 %% LeoProject - SavannaDB
 %%
-%% Copyright (c) 2014 Rakuten, Inc.
+%% Copyright (c) 2014-2015 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -45,18 +45,26 @@
 %% @doc Create a table of system-configutation
 %%
 create_table(Mode, Nodes) ->
-    mnesia:create_table(
-      ?TBL_NAME,
-      [{Mode, Nodes},
-       {type, set},
-       {record_name, ?SV_SCHEMA},
-       {attributes, record_info(fields, ?SV_SCHEMA)},
-       {user_properties,
-        [{name,        binary,      primary},
-         {name_string, string,      false  },
-         {created_at,  pos_integer, false  }
-        ]}
-      ]).
+    case mnesia:create_table(
+           ?TBL_NAME,
+           [{Mode, Nodes},
+            {type, set},
+            {record_name, ?SV_SCHEMA},
+            {attributes, record_info(fields, ?SV_SCHEMA)},
+            {user_properties,
+             [{name,        binary,      primary},
+              {name_string, string,      false  },
+              {created_at,  pos_integer, false  }
+             ]}
+           ]) of
+        {atomic, ok} ->
+            ok;
+        {aborted,{already_exists,_}} ->
+            ok;
+        {aborted,Error} ->
+            {error, Error}
+    end.
+
 
 %% @doc Retrieve all records
 %%

diff --git a/test/basho_bench_driver_savanna_commonse.erl b/test/basho_bench_driver_savanna_commonse.erl
@@ -45,9 +45,9 @@ new(1) ->
     folsom:start(),
     mnesia:start(),
     {ok,_Pid} = savanna_commons_sup:start_link(),
-    {atomic,ok} = svc_tbl_schema:create_table(ram_copies, [node()]),
-    {atomic,ok} = svc_tbl_column:create_table(ram_copies, [node()]),
-    {atomic,ok} = svc_tbl_metric_group:create_table(ram_copies, [node()]),
+    ok = svc_tbl_schema:create_table(ram_copies, [node()]),
+    ok = svc_tbl_column:create_table(ram_copies, [node()]),
+    ok = svc_tbl_metric_group:create_table(ram_copies, [node()]),
 
     %% create metrics
     ok = savanna_commons:create_schema(

diff --git a/test/savanna_commons_test.erl b/test/savanna_commons_test.erl
@@ -31,9 +31,9 @@ suite_test_() ->
      fun () ->
              mnesia:start(),
              {ok,_Pid} = savanna_commons_sup:start_link(),
-             {atomic,ok} = svc_tbl_schema:create_table(ram_copies, [node()]),
-             {atomic,ok} = svc_tbl_column:create_table(ram_copies, [node()]),
-             {atomic,ok} = svc_tbl_metric_group:create_table(ram_copies, [node()]),
+             ok = svc_tbl_schema:create_table(ram_copies, [node()]),
+             ok = svc_tbl_column:create_table(ram_copies, [node()]),
+             ok = svc_tbl_metric_group:create_table(ram_copies, [node()]),
              ok
      end,
      fun (_) ->
@@ -96,9 +96,9 @@ counter_metrics_1() ->
 
     mnesia:stop(),
     mnesia:start(),
-    {atomic,ok} = svc_tbl_schema:create_table(ram_copies, [node()]),
-    {atomic,ok} = svc_tbl_column:create_table(ram_copies, [node()]),
-    {atomic,ok} = svc_tbl_metric_group:create_table(ram_copies, [node()]),
+    ok = svc_tbl_schema:create_table(ram_copies, [node()]),
+    ok = svc_tbl_column:create_table(ram_copies, [node()]),
+    ok = svc_tbl_metric_group:create_table(ram_copies, [node()]),
     ok.
 
 histogram_1() ->

diff --git a/test/svc_tbl_column_test.erl b/test/svc_tbl_column_test.erl
@@ -68,21 +68,21 @@ transform() ->
                        constraint = [],
                        created_at = leo_date:now()},
 
-    {atomic,ok} = mnesia:create_table(
-                    ?TBL_COLUMNS,
-                    [{ram_copies, [node()]},
-                     {type, set},
-                     {record_name, sv_column},
-                     {attributes, record_info(fields, sv_column)},
-                     {user_properties,
-                      [{id,           tuple,       primary},
-                       {schema_name,  atom,        false  },
-                       {name,         atom,        false  },
-                       {type,         atom,        false  },
-                       {constraint,   list,        false  },
-                       {created_at,   pos_integer, false  }
-                      ]}
-                    ]),
+    {atomic, ok} = mnesia:create_table(
+                     ?TBL_COLUMNS,
+                     [{ram_copies, [node()]},
+                      {type, set},
+                      {record_name, sv_column},
+                      {attributes, record_info(fields, sv_column)},
+                      {user_properties,
+                       [{id,           tuple,       primary},
+                        {schema_name,  atom,        false  },
+                        {name,         atom,        false  },
+                        {type,         atom,        false  },
+                        {constraint,   list,        false  },
+                        {created_at,   pos_integer, false  }
+                       ]}
+                     ]),
     lists:foreach(fun(Col) ->
                           F = fun()-> mnesia:write(?TBL_COLUMNS, Col, write) end,
                           leo_mnesia:write(F)
@@ -151,7 +151,7 @@ sync() ->
                         del = false
                        },
 
-    {atomic,ok} = svc_tbl_column:create_table(ram_copies, [node()]),
+    ok = svc_tbl_column:create_table(ram_copies, [node()]),
     lists:foreach(fun(Col) ->
                           F = fun()-> mnesia:write(?TBL_COLUMNS, Col, write) end,
                           leo_mnesia:write(F)
@@ -213,7 +213,7 @@ suite() ->
                         updated_at = Now,
                         created_at = Now},
 
-    {atomic,ok} = svc_tbl_column:create_table(ram_copies, [node()]),
+    ok = svc_tbl_column:create_table(ram_copies, [node()]),
     not_found = svc_tbl_column:all(),
     not_found = svc_tbl_column:get(Col_1#?SV_COLUMN.schema_name,
                                    Col_1#?SV_COLUMN.name),

diff --git a/test/svc_tbl_metric_group_test.erl b/test/svc_tbl_metric_group_test.erl
@@ -59,7 +59,7 @@ suite() ->
                                    created_at = leo_date:now()},
 
 
-    {atomic,ok} = svc_tbl_metric_group:create_table(ram_copies, [node()]),
+    ok = svc_tbl_metric_group:create_table(ram_copies, [node()]),
     not_found = svc_tbl_metric_group:all(),
     not_found = svc_tbl_metric_group:get(MetricGrp_1#sv_metric_group.name),
 

diff --git a/test/svc_tbl_schema_test.erl b/test/svc_tbl_schema_test.erl
@@ -58,7 +58,7 @@ suite_test_() ->
 sync() ->
     mnesia:start(),
 
-    {atomic,ok} = svc_tbl_schema:create_table(ram_copies, [node()]),
+    ok = svc_tbl_schema:create_table(ram_copies, [node()]),
     Schema_1 = ?SCHEMA_1,
     Schema_2 = ?SCHEMA_2,
     Schema_3 = ?SCHEMA_3,
@@ -86,7 +86,7 @@ sync() ->
 suite() ->
     mnesia:start(),
 
-    {atomic,ok} = svc_tbl_schema:create_table(ram_copies, [node()]),
+    ok = svc_tbl_schema:create_table(ram_copies, [node()]),
     not_found = svc_tbl_schema:all(),
     not_found = svc_tbl_schema:get(?SCHEMA_1),
     not_found = svc_tbl_schema:get(?SCHEMA_2),