From 933e7e8874e0c5854aed1dcc4ad89c3bd04b2545 Mon Sep 17 00:00:00 2001 From: Filipe David Borba Manana Date: Tue, 20 Dec 2011 17:48:33 +0000 Subject: [PATCH] Fix btree copy case_clause error Closes MB-4560. Change-Id: Iabec1e870fbe74451ada31d7d94326170408a376 Reviewed-on: http://review.couchbase.org/11767 Tested-by: Filipe David Borba Manana Reviewed-by: Damien Katz --- src/couchdb/couch_btree_copy.erl | 2 +- test/etap/022-btree-copy.t | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/couchdb/couch_btree_copy.erl b/src/couchdb/couch_btree_copy.erl index 8b15a5c5e..afc7701a3 100644 --- a/src/couchdb/couch_btree_copy.erl +++ b/src/couchdb/couch_btree_copy.erl @@ -167,7 +167,7 @@ finish_copy(#acc{cur_level = Level, max_level = Level, nodes = Nodes} = Acc) -> finish_copy(#acc{cur_level = Level, nodes = Nodes} = Acc) -> case dict:fetch(Level, Nodes) of - [] when Level =:= 1 -> + [] -> Acc2 = Acc#acc{cur_level = Level + 1}, finish_copy(Acc2); [{LastKey, _} | _] = NodeList -> diff --git a/test/etap/022-btree-copy.t b/test/etap/022-btree-copy.t index 2a06331ec..5dbf80da8 100755 --- a/test/etap/022-btree-copy.t +++ b/test/etap/022-btree-copy.t @@ -29,7 +29,7 @@ path(FileName) -> main(_) -> test_util:init_code_path(), - etap:plan(72), + etap:plan(76), case (catch test()) of ok -> etap:end_tests(); @@ -55,6 +55,7 @@ test() -> test_copy(700, ReduceCount), test_copy(811, ReduceCount), test_copy(2333, ReduceCount), + test_copy(6594, ReduceCount), test_copy(6666, ReduceCount), test_copy(9999, ReduceCount), test_copy(15003, ReduceCount), @@ -68,6 +69,7 @@ test() -> test_copy(NumItems, ReduceFun) -> + etap:diag("Running btree copy test for " ++ integer_to_list(NumItems) ++ " items"), KVs = [{I, I} || I <- lists:seq(1, NumItems)], OriginalFileName = path(