diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-02-17 15:07:54 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-02-17 15:07:54 +0000 |
| commit | 5534d8c648a8083f5faeb43f58d4ab6fa6ccc2e3 (patch) | |
| tree | fcfa26e414e5fe5d25c5bdbde5c9667e89d4352d /src/dtree.erl | |
| parent | 6c8aeb51f83950dff052f72f6de31748ccc5de7a (diff) | |
| parent | a6f9f6542d940e350b75426ed5e03b034cd39771 (diff) | |
| download | rabbitmq-server-git-5534d8c648a8083f5faeb43f58d4ab6fa6ccc2e3.tar.gz | |
Merge bug25627 (again)
Diffstat (limited to 'src/dtree.erl')
| -rw-r--r-- | src/dtree.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/dtree.erl b/src/dtree.erl index 5ff36bd922..72abe248f5 100644 --- a/src/dtree.erl +++ b/src/dtree.erl @@ -32,7 +32,7 @@ -module(dtree). --export([empty/0, insert/4, take/3, take/2, take_all/2, +-export([empty/0, insert/4, take/3, take/2, take_all/2, drop/2, is_defined/2, is_empty/1, smallest/1, size/1]). %%---------------------------------------------------------------------------- @@ -53,6 +53,7 @@ -spec(take/3 :: ([pk()], sk(), ?MODULE()) -> {[kv()], ?MODULE()}). -spec(take/2 :: (sk(), ?MODULE()) -> {[kv()], ?MODULE()}). -spec(take_all/2 :: (sk(), ?MODULE()) -> {[kv()], ?MODULE()}). +-spec(drop/2 :: (pk(), ?MODULE()) -> ?MODULE()). -spec(is_defined/2 :: (sk(), ?MODULE()) -> boolean()). -spec(is_empty/1 :: (?MODULE()) -> boolean()). -spec(smallest/1 :: (?MODULE()) -> kv()). @@ -120,6 +121,14 @@ take_all(SK, {P, S}) -> {KVs, {P1, prune(SKS, PKS, S)}} end. +%% Drop all entries for the given primary key (which does not have to exist). +drop(PK, {P, S}) -> + case gb_trees:lookup(PK, P) of + none -> {P, S}; + {value, {SKS, _V}} -> {gb_trees:delete(PK, P), + prune(SKS, gb_sets:singleton(PK), S)} + end. + is_defined(SK, {_P, S}) -> gb_trees:is_defined(SK, S). is_empty({P, _S}) -> gb_trees:is_empty(P). |