kvs

synrc · Sep 3, 2016 · 567b3cf · 567b3cf
1 parent c6801f4
commit 567b3cf
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 52 deletions.
diff --git a/include/acl.hrl b/include/acl.hrl
@@ -6,9 +6,9 @@
 -record(acl, {?CONTAINER}).
 
 -record(access, {?ITERATOR(acl),
-        entry_id,
-        acl_id,
-        accessor,
-        action}).
+        entry_id=[],
+        acl_id=[],
+        accessor=[],
+        action=[]}).
 
 -endif.
diff --git a/include/comment.hrl b/include/comment.hrl
@@ -4,12 +4,12 @@
 -include("kvs.hrl").
 
 -record(comment, {?ITERATOR(feed), % {comment_id, entry_id, feed_id}
-        comment_id,
-        entry_id,
-        content,
-        from,
-        created,
+        comment_id=[],
+        entry_id=[],
+        content=[],
+        from=[],
+        created=[],
         media = [],
-        parent}).
+        parent=[]}).
 
 -endif.
diff --git a/include/config.hrl b/include/config.hrl
@@ -1,7 +1,7 @@
 -ifndef(CONFIG_HRL).
 -define(CONFIG_HRL, true).
 
--record(config, {key, value}).
+-record(config, {key, value=[]}).
 
 -define(DBA, kvs:config(dba)).
 -define(MQ, (kvs:config(kvs,mq,kvs))).

diff --git a/include/entry.hrl b/include/entry.hrl
@@ -4,18 +4,16 @@
 -include("kvs.hrl").
 
 -record(entry, {?ITERATOR(feed), % {entry_id, feed_id}
-        entry_id,
-        from,
-        to,
-        title,
-        description,
-        created,
-        hidden,
-        access,
-        shared,
-        starred,
-        deleted,
+        entry_id=[],
+        from=[],
+        to=[],
+        title=[],
+        description=[],
+        created=[],
+        access=[],
+        shared=[],
+        starred=[],
         media = [],
-        type = {user, normal}}).
+        type = []}).
 
 -endif.
diff --git a/include/group.hrl b/include/group.hrl
@@ -4,13 +4,13 @@
 -include("kvs.hrl").
 
 -record(group,{?ITERATOR(feed),
-        name,
-        description,
-        scope :: public | private,
-        creator,
-        created,
-        owner,
-        users_count = 0 :: integer(),
+        name=[],
+        description=[],
+        scope=[],
+        creator=[],
+        created=[],
+        owner=[],
+        users_count = 0,
         entries_count = 0}).
 
 -endif.
diff --git a/include/kvs.hrl b/include/kvs.hrl
@@ -6,10 +6,10 @@
 
 -record(id_seq,    {thing, id}).
 -record(container, {?CONTAINER}).
--record(iterator,  {?ITERATOR(undefined)}).
+-record(iterator,  {?ITERATOR([])}).
 -record(block,     {left,right,name,last}).
 -record(log,       {?CONTAINER, name, acc}).
--record(operation, {?ITERATOR(log), body, name, status}).
+-record(operation, {?ITERATOR(log), body=[], name=[], status=[]}).
 -record(kvs,       {mod,cx}).
 
 -compile({no_auto_import,[put/2]}).

diff --git a/include/subscription.hrl b/include/subscription.hrl
@@ -2,12 +2,12 @@
 -define(SUBSCRIPTION_HRL, true).
 
 -record(subscription,{
-        key,
-        who,
-        whom,
-        what,
-        how,
-        date,
-        note}).
+        key=[],
+        who=[],
+        whom=[],
+        what=[],
+        how=[],
+        date=[],
+        note=[]}).
 
 -endif.
diff --git a/src/kvs.erl b/src/kvs.erl
@@ -42,13 +42,13 @@ generation(Table,Key) ->
 norm({A,B},Table,Key) -> A:B(Table,Key);
 norm(_,Table,Key)     -> limit(Table,Key).
 
-limit(user,_Key)       -> 2;
-limit(comment,_Key)    -> 2;
-limit(_Table,_Key)     -> 250000.
+limit(user,_Key)       -> 25000;
+limit(comment,_Key)    -> 25000;
+limit(_Table,_Key)     -> 25000.
 
-forbid(user)           -> 3;
-forbid(comment)        -> 3;
-forbid(____)           -> 100000.
+forbid(user)           -> 5;
+forbid(comment)        -> 5;
+forbid(____)           -> 5.
 
 % Implementation
 
@@ -347,9 +347,11 @@ rotate(Table) ->
     Ranges = kvs:config(Table),
     {M,F} = application:get_env(kvs,forbidding,{?MODULE,forbid}),
     New = lists:sublist(Ranges,M:F(Table)),
+
     Delete = Ranges -- New,
-    [ mnesia:change_table_copy_type(Name, node(), disc_only_copies) || #block{name=Name}
-        <- shd(Delete) ],
+    io:format("Delete: ~p~n",[Delete]),
+%    [ mnesia:change_table_copy_type(Name, node(), disc_only_copies) || #block{name=Name} <- shd(Delete) ],
+    [ mnesia:delete_table(Name) || #block{name=Name} <- Delete ],
     rotate(kvs:table(Table)), ok.
 load_partitions()  ->
     [ case kvs:get(config,Table) of
@@ -386,10 +388,12 @@ fold_tables()  -> lists:foldl(fun(#table{name=X},Acc) ->
                   [], kvs:tables()).
 range(L,R,Name) -> #block{left=L,right=R,name=Name,last=last_table(rname(Name))}.
 update_config(Table,Name) ->
-    kvs:put(#config{key   = Table,
-                    value = store(Table,case kvs:get(config,Table)  of
+    Store = store(Table,case kvs:get(config,Table)  of
                                             {error,not_found}        -> update_list(Table,[],Name);
-                                            {ok,#config{value=List}} -> update_list(Table,List,Name) end)}).
+                                            {ok,#config{value=List}} -> update_list(Table,List,Name) end),
+%    {M,F} = application:get_env(kvs,forbidding,{?MODULE,forbid}),
+    New = Store, %lists:sublist(Store,M:F(Table)),
+    kvs:put(#config{key = Table, value = New }).
 
 update_list(Table,[],Name)                    -> [ range(top(Table)+1,limit(),Name) ];
 update_list(Table,[#block{}=CI|Tail],Name)    -> [ range(top(Table)+1,limit(),Name) ] ++
@@ -405,6 +409,6 @@ test() -> test(#user{}).
 test(Proto) ->
     kvs:join(),
     Table = element(1,Proto),
-    [ kvs:add(setelement(2,Proto,kvs:next_id(Table,1))) || _ <- lists:seq(1,20) ],
+    [ kvs:add(setelement(2,Proto,kvs:next_id(Table,1))) || _ <- lists:seq(1,20000) ],
     io:format("Config: ~p~n",[kvs:all(config)]),
-    io:format("Fetch: ~p~n",[kvs:entries(kvs:get(feed,Table),Table,infinity)]).
+    io:format("Fetch: ~p~n",[kvs:entries(kvs:get(feed,Table),Table,10)]).