Skip to content

Commit b0f725b

Browse files
ShpakyShpaky
authored
Merge pull request #53 from Shpaky/v2.2.1
'ETS_PIDS_TABLE_NAME' and 'ETS_KEYS_TABLE_NAME' macroses to accordanc…
2 parents ed133c8 + cf2e7fc commit b0f725b

9 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ max key size
310310
-define(PREFIX_KEY,"lfu___").
311311
-define(POSTFIX_KEY,"__lfu").
312312

313-
-define(ETS_PIDS_TABLE_NAME,lfu_pid).
314-
-define(ETS_KEYS_TABLE_NAME,lfu_key).
313+
-define(ETS_PIDS_STORE_TABLE_NAME,lfu_pid).
314+
-define(ETS_KEYS_STORE_TABLE_NAME,lfu_key).
315315

316316
-define(ETS_KEYS_FETCH_TABLE_NAME,lfu_key_fetch).
317317
-define(ETS_KEYS_FETCH_TABLE_OPTS,[
@@ -406,11 +406,11 @@ The prefix key for service name of key for to store process counter pids in 'lfu
406406

407407
The postfix key for service name of key for to store process counter pids in 'lfu_key' ets.
408408

409-
#### ETS_PIDS_TABLE_NAME
409+
#### ETS_PIDS_STORE_TABLE_NAME
410410

411411
The ets for to store process counter pids.
412412

413-
#### ETS_KEYS_TABLE_NAME
413+
#### ETS_KEYS_STORE_TABLE_NAME
414414

415415
The ets for to store counters by keys.
416416

‎include/lfu.hrl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
-define(PREFIX_KEY,"lfu___").
1717
-define(POSTFIX_KEY,"__lfu").
1818

19-
-define(ETS_PIDS_TABLE_NAME,lfu_pid).
20-
-define(ETS_KEYS_TABLE_NAME,lfu_key).
19+
-define(ETS_PIDS_STORE_TABLE_NAME,lfu_pid).
20+
-define(ETS_KEYS_STORE_TABLE_NAME,lfu_key).
2121
-define(ETS_KEYS_FETCH_TABLE_NAME,lfu_key_fetch).
2222
-define(ETS_KEYS_FETCH_TABLE_OPTS,[
2323
public,bag,{write_concurrency,true},

‎lfu.app‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{application,lfu,[
22
{description,"Least Frequently Used Algorithm"},
3-
{vsn,"2.2.0"},
3+
{vsn,"2.2.1"},
44
{modules,[
55
lfu_app,lfu_sup,lfu,
66
lfu_score_sups_sup,lfu_protocol,

‎priv/lfu.rel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
{crypto,"4.8"},
1010
{public_key,"1.9"},
1111
{asn1,"5.0.14"},
12-
{lfu, "2.2.0"}]
12+
{lfu, "2.2.1"}]
1313
}.

‎priv/lfu.tar.gz‎

16 Bytes
Binary file not shown.

‎src/lfu.erl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
start_link() ->
4444
gen_statem:start_link(
4545
{local,?MODULE},
46-
?MODULE,[?MIN_ORDER,0,?ETS_KEYS_TABLE_NAME],
46+
?MODULE,[?MIN_ORDER,0,?ETS_KEYS_STORE_TABLE_NAME],
4747
[{spawn_opt,?SPAWN_OPT_LFU}]).
4848

4949

@@ -132,7 +132,7 @@ common(cast,{point,K},[O,Q]) ->
132132
lfu_exact_score:point(N,K)
133133
end,
134134
put(K,1),
135-
ets:insert(?ETS_KEYS_TABLE_NAME,{K,1}),
135+
ets:insert(?ETS_KEYS_STORE_TABLE_NAME,{K,1}),
136136
?SUPPORT andalso erlang:apply(?AUXILIARY,point,[K]),
137137
{keep_state,[O,if ?SCORE_OFFSET == 0 -> Q+1; true -> Q end]};
138138
C when C < ?MAX_ORDER ->
@@ -194,7 +194,7 @@ common(cast,{point,K},[O,Q]) ->
194194
true -> skip
195195
end,
196196
put(K,C+1),
197-
ets:insert(?ETS_KEYS_TABLE_NAME,{K,C+1}),
197+
ets:insert(?ETS_KEYS_STORE_TABLE_NAME,{K,C+1}),
198198
?SUPPORT andalso erlang:apply(?AUXILIARY,point,[K]),
199199
{keep_state,[O,if (C+1) / (?SCORE_OFFSET+1) == 1 -> Q+1; true -> Q end]};
200200
_ ->
@@ -285,7 +285,7 @@ common(cast,{cheat,KVL},[O,Q]) ->
285285
if
286286
V > 0 ->
287287
put(K,V),
288-
ets:insert(?ETS_KEYS_TABLE_NAME,{K,V}),
288+
ets:insert(?ETS_KEYS_STORE_TABLE_NAME,{K,V}),
289289
if
290290
V > ?SCORE_OFFSET -> true;
291291
true -> false
@@ -296,17 +296,17 @@ common(cast,{cheat,KVL},[O,Q]) ->
296296
if
297297
V > 0 ->
298298
put(K,V),
299-
ets:insert(?ETS_KEYS_TABLE_NAME,{K,V}),
299+
ets:insert(?ETS_KEYS_STORE_TABLE_NAME,{K,V}),
300300
if
301301
OV =< ?SCORE_OFFSET andalso V > ?SCORE_OFFSET -> true;
302302
true -> false
303303
end;
304304
true ->
305305
if
306306
OV > ?SCORE_OFFSET ->
307-
erase(K),ets:delete(?ETS_KEYS_TABLE_NAME,K),put(clean,get(clean)+1),false;
307+
erase(K),ets:delete(?ETS_KEYS_STORE_TABLE_NAME,K),put(clean,get(clean)+1),false;
308308
true ->
309-
erase(K),ets:delete(?ETS_KEYS_TABLE_NAME,K),false
309+
erase(K),ets:delete(?ETS_KEYS_STORE_TABLE_NAME,K),false
310310
end
311311
end
312312
end;
@@ -320,7 +320,7 @@ common({call,From},{count,K},[O,Q]) ->
320320
common({call,From},state,[O,Q]) ->
321321
{keep_state,[O,Q],[{reply,From,[O,Q]}]};
322322
common(cast,store,[O,Q]) ->
323-
lfu_utils:ets_reset([?ETS_KEYS_TABLE_NAME,?ETS_PIDS_TABLE_NAME]),
323+
lfu_utils:ets_reset([?ETS_KEYS_STORE_TABLE_NAME,?ETS_PIDS_STORE_TABLE_NAME]),
324324
{keep_state,[O,Q]};
325325
common({call,From},score,[O,Q]) ->
326326
{next_state,offset,[O,Q,#{from => From, order => score}],[{next_event,internal,{score,{previous,{?SCORE_OFFSET,O}}}}]};
@@ -747,7 +747,7 @@ resetting({_,KL},Q) ->
747747
put(reset,0),
748748
lists:foreach(
749749
fun(K) ->
750-
ets:delete(?ETS_KEYS_TABLE_NAME,K),
750+
ets:delete(?ETS_KEYS_STORE_TABLE_NAME,K),
751751
C = erase(K),
752752
if
753753
(C-1) div ?MAX_LIMIT == 0 ->
@@ -780,7 +780,7 @@ resetting(T,Q) ->
780780
fun({_,KL},[]) ->
781781
lists:foreach(
782782
fun(K) ->
783-
ets:delete(?ETS_KEYS_TABLE_NAME,K),
783+
ets:delete(?ETS_KEYS_STORE_TABLE_NAME,K),
784784
C = erase(K),
785785
if
786786
(C-1) div ?MAX_LIMIT == 0 ->

‎src/lfu_exact_score.erl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ start([O,Q]) ->
3232

3333

3434
init([O,Q]) ->
35-
case ets:lookup(?ETS_PIDS_TABLE_NAME,list_to_binary(?PREFIX_KEY ++ "o0" ++ integer_to_list(O) ++ ?POSTFIX_KEY)) of
35+
case ets:lookup(?ETS_PIDS_STORE_TABLE_NAME,list_to_binary(?PREFIX_KEY ++ "o0" ++ integer_to_list(O) ++ ?POSTFIX_KEY)) of
3636
[] ->
37-
ets:insert(?ETS_PIDS_TABLE_NAME,{
37+
ets:insert(?ETS_PIDS_STORE_TABLE_NAME,{
3838
list_to_binary(?PREFIX_KEY ++ "o0" ++ integer_to_list(O) ++ ?POSTFIX_KEY),
3939
self()}),
4040
{ok,[O,Q]};
4141
_ ->
42-
NQ = restorage(?ETS_KEYS_TABLE_NAME,?MIN_LIMIT*O+1,?MIN_LIMIT*(O+1),O),
43-
ets:insert(?ETS_PIDS_TABLE_NAME,{
42+
NQ = restorage(?ETS_KEYS_STORE_TABLE_NAME,?MIN_LIMIT*O+1,?MIN_LIMIT*(O+1),O),
43+
ets:insert(?ETS_PIDS_STORE_TABLE_NAME,{
4444
list_to_binary(?PREFIX_KEY ++ "o0" ++ integer_to_list(O) ++ ?POSTFIX_KEY),
4545
self()}),
4646
{ok,[O,NQ]}

‎src/lfu_quick_score.erl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ start([O,Q]) ->
3232

3333

3434
init([O,Q]) ->
35-
case ets:lookup(?ETS_PIDS_TABLE_NAME,list_to_binary(?PREFIX_KEY ++ "o" ++ integer_to_list(O) ++ ?POSTFIX_KEY)) of
35+
case ets:lookup(?ETS_PIDS_STORE_TABLE_NAME,list_to_binary(?PREFIX_KEY ++ "o" ++ integer_to_list(O) ++ ?POSTFIX_KEY)) of
3636
[] ->
37-
ets:insert(?ETS_PIDS_TABLE_NAME,{
37+
ets:insert(?ETS_PIDS_STORE_TABLE_NAME,{
3838
list_to_binary(?PREFIX_KEY ++ "o" ++ integer_to_list(O) ++ ?POSTFIX_KEY),
3939
self()}),
4040
{ok,[O,Q]};
4141
_ ->
42-
NQ = restorage(?ETS_KEYS_TABLE_NAME,?MAX_LIMIT*O+1,?MAX_LIMIT*(O+1)),
43-
ets:insert(?ETS_PIDS_TABLE_NAME,{
42+
NQ = restorage(?ETS_KEYS_STORE_TABLE_NAME,?MAX_LIMIT*O+1,?MAX_LIMIT*(O+1)),
43+
ets:insert(?ETS_PIDS_STORE_TABLE_NAME,{
4444
list_to_binary(?PREFIX_KEY ++ "o" ++ integer_to_list(O) ++ ?POSTFIX_KEY),
4545
self()}),
4646
{ok,[O,NQ]}

‎src/lfu_sup.erl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818

1919
start_link() ->
20-
{ok,PID} = supervisor:start_link({local,?MODULE},?MODULE,[?ETS_KEYS_TABLE_NAME,?ETS_PIDS_TABLE_NAME]),
21-
{ok,PID,[?ETS_KEYS_TABLE_NAME,?ETS_PIDS_TABLE_NAME]}.
20+
{ok,PID} = supervisor:start_link({local,?MODULE},?MODULE,[?ETS_KEYS_STORE_TABLE_NAME,?ETS_PIDS_STORE_TABLE_NAME]),
21+
{ok,PID,[?ETS_KEYS_STORE_TABLE_NAME,?ETS_PIDS_STORE_TABLE_NAME]}.
2222

2323

2424
init(ETS_TABLES) ->

0 commit comments

Comments
 (0)