Updated model

This has inappropriate default parameter changes.

src/leveled_bookie.erl

@@ -62,6 +62,7 @@
         book_headonly/4,
         book_snapshot/4,
         book_compactjournal/2,
+        book_eqccompactjournal/2,
         book_islastcompactionpending/1,
         book_trimjournal/1,
         book_hotbackup/1,
@@ -100,8 +101,8 @@
 -include_lib("eunit/include/eunit.hrl").
 
 -define(CACHE_SIZE, 2500).
--define(MIN_CACHE_SIZE, 100).
--define(MIN_PCL_CACHE_SIZE, 400).
+-define(MIN_CACHE_SIZE, 1).
+-define(MIN_PCL_CACHE_SIZE, 4).
 -define(MAX_PCL_CACHE_SIZE, 28000). 
     % This is less than actual max - but COIN_SIDECOUNT
 -define(CACHE_SIZE_JITTER, 25).
@@ -1005,6 +1006,7 @@ book_snapshot(Pid, SnapType, Query, LongRunning) ->
 
 
 -spec book_compactjournal(pid(), integer()) -> ok.
+-spec book_eqccompactjournal(pid(), integer()) -> {ok, pid()}.
 -spec book_islastcompactionpending(pid()) -> boolean().
 -spec book_trimjournal(pid()) -> ok.
 
@@ -1013,9 +1015,13 @@ book_snapshot(Pid, SnapType, Query, LongRunning) ->
 %% the scheduling of Journla compaction is called externally, so it is assumed
 %% in Riak it will be triggered by a vnode callback.
 
-book_compactjournal(Pid, Timeout) ->
+book_eqccompactjournal(Pid, Timeout) ->
     gen_server:call(Pid, {compact_journal, Timeout}, infinity).
 
+book_compactjournal(Pid, Timeout) ->
+    {ok, _P} = gen_server:call(Pid, {compact_journal, Timeout}, infinity),
+    ok.
+
 %% @doc Check on progress of the last compaction
 
 book_islastcompactionpending(Pid) ->
@@ -1371,10 +1377,10 @@ handle_call({return_runner, QueryType}, _From, State) ->
                                 fold_countdown = CountDown}};
 handle_call({compact_journal, Timeout}, _From, State)
                                         when State#state.head_only == false ->
-    ok = leveled_inker:ink_compactjournal(State#state.inker,
+    R = leveled_inker:ink_compactjournal(State#state.inker,
                                           self(),
                                           Timeout),
-    {reply, ok, State};
+    {reply, R, State};
 handle_call(confirm_compact, _From, State)
                                         when State#state.head_only == false ->
     {reply, leveled_inker:ink_compactionpending(State#state.inker), State};

src/leveled_iclerk.erl

@@ -182,6 +182,7 @@ clerk_hashtablecalc(HashTree, StartPos, CDBpid) ->
 %% @doc
 %% Stop the clerk
 clerk_stop(Pid) ->
+    unlink(Pid),
     gen_server:cast(Pid, stop).
 
 -spec clerk_loglevel(pid(), leveled_log:log_level()) -> ok.

src/leveled_inker.erl

@@ -348,7 +348,7 @@ ink_loadpcl(Pid, MinSQN, FilterFun, Penciller) ->
                         as_ink},
                     infinity).
 
--spec ink_compactjournal(pid(), pid(), integer()) -> ok.
+-spec ink_compactjournal(pid(), pid(), integer()) -> {ok, pid()}.
 %% @doc
 %% Trigger a compaction event.  the compaction event will use a sqn check
 %% against the Ledger to see if a value can be compacted - if the penciller
@@ -612,7 +612,7 @@ handle_call({compact,
                                     FilterFun,
                                     self(),
                                     Timeout),
-    {reply, ok, State#state{compaction_pending=true}};
+    {reply, {ok, State#state.clerk}, State#state{compaction_pending=true}};
 handle_call(compaction_complete, _From, State) ->
     {reply, ok, State#state{compaction_pending=false}};
 handle_call(compaction_pending, _From, State) ->

src/leveled_sst.erl

@@ -72,7 +72,7 @@
 
 -include("include/leveled.hrl").
 
--define(MAX_SLOTS, 256).
+-define(MAX_SLOTS, 2).
 -define(LOOK_SLOTSIZE, 128). % Maximum of 128
 -define(LOOK_BLOCKSIZE, {24, 32}). % 4x + y = ?LOOK_SLOTSIZE
 -define(NOLOOK_SLOTSIZE, 256).