Merge pull request #4 from AntidoteDB/to_ranch

Bug fixes

Author: peterzeller

src/antidote_pb_codec.app.src

@@ -1,7 +1,7 @@
 {application, antidote_pb_codec,
     [
         {description, "Protocol buffer codec for Antidote"},
-        {vsn, "0.0.3"},
+        {vsn, "0.0.5"},
         {registered, []},
         {applications, [
             kernel,

src/antidote_pb_codec.erl

@@ -84,22 +84,20 @@
 | {static_update_objects, {Clock :: binary(), Properties :: list(), Updates :: [update()]}}
 | {static_read_objects, {Clock :: binary(), Properties :: list(), Objects :: [bound_object()]}}
 | {read_objects, {Objects :: [bound_object()], TxId :: binary()}}
-| {get_connection_descriptor, {}}.
+| {get_connection_descriptor, Descriptor :: binary()}.
 
 -type response() ::
   {error_response, {ErrorCode :: error_code(), Message :: binary()}}
-| {start_transaction_response, Resp :: {ok, TxId :: binary()}}
+| {start_transaction_response, {ok, TxId :: binary()}}
 | {commit_response, {ok, CommitTime :: any()}| {error, Reason :: error_code()}}
 | {static_read_objects_response, {ok, Results :: [{bound_object(), read_result()}], CommitTime :: binary()}}
 | {read_objects_response, Resp :: [{bound_object(), read_result()}]}
 | {operation_response, ok | {error, Reason :: error_code()}}
-| {get_connection_descriptor_resp, {ok, Descriptor :: any()} | {error, Reason :: error_code()}}.
+| {get_connection_descriptor_resp, {ok, Descriptor :: binary()} | {error, Reason :: error_code()}}.
 
 -type message() :: request() | response().
 
 
-
-
 messageTypeToCode('ApbErrorResp')             -> 0;
 messageTypeToCode('ApbRegUpdate')             -> 107;
 messageTypeToCode('ApbGetRegResp')            -> 108;
@@ -216,6 +214,16 @@ decode_message(#'ApbStaticReadObjects'{objects = Objects, transaction = Tx}) ->
 decode_message(#'ApbReadObjects'{boundobjects = Objects, transaction_descriptor = TxId}) ->
   {read_objects, {[decode_bound_object(O) || O <- Objects], binary_to_term(TxId)}};
 
+decode_message(#'ApbCreateDC'{nodes = Nodes}) ->
+  {create_dc, [list_to_atom(N) || N <- Nodes]};
+decode_message(#'ApbGetConnectionDescriptor'{}) ->
+  {get_connection_descriptor};
+decode_message(#'ApbGetConnectionDescriptorResp'{descriptor = Descriptor}) ->
+  {get_connection_descriptor, Descriptor};
+decode_message(#'ApbConnectToDCs'{descriptors = Descriptors}) ->
+  {connect_to_dcs, [binary_to_term(D) || D <- Descriptors]};
+
+
 decode_message(#'ApbErrorResp'{errcode = ErrorCode, errmsg = Message}) ->
   {error_response, {decode_error_code(ErrorCode), Message}};
 decode_message(#'ApbStartTransactionResp'{success = Success, transaction_descriptor = TxId, errorcode = ErrorCode}) ->
@@ -372,7 +380,8 @@ encode_txn_properties(_Props) ->
   #'ApbTxnProperties'{}.
 
 decode_txn_properties(_Properties) ->
-  {}.
+  %%TODO: Add more property parameters
+  [].
 
 
 %%%%%%%%%%%%%%%%%%%%%
@@ -813,7 +822,7 @@ decode_connect_to_DCs(#'ApbConnectToDCs'{descriptors = Descriptors}) ->
 %% Tests encode and decode
 start_transaction_test() ->
   Clock = term_to_binary(ignore),
-  Properties = {},
+  Properties = [],
   EncRecord = antidote_pb_codec:encode(start_transaction,
     {Clock, Properties}),
   [MsgCode, MsgData] = encode_msg(EncRecord),