Merge pull request basho#398 from basho/bug/rdb/gh-kv967-embedded-cntr

Use the embedded counter inside a Map Reviewed-by: seancribbs
rzezeski · Jun 3, 2014 · 4e7d8f6 · 4e7d8f6
2 parents a517a39 + 0de52d6
commit 4e7d8f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/yz_dt_extractor.erl b/src/yz_dt_extractor.erl
@@ -128,6 +128,6 @@ extract_set(Name) ->
 -spec extract_map(field_path_name()) -> fun(({{binary(), module()}, term()}, state()) -> state()).
 extract_map(Prefix) ->
     fun({{FieldName, Mod}, Value}, Acc) ->
-            Type = riak_kv_crdt:from_mod(Mod),
+            Type = riak_kv_crdt:from_mod(Mod, ?EMBEDDED_TYPES),
             extract_fields({Prefix, FieldName}, Type, Value, Acc)
     end.
diff --git a/test/yz_dt_extractor_tests.erl b/test/yz_dt_extractor_tests.erl
@@ -67,7 +67,7 @@ raw_type(map) ->
            {update, {<<"activated">>, ?FLAG_TYPE}, enable},
            {update, {<<"name">>, ?REG_TYPE}, {assign, <<"Ryan Zezeski">> }},
            {update, {<<"phones">>, ?SET_TYPE}, {add_all, [<<"555-5555">>, <<"867-5309">>]}},
-           {update, {<<"page_views">>, ?COUNTER_TYPE}, {increment, 1502}},
+           {update, {<<"page_views">>, ?EMCNTR_TYPE}, {increment, 1502}},
            {update, {<<"events">>, ?MAP_TYPE},
             {update,
              [