From d9407b76b744a5d68540db065683292c0aadb597 Mon Sep 17 00:00:00 2001 From: Scott Lystig Fritchie Date: Wed, 24 Jun 2015 18:00:25 +0900 Subject: [PATCH] WIP: dinnertime, machi_flu1_test still broken --- src/machi.proto | 3 +- src/machi_flu1.erl | 9 ++- src/machi_flu1_client.erl | 2 +- src/machi_pb_high_client.erl | 2 + src/machi_pb_wrap.erl | 114 ++++++++++++++++++++++++++++++++++- 5 files changed, 123 insertions(+), 7 deletions(-) diff --git a/src/machi.proto b/src/machi.proto index 92b89b8..7ae4c96 100644 --- a/src/machi.proto +++ b/src/machi.proto @@ -41,6 +41,7 @@ enum Mpb_GeneralStatusCode { WEDGED = 2; BAD_CHECKSUM = 3; PARTITION = 4; + NOT_WRITTEN = 5; BAD_JOSS = 255; // Only for testing by the Taipan } @@ -367,7 +368,7 @@ message Mpb_LL_GetAllProjectionsReq { message Mpb_LL_GetAllProjectionsResp { required Mpb_GeneralStatusCode status = 1; - repeated Mpb_ProjectionV1 proj = 2; + repeated Mpb_ProjectionV1 projs = 2; } // Low level API: list_all_projections() request & response diff --git a/src/machi_flu1.erl b/src/machi_flu1.erl index 9dfe6a6..5f957c5 100644 --- a/src/machi_flu1.erl +++ b/src/machi_flu1.erl @@ -864,11 +864,14 @@ do_projection_command(Sock, LenHex, S) -> ok = inet:setopts(Sock, [{packet, raw}]), {ok, ProjCmdBin} = gen_tcp:recv(Sock, Len), ok = inet:setopts(Sock, [{packet, line}]), - ProjCmd = binary_to_term(ProjCmdBin), + ProjCmdM = machi_pb:decode_mpb_ll_request(ProjCmdBin), + {ID, ProjCmd} = machi_pb_wrap:unmake_projection_req(ProjCmdM), + ProjOp = element(1, ProjCmd), put(hack, ProjCmd), Res = handle_projection_command(ProjCmd, S), - ResBin = term_to_binary(Res), - ResLenHex = machi_util:int_to_hexbin(byte_size(ResBin), 32), + ResM = machi_pb_wrap:make_projection_resp(ID, ProjOp, Res), + ResBin = machi_pb:encode_mpb_ll_response(ResM), + ResLenHex = machi_util:int_to_hexbin(iolist_size(ResBin), 32), ok = gen_tcp:send(Sock, [<<"OK ">>, ResLenHex, <<"\n">>, ResBin]) catch What:Why -> diff --git a/src/machi_flu1_client.erl b/src/machi_flu1_client.erl index df59d7d..a6e19a5 100644 --- a/src/machi_flu1_client.erl +++ b/src/machi_flu1_client.erl @@ -849,7 +849,7 @@ do_projection_common(Sock, Req) -> ok = w_setopts(Sock, [{packet, raw}]), {ok, RespBin} = w_recv(Sock, ResLen), ok = w_setopts(Sock, [{packet, line}]), - Resp = machi_pb:decode_mbp_ll_response(RespBin), + Resp = machi_pb:decode_mpb_ll_response(RespBin), machi_pb_wrap:unmake_projection_resp(Resp); Else -> {error, Else} diff --git a/src/machi_pb_high_client.erl b/src/machi_pb_high_client.erl index 14fa9f5..bd42741 100644 --- a/src/machi_pb_high_client.erl +++ b/src/machi_pb_high_client.erl @@ -365,6 +365,8 @@ convert_general_status_code('BAD_CHECKSUM') -> {error, bad_checksum}; convert_general_status_code('PARTITION') -> {error, partition}; +convert_general_status_code('NOT_WRITTEN') -> + {error, not_written}; convert_general_status_code('BAD_JOSS') -> throw({error, bad_joss_taipan_fixme}). diff --git a/src/machi_pb_wrap.erl b/src/machi_pb_wrap.erl index 94c4117..5d97186 100644 --- a/src/machi_pb_wrap.erl +++ b/src/machi_pb_wrap.erl @@ -35,7 +35,8 @@ -export([enc_p_srvr/1, dec_p_srvr/1, enc_projection_v1/1, dec_projection_v1/1, - make_projection_req/2, unmake_projection_resp/1]). + make_projection_req/2, unmake_projection_req/1, + make_projection_resp/3, unmake_projection_resp/1]). -ifdef(TEST). -compile(export_all). -endif. % TEST @@ -156,6 +157,83 @@ make_projection_req(ID, {list_all_projections, ProjType}) -> #mpb_ll_request{req_id=ID, proj_la=#mpb_ll_listallprojectionsreq{type=conv_from_type(ProjType)}}. +unmake_projection_req( + #mpb_ll_request{req_id=ID, + proj_gl=#mpb_ll_getlatestepochidreq{type=ProjType}}) -> + {ID, {get_latest_epochid, conv_to_type(ProjType)}}; +unmake_projection_req( + #mpb_ll_request{req_id=ID, + proj_rl=#mpb_ll_readlatestprojectionreq{type=ProjType}}) -> + {ID, {read_latest_projection, conv_to_type(ProjType)}}; +unmake_projection_req( + #mpb_ll_request{req_id=ID, + proj_rp=#mpb_ll_readprojectionreq{type=ProjType, + epoch_number=Epoch}}) -> + {ID, {read_projection, conv_to_type(ProjType), Epoch}}; +unmake_projection_req( + #mpb_ll_request{req_id=ID, + proj_wp=#mpb_ll_writeprojectionreq{type=ProjType, + proj=ProjM}}) -> + Proj = conv_to_projection_v1(ProjM), + {ID, {write_projection, conv_to_type(ProjType), Proj}}; +unmake_projection_req( + #mpb_ll_request{req_id=ID, + proj_ga=#mpb_ll_getallprojectionsreq{type=ProjType}}) -> + {ID, {get_all_projections, conv_to_type(ProjType)}}; +unmake_projection_req( + #mpb_ll_request{req_id=ID, + proj_la=#mpb_ll_listallprojectionsreq{type=ProjType}}) -> + {ID, {list_all_projections, conv_to_type(ProjType)}}. + +make_projection_resp(ID, get_latest_epochid, {ok, {Epoch, CSum}}) -> + EID = #mpb_epochid{epoch_number=Epoch, epoch_csum=CSum}, + #mpb_ll_response{req_id=ID, + proj_gl=#mpb_ll_getlatestepochidresp{ + status='OK', epoch_id=EID}}; +make_projection_resp(ID, get_latest_epochid, Status) -> + #mpb_ll_response{req_id=ID, + proj_gl=#mpb_ll_getlatestepochidresp{ + status=conv_from_status(Status)}}; +make_projection_resp(ID, read_latest_projection, {ok, Proj}) -> + ProjM = conv_from_projection_v1(Proj), + #mpb_ll_response{req_id=ID, + proj_rl=#mpb_ll_readlatestprojectionresp{ + status='OK', proj=ProjM}}; +make_projection_resp(ID, read_latest_projection, Status) -> + #mpb_ll_response{req_id=ID, + proj_rl=#mpb_ll_readlatestprojectionresp{ + status=conv_from_status(Status)}}; +make_projection_resp(ID, read_projection, {ok, Proj}) -> + ProjM = conv_from_projection_v1(Proj), + #mpb_ll_response{req_id=ID, + proj_rp=#mpb_ll_readprojectionresp{ + status='OK', proj=ProjM}}; +make_projection_resp(ID, read_projection, Status) -> + #mpb_ll_response{req_id=ID, + proj_rp=#mpb_ll_readprojectionresp{ + status=conv_from_status(Status)}}; +make_projection_resp(ID, write_projection, Status) -> + #mpb_ll_response{req_id=ID, + proj_wp=#mpb_ll_writeprojectionresp{ + status=conv_from_status(Status)}}; +make_projection_resp(ID, get_all_projections, {ok, Projs}) -> + ProjsM = [conv_from_projection_v1(Proj) || Proj <- Projs], + #mpb_ll_response{req_id=ID, + proj_ga=#mpb_ll_getallprojectionsresp{ + status='OK', projs=ProjsM}}; +make_projection_resp(ID, get_all_projections, Status) -> + #mpb_ll_response{req_id=ID, + proj_ga=#mpb_ll_getallprojectionsresp{ + status=conv_from_status(Status)}}; +make_projection_resp(ID, list_all_projections, {ok, Epochs}) -> + #mpb_ll_response{req_id=ID, + proj_la=#mpb_ll_listallprojectionsresp{ + status='OK', epochs=Epochs}}; +make_projection_resp(ID, list_all_projections, Status) -> + #mpb_ll_response{req_id=ID, + proj_la=#mpb_ll_listallprojectionsresp{ + status=conv_from_status(Status)}}. + unmake_projection_resp(#mpb_ll_response{proj_gl=#mpb_ll_getlatestepochidresp{ status=Status, epoch_id=EID}}) -> case Status of @@ -183,7 +261,23 @@ unmake_projection_resp(#mpb_ll_response{proj_rp=#mpb_ll_readprojectionresp{ end; unmake_projection_resp(#mpb_ll_response{proj_wp=#mpb_ll_writeprojectionresp{ status=Status}}) -> - machi_pb_high_client:convert_general_status_code(Status). + machi_pb_high_client:convert_general_status_code(Status); +unmake_projection_resp(#mpb_ll_response{proj_ga=#mpb_ll_getallprojectionsresp{ + status=Status, projs=ProjsM}}) -> + case Status of + 'OK' -> + {ok, [conv_to_projection_v1(ProjM) || ProjM <- ProjsM]}; + _ -> + machi_pb_high_client:convert_general_status_code(Status) + end; +unmake_projection_resp(#mpb_ll_response{proj_la=#mpb_ll_listallprojectionsresp{ + status=Status, epochs=Epochs}}) -> + case Status of + 'OK' -> + {ok, Epochs}; + _ -> + machi_pb_high_client:convert_general_status_code(Status) + end. %%%%%%%%%%%%%%%%%%% @@ -258,3 +352,19 @@ conv_from_type(public) -> 'PUBLIC'. conv_to_type('PRIVATE') -> private; conv_to_type('PUBLIC') -> public. + +conv_from_status(ok) -> + 'OK'; +conv_from_status({error, bad_arg}) -> + 'BAD_ARG'; +conv_from_status({error, wedged}) -> + 'WEDGED'; +conv_from_status({error, bad_checksum}) -> + 'BAD_CHECKSUM'; +conv_from_status({error, partition}) -> + 'PARTITION'; +conv_from_status({error, not_written}) -> + 'NOT_WRITTEN'; +conv_from_status(_OOPS) -> + io:format(user, "HEY, ~s:~w got ~w\n", [?MODULE, ?LINE, _OOPS]), + 'BAD_JOSS'.