diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2010-12-29 03:01:01 +0000 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2010-12-29 03:01:01 +0000 |
| commit | 3c71d543dd863a4b34a779a6b05de1f10b57a3a0 (patch) | |
| tree | 77d37d0d7c09ef47f5295f1734b82da15bef083b | |
| parent | abf46298f3e98bebd89d8daa001374cba57dcfce (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
| -rw-r--r-- | src/couchdb/couch_key_tree.erl | 2 | ||||
| -rwxr-xr-x | test/etap/060-kt-merging.t | 11 |
2 files changed, 8 insertions, 5 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) diff --git a/test/etap/060-kt-merging.t b/test/etap/060-kt-merging.t index 5a8571ac..971e49bf 100755 --- a/test/etap/060-kt-merging.t +++ b/test/etap/060-kt-merging.t @@ -15,7 +15,7 @@ main(_) -> test_util:init_code_path(), - etap:plan(12), + etap:plan(14), case (catch test()) of ok -> etap:end_tests(); @@ -106,10 +106,13 @@ test() -> "Merging should create conflicts." ), + {MultiPaths, NoConflicts} = couch_key_tree:merge(Expect1, TwoChild), + etap:is(NoConflicts, no_conflicts, "Merge should have no conflicts."), + etap:is(length(MultiPaths), 2, "Should have two paths before stemming."), etap:is( - {[TwoChild], no_conflicts}, - couch_key_tree:merge(Expect1, TwoChild), - "Merge should have no conflicts." + couch_key_tree:stem(MultiPaths, 10), + [TwoChild], + "Stemming should collapse the paths." ), ok. |