diff --git a/prototype/tango-prototype/src/corfurl_sequencer.erl b/prototype/tango-prototype/src/corfurl_sequencer.erl index 2dd9054..085cdc1 100644 --- a/prototype/tango-prototype/src/corfurl_sequencer.erl +++ b/prototype/tango-prototype/src/corfurl_sequencer.erl @@ -123,17 +123,17 @@ handle_call({get, NumPages, LC}, _From, handle_call({get_tails, NumPages, StreamList, LC}, _From, MLP_tuple) -> Tab = element(1, MLP_tuple), MLP = element(2, MLP_tuple), - if NumPages > 0 -> - update_stream_tails(Tab, StreamList, MLP); - true -> - ok - end, Tails = [case (catch ets:lookup_element(Tab, Stream, 2)) of {'EXIT', _} -> []; Res -> Res end || Stream <- StreamList], + if NumPages > 0 -> + update_stream_tails(Tab, StreamList, MLP); + true -> + ok + end, NewLC = lclock_update(LC), {reply, {{ok, MLP, Tails}, NewLC}, setelement(2, MLP_tuple, MLP + NumPages)}; diff --git a/prototype/tango-prototype/src/tango.erl b/prototype/tango-prototype/src/tango.erl index 34e52c8..3ce586b 100644 --- a/prototype/tango-prototype/src/tango.erl +++ b/prototype/tango-prototype/src/tango.erl @@ -102,12 +102,8 @@ scan_backward2(_Proj, _Stream, LastLPN, StopAtLPN, _NumPages, _WithPagesP) when LastLPN =< StopAtLPN; LastLPN =< 0 -> []; scan_backward2(Proj, Stream, LastLPN, StopAtLPN, NumPages, WithPagesP) -> - ?D({scan, Stream, LastLPN}), case corfurl:read_page(Proj, LastLPN) of {ok, FullPage} -> - ?D({scan, LastLPN, ok}), - ?D({scan, Stream, unpack_v1(FullPage, stream_list)}), -?D(proplists:get_value(Stream, unpack_v1(FullPage, stream_list))), case proplists:get_value(Stream, unpack_v1(FullPage, stream_list)) of undefined -> if NumPages == 0 -> @@ -124,14 +120,11 @@ scan_backward2(Proj, Stream, LastLPN, StopAtLPN, NumPages, WithPagesP) -> end; [] -> if WithPagesP -> -?D(?LINE), [{LastLPN, unpack_v1(FullPage, page)}]; true -> -?D(?LINE), [LastLPN] end; BackPs -> -?D(?LINE), if WithPagesP -> %% ?D({bummer, BackPs}), [{LastLPN, unpack_v1(FullPage, page)}| diff --git a/prototype/tango-prototype/src/tango_oid.erl b/prototype/tango-prototype/src/tango_oid.erl index 17ca599..e99e7a0 100644 --- a/prototype/tango-prototype/src/tango_oid.erl +++ b/prototype/tango-prototype/src/tango_oid.erl @@ -143,7 +143,6 @@ fetch_unread_pages(Proj, LastLPN, StopAtLPN) %% ?D({fetch_unread_pages, LastLPN, StopAtLPN}), LPNandPages = tango:scan_backward(Proj, ?OID_STREAM_NUMBER, LastLPN, StopAtLPN, true), -?D(LPNandPages), {_LPNs, _Pages} = lists:unzip(LPNandPages). play_log_pages(Pages, SideEffectsP, @@ -156,11 +155,8 @@ play_log_pages(Pages, I_State, CallbackMod, SideEffectsP) -> roll_log_forward(#state{seq=SequencerPid, proj=Proj, all_back_ps=BackPs, last_fetch_lpn=StopAtLPN} = State) -> -?D(StopAtLPN), LastLPN = find_last_lpn(SequencerPid), -?D(LastLPN), {LPNs, Pages} = fetch_unread_pages(Proj, LastLPN, StopAtLPN), -?D(LPNs), NewBPs = append_lpns(LPNs, BackPs), play_log_pages(Pages, true, State#state{all_back_ps=NewBPs}). @@ -197,19 +193,15 @@ play_log_mutate_i_state(Pages, SideEffectsP, I_State) -> {Res, O2} = case ?DICTMOD:find(Key, Dict) of error -> -?D(?LINE), Dict2 = ?DICTMOD:store(Key, Next, Dict), {{ok, Next},O#oid_map{map=Dict2, next=Next + 1}}; {ok, _} -> -?D(?LINE), {already_exists, O} end, if SideEffectsP -> -?D(?LINE), gen_server:reply(From, Res); true -> -?D(?LINE), ok end, O2 diff --git a/prototype/tango-prototype/test/tango_oid_test.erl b/prototype/tango-prototype/test/tango_oid_test.erl index 8e8046e..9ce16f5 100644 --- a/prototype/tango-prototype/test/tango_oid_test.erl +++ b/prototype/tango-prototype/test/tango_oid_test.erl @@ -56,11 +56,8 @@ tango_oid_one_test_int(PageSize, Seq, Proj) -> OID_Num1 = 1, error = tango_oid:get(OID_Map, "does not exist"), -?D(?LINE), {ok, OID_Num1} = tango_oid:new(OID_Map, K1), -?D(?LINE), {ok, OID_Num1} = tango_oid:get(OID_Map, K1), -?D(?LINE), already_exists = tango_oid:new(OID_Map, K1), %% The V2 put should *not* have clobbered the previous value {ok, OID_Num1} = tango_oid:get(OID_Map, K1),