diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-31 13:25:42 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-31 13:25:42 +0100 |
| commit | fc53b92a0a00b4330366387ca61687e1e42256f9 (patch) | |
| tree | caca974dc2f003d9beb05dc7b640ca5edfea6cb7 /src/dtree.erl | |
| parent | 63dcc9f6be8a3a76772fd6a24fcad36e9e48266d (diff) | |
| parent | b795aeb8dd38c59cdcf225f05a9b7dbd4eb4d76d (diff) | |
| download | rabbitmq-server-git-fc53b92a0a00b4330366387ca61687e1e42256f9.tar.gz | |
Merge bug26088
Diffstat (limited to 'src/dtree.erl')
| -rw-r--r-- | src/dtree.erl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/dtree.erl b/src/dtree.erl index 5ff36bd922..89a34c9e2a 100644 --- a/src/dtree.erl +++ b/src/dtree.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved. +%% Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. %% %% A dual-index tree. @@ -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). |