Merge pull request basho#13 from basho/sdc-fix-index-marshalling

Special-case the encoding of index entries since integers are allowed
bookshelfdave · Jul 13, 2012 · 26b684d · 26b684d
2 parents 9aa630a + 090396d
commit 26b684d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/riak_pb_kv_codec.erl b/src/riak_pb_kv_codec.erl
@@ -95,7 +95,7 @@ encode_content_meta(?MD_LASTMOD, {MS,S,US}, PbContent) ->
 encode_content_meta(?MD_USERMETA, UserMeta, PbContent) when is_list(UserMeta) ->
     PbContent#rpbcontent{usermeta = [encode_pair(E) || E <- UserMeta]};
 encode_content_meta(?MD_INDEX, Indexes, PbContent) when is_list(Indexes) ->
-    PbContent#rpbcontent{indexes = [encode_pair(E) || E <- Indexes]};
+    PbContent#rpbcontent{indexes = [encode_index_pair(E) || E <- Indexes]};
 encode_content_meta(?MD_DELETED, DeletedVal, PbContent) ->
     PbContent#rpbcontent{deleted=header_val_to_bool(DeletedVal)};
 encode_content_meta(_Key, _Value, PbContent) ->
@@ -177,6 +177,13 @@ decode_content(PbC) ->
 
     {dict:from_list(MD), PbC#rpbcontent.value}.
 
+%% @doc Convert {K,V} index entries into protocol buffers
+-spec encode_index_pair({binary(), integer() | binary()}) -> #rpbpair{}.
+encode_index_pair({K,V}) when is_integer(V) ->
+    encode_pair({K, integer_to_list(V)});
+encode_index_pair(E) ->
+    encode_pair(E).
+
 %% @doc Convert {K,V} tuple to protocol buffers
 %% @equiv riak_pb_codec:encode_pair/1
 -spec encode_pair({Key::binary(), Value::any()}) -> #rpbpair{}.

diff --git a/test/encoding_test.erl b/test/encoding_test.erl
@@ -48,6 +48,19 @@ pb_test_() ->
                  ?assertEqual(true, MdSame1),
                  ?assertEqual(true, MdSame2)
              end)},
+     {"indexes encode decode",
+      ?_test(begin
+                 InputMD = dict:from_list([{?MD_INDEX, [{"index_bin", "foo"},
+                                                        {"index_int", 10}]}]),
+                 ExpectedMD = [{?MD_INDEX, [{<<"index_bin">>, <<"foo">>},
+                                            {<<"index_int">>, <<"10">>}]}],
+                 Value = <<"test value">>,
+                 {OutputMD, _} = riak_pb_kv_codec:decode_content(
+                                         riak_kv_pb:decode_rpbcontent(
+                                           riak_kv_pb:encode_rpbcontent(
+                                             riak_pb_kv_codec:encode_content({InputMD, Value})))),
+                 ?assertEqual(ExpectedMD, dict:to_list(OutputMD))
+             end)},
      {"empty content encode decode",
       ?_test(begin
                  MetaData = dict:new(),