diff options
| author | Damien F. Katz <damien@apache.org> | 2008-04-01 20:32:15 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2008-04-01 20:32:15 +0000 |
| commit | 042de2f5aeea9fb5be6768df934d61ba26985d5c (patch) | |
| tree | 9471eb95045593332cf0df9ce5abefb190921781 /src/couchdb/couch_btree.erl | |
| parent | 504c93c4534f07affc2c933bd4d5d7f6075ea013 (diff) | |
Fix for runaway process in the view code and the so far untested storage compaction code.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@643556 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_btree.erl')
| -rw-r--r-- | src/couchdb/couch_btree.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/couchdb/couch_btree.erl b/src/couchdb/couch_btree.erl index 2ae837dd..62d42c09 100644 --- a/src/couchdb/couch_btree.erl +++ b/src/couchdb/couch_btree.erl @@ -12,7 +12,7 @@ -module(couch_btree). --export([open/2, open/3, query_modify/4, add_remove/3, foldl/3, foldl/4]). +-export([open/2, open/3, query_modify/4, add/2, add_remove/3, foldl/3, foldl/4]). -export([foldr/3, foldr/4, fold/4, fold/5, row_count/1]). -export([lookup/2, get_state/1, test/1, test/0]). @@ -85,9 +85,12 @@ fold(Bt, Key, Dir, Fun, Acc) -> {_ContinueFlag, Acc2} = stream_node(Bt, 0, Bt#btree.root, Key, Dir, convert_fun_arity(Fun), Acc), {ok, Acc2}. +add(Bt, InsertKeyValues) -> + add_remove(Bt, InsertKeyValues, []). + add_remove(Bt, InsertKeyValues, RemoveKeys) -> - {Result, [], Bt2} = query_modify(Bt, [], InsertKeyValues, RemoveKeys), - {Result, Bt2}. + {ok, [], Bt2} = query_modify(Bt, [], InsertKeyValues, RemoveKeys), + {ok, Bt2}. query_modify(Bt, LookupKeys, InsertValues, RemoveKeys) -> #btree{root=Root} = Bt, |