diff options
| author | Jay Doane <jaydoane@apache.org> | 2020-04-15 11:27:02 -0700 |
|---|---|---|
| committer | Jay Doane <jaydoane@apache.org> | 2020-04-15 11:27:02 -0700 |
| commit | 350a0191910b699bea47e8fbe529a9c8b6ee0c6b (patch) | |
| tree | ef836c96adf49e2992d1f4ee3822e79e2069c092 | |
| parent | 5db2179a0ef6b0f78255d213503c4af756007a8e (diff) | |
| download | couchdb-cleanup-expiring-key-on-update.tar.gz | |
Rename range functionscleanup-expiring-key-on-update
3 files changed, 11 insertions, 11 deletions
diff --git a/src/couch_expiring_cache/src/couch_expiring_cache_fdb.erl b/src/couch_expiring_cache/src/couch_expiring_cache_fdb.erl index b939cbccb..7c4ad8f6f 100644 --- a/src/couch_expiring_cache/src/couch_expiring_cache_fdb.erl +++ b/src/couch_expiring_cache/src/couch_expiring_cache_fdb.erl @@ -13,11 +13,11 @@ -module(couch_expiring_cache_fdb). -export([ - get_entries/3, + get_range_to/3, insert/6, lookup/3, clear_all/1, - clear_range/3 + clear_range_to/3 ]). @@ -86,11 +86,11 @@ clear_all(Name) -> end). --spec clear_range(Name :: binary(), EndTS :: ?TIME_UNIT, +-spec clear_range_to(Name :: binary(), EndTS :: ?TIME_UNIT, Limit :: non_neg_integer()) -> OldestTS :: ?TIME_UNIT. -clear_range(Name, EndTS, Limit) when Limit > 0 -> - fold_expiry(Name, EndTS, Limit, +clear_range_to(Name, EndTS, Limit) when Limit > 0 -> + fold_range(Name, EndTS, Limit, fun(Tx, PK, XK, _Key, ExpiresTS, Acc) -> ok = erlfdb:clear(Tx, PK), ok = erlfdb:clear(Tx, XK), @@ -98,11 +98,11 @@ clear_range(Name, EndTS, Limit) when Limit > 0 -> end, 0). --spec get_entries(Name :: binary(), EndTS :: ?TIME_UNIT, +-spec get_range_to(Name :: binary(), EndTS :: ?TIME_UNIT, Limit :: non_neg_integer()) -> [{Key :: binary(), Val :: binary()}]. -get_entries(Name, EndTS, Limit) when Limit > 0 -> - fold_expiry(Name, EndTS, Limit, +get_range_to(Name, EndTS, Limit) when Limit > 0 -> + fold_range(Name, EndTS, Limit, fun(Tx, PK, _XK, Key, _ExpiresTS, Acc) -> case get_val(Tx, PK) of not_found -> @@ -117,7 +117,7 @@ get_entries(Name, EndTS, Limit) when Limit > 0 -> %% Private -fold_expiry(Name, EndTS, Limit, Fun, Acc0) when Limit > 0 -> +fold_range(Name, EndTS, Limit, Fun, Acc0) when Limit > 0 -> fabric2_fdb:transactional(fun(Tx) -> {LayerPrefix, ExpiresPrefix} = prefixes(Tx, Name), fabric2_fdb:fold_range({tx, Tx}, ExpiresPrefix, fun({XK, _XV}, Acc) -> diff --git a/src/couch_expiring_cache/src/couch_expiring_cache_server.erl b/src/couch_expiring_cache/src/couch_expiring_cache_server.erl index 7bbc81b2a..eb74e6eb2 100644 --- a/src/couch_expiring_cache/src/couch_expiring_cache_server.erl +++ b/src/couch_expiring_cache/src/couch_expiring_cache_server.erl @@ -82,7 +82,7 @@ handle_info(remove_expired, St) -> NowTS = erlang:system_time(?TIME_UNIT), OldestTS = max(OldestTS0, - couch_expiring_cache_fdb:clear_range(Name, NowTS, BatchSize)), + couch_expiring_cache_fdb:clear_range_to(Name, NowTS, BatchSize)), Elapsed = erlang:system_time(?TIME_UNIT) - NowTS, {noreply, St#{ diff --git a/src/couch_expiring_cache/test/couch_expiring_cache_tests.erl b/src/couch_expiring_cache/test/couch_expiring_cache_tests.erl index c15037b43..2e06fcc5a 100644 --- a/src/couch_expiring_cache/test/couch_expiring_cache_tests.erl +++ b/src/couch_expiring_cache/test/couch_expiring_cache_tests.erl @@ -98,7 +98,7 @@ simple_lifecycle(_) -> entries(Name) -> FarFuture = erlang:system_time(?TIME_UNIT) * 2, - couch_expiring_cache_fdb:get_entries(Name, FarFuture, _Limit=100). + couch_expiring_cache_fdb:get_range_to(Name, FarFuture, _Limit=100). wait_lookup(Name, Key, Expect) -> |