From ce898b50635975b7411c0ea1b577cc90693dd17b Mon Sep 17 00:00:00 2001
From: Kresten Krab Thorup <krab@trifork.com>
Date: Thu, 26 Apr 2012 08:17:48 +0200
Subject: [PATCH] Don't do merge before inject

---
 src/hanoi_nursery.erl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hanoi_nursery.erl b/src/hanoi_nursery.erl
index 4ddb62e..908b917 100644
--- a/src/hanoi_nursery.erl
+++ b/src/hanoi_nursery.erl
@@ -181,15 +181,15 @@ finish(#nursery{ dir=Dir, cache=Cache, log_file=LogFile,
 %            error_logger:info_msg("dumping log (count=~p, size=~p, outsize=~p)~n",
 %                                  [ gb_trees:size(Cache), TotalSize, FileInfo#file_info.size ]),
 
+
+            %% inject the B-Tree (blocking RPC)
+            ok = hanoi_level:inject(TopLevel, BTreeFileName),
+
             %% issue some work if this is a top-level inject (blocks until previous such
             %% incremental merge is finished).
             hanoi_level:incremental_merge(TopLevel,
                                           (MaxLevel-?TOP_LEVEL+1)*?BTREE_SIZE(?TOP_LEVEL)),
 
-
-            %% inject the B-Tree (blocking RPC)
-            ok = hanoi_level:inject(TopLevel, BTreeFileName),
-
             ok;
 
         _ ->