diff options
| author | Damien F. Katz <damien@apache.org> | 2008-06-05 23:49:48 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2008-06-05 23:49:48 +0000 |
| commit | 712830243c89a0863831ead8e983f089fd37fd42 (patch) | |
| tree | eb3f6f7cb8f08684f63d71869817cd898412ffd0 /src/couchdb/couch_btree.erl | |
| parent | 43776b676961ec093556fa5693298463ecee2ff5 (diff) | |
Added reduce/combine example. Fixed broken node chunking with very large keys/reduction values
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@663786 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_btree.erl')
| -rw-r--r-- | src/couchdb/couch_btree.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/couchdb/couch_btree.erl b/src/couchdb/couch_btree.erl index f5111c28..f01234c1 100644 --- a/src/couchdb/couch_btree.erl +++ b/src/couchdb/couch_btree.erl @@ -255,7 +255,7 @@ chunkify(_Bt, [], _ChunkThreshold, OutList, _OutListSize, OutputChunks) -> lists:reverse([lists:reverse(OutList) | OutputChunks]); chunkify(Bt, [InElement | RestInList], ChunkThreshold, OutList, OutListSize, OutputChunks) -> case size(term_to_binary(InElement)) of - Size when (Size + OutListSize) > ChunkThreshold -> + Size when (Size + OutListSize) > ChunkThreshold andalso OutList /= [] -> chunkify(Bt, RestInList, ChunkThreshold, [], 0, [lists:reverse([InElement | OutList]) | OutputChunks]); Size -> chunkify(Bt, RestInList, ChunkThreshold, [InElement | OutList], OutListSize + Size, OutputChunks) @@ -398,6 +398,9 @@ modify_kvnode(Bt, [{Key, Value} | RestKVs], [{ActionType, ActionKey, ActionValue end. +reduce_stream_node(_Bt, _Dir, nil, _KeyStart, _KeyEnd, GroupedKey, GroupedKVsAcc, + GroupedRedsAcc, _KeyGroupFun, _Fun, Acc) -> + {ok, Acc, GroupedRedsAcc, GroupedKVsAcc, GroupedKey}; reduce_stream_node(Bt, Dir, {P, _R}, KeyStart, KeyEnd, GroupedKey, GroupedKVsAcc, GroupedRedsAcc, KeyGroupFun, Fun, Acc) -> case get_node(Bt, P) of |