diff options
| author | Damien F. Katz <damien@apache.org> | 2009-09-11 23:23:07 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2009-09-11 23:23:07 +0000 |
| commit | 45796298231349dadf650e9ddefd7a6ff32e1302 (patch) | |
| tree | 4de5543e9584a2c8a91f0b27b5b8f9e43de3fe46 /src/couchdb/couch_view_compactor.erl | |
| parent | 773a23353b9101620ebb91183cb67240c17aa2c9 (diff) | |
Refactoring of endkey code in views and btrees. End key functionaility is now handled inside the btree code, simplfying calling code and making it trivial to add new collation options
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@814078 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_view_compactor.erl')
| -rw-r--r-- | src/couchdb/couch_view_compactor.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_view_compactor.erl b/src/couchdb/couch_view_compactor.erl index 762668c0..ad217d97 100644 --- a/src/couchdb/couch_view_compactor.erl +++ b/src/couchdb/couch_view_compactor.erl @@ -58,7 +58,7 @@ compact_group(Group, EmptyGroup) -> {ok, {Bt, [KV|Acc], TotalCopied+1}} end end, - {ok, {Bt3, Uncopied, _Total}} = couch_btree:foldl(IdBtree, Fun, + {ok, _, {Bt3, Uncopied, _Total}} = couch_btree:foldl(IdBtree, Fun, {EmptyIdBtree, [], 0}), {ok, NewIdBtree} = couch_btree:add(Bt3, lists:reverse(Uncopied)), @@ -91,7 +91,7 @@ compact_view(View, EmptyView) -> end end, - {ok, {Bt3, Uncopied, _Total}} = couch_btree:foldl(View#view.btree, Fun, + {ok, _, {Bt3, Uncopied, _Total}} = couch_btree:foldl(View#view.btree, Fun, {EmptyView#view.btree, [], 0}), {ok, NewBt} = couch_btree:add(Bt3, lists:reverse(Uncopied)), EmptyView#view{btree = NewBt}. |