summaryrefslogtreecommitdiff
path: root/src/couchdb
diff options
context:
space:
mode:
authorAdam Kocoloski <kocolosk@apache.org>2010-12-29 03:01:01 +0000
committerAdam Kocoloski <kocolosk@apache.org>2010-12-29 03:01:01 +0000
commit3c71d543dd863a4b34a779a6b05de1f10b57a3a0 (patch)
tree77d37d0d7c09ef47f5295f1734b82da15bef083b /src/couchdb
parentabf46298f3e98bebd89d8daa001374cba57dcfce (diff)
Skip recursive path merging, COUCHDB-968
This patch ensures that we only ever merge a linear path into the tree. It relies on the stemming code to collapse paths that could have been merged together by a recursive use of merge_one. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1053512 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
-rw-r--r--src/couchdb/couch_key_tree.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/couch_key_tree.erl b/src/couchdb/couch_key_tree.erl
index 2e3b3e3c..09712adf 100644
--- a/src/couchdb/couch_key_tree.erl
+++ b/src/couchdb/couch_key_tree.erl
@@ -43,7 +43,7 @@ merge_one([{Start, Tree}|Rest], {StartInsert, TreeInsert}, Acc, HasConflicts) ->
case merge_at([Tree], StartInsert - Start, [TreeInsert]) of
{ok, [Merged], Conflicts} ->
MergedStart = lists:min([Start, StartInsert]),
- merge_one(Rest, {MergedStart, Merged}, Acc, Conflicts or HasConflicts);
+ {ok, Rest ++ [{MergedStart, Merged} | Acc], Conflicts or HasConflicts};
no ->
AccOut = [{Start, Tree} | Acc],
merge_one(Rest, {StartInsert, TreeInsert}, AccOut, HasConflicts)