Merge pull request #303 from basho/feature-jrd-ts_datatypes

Allow TS clients to see column data types

Author: macintux

src/riakc_ts.erl

@@ -90,7 +90,8 @@ query_common(Pid, Query, Interpolations, Cover, Options)
     Msg1 = Msg0#tsqueryreq{cover_context = Cover},
     Msg = {Msg1, {msgopts, Options}},
     Response = server_call(Pid, Msg),
-    riakc_ts_query_operator:deserialize(Response).
+    riakc_ts_query_operator:deserialize(Response,
+                                        proplists:get_value(datatypes, Options, false)).
 
 
 %% @doc Generate a parallel coverage plan for the specified 'query'

src/riakc_ts_query_operator.erl

@@ -29,7 +29,7 @@
 -include_lib("riak_pb/include/riak_ts_ttb.hrl").
 
 -export([serialize/2,
-         deserialize/1]).
+         deserialize/1, deserialize/2]).
 
 serialize(QueryText, Interpolations) ->
     Content = #tsinterpolation{
@@ -47,17 +47,32 @@ serialize_interpolations([{Key, Value} | RemainingInterps],
     UpdatedInterps = [#rpbpair{key=Key, value=Value} | SerializedInterps],
     serialize_interpolations(RemainingInterps, UpdatedInterps).
 
-deserialize({error, {Code, Message}}) when is_integer(Code), is_list(Message) ->
+deserialize(Response) ->
+    deserialize(Response, false).
+
+%% 2nd (boolean) argument indicates whether column types should be
+%% included in the response. It's a bit silly that they aren't by
+%% default, but that's an old oversight/decision that can't be
+%% trivially changed without risking backwards compatibility.
+deserialize({error, {Code, Message}}, _IncludeColumnTypes)
+  when is_integer(Code), is_list(Message) ->
     {error, {Code, iolist_to_binary(Message)}};
-deserialize({error, {Code, Message}}) when is_integer(Code), is_atom(Message) ->
+deserialize({error, {Code, Message}}, _IncludeColumnTypes)
+  when is_integer(Code), is_atom(Message) ->
     {error, {Code, iolist_to_binary(atom_to_list(Message))}};
-deserialize({error, Message}) ->
+deserialize({error, Message}, _IncludeColumnTypes) ->
     {error, Message};
-deserialize(tsqueryresp) ->
+deserialize(tsqueryresp, _Types) ->
     {ok, {[], []}};
-deserialize({tsqueryresp, {ColumnNames, _ColumnTypes, Rows}}) ->
+deserialize({tsqueryresp, {ColumnNames, _ColumnTypes, Rows}}, false) ->
     {ok, {ColumnNames, Rows}};
-deserialize(#tsqueryresp{columns = C, rows = R}) ->
+deserialize({tsqueryresp, {ColumnNames, ColumnTypes, Rows}}, true) ->
+    {ok, {lists:zip(ColumnNames, ColumnTypes), Rows}};
+deserialize(#tsqueryresp{columns = C, rows = R}, false) ->
     ColumnNames = [ColName || #tscolumndescription{name = ColName} <- C],
     Rows = riak_pb_ts_codec:decode_rows(R),
-    {ok, {ColumnNames, Rows}}.
+    {ok, {ColumnNames, Rows}};
+deserialize(#tsqueryresp{columns = C, rows = R}, true) ->
+    Columns = [{ColName, ColType} || #tscolumndescription{name = ColName, type = ColType} <- C],
+    Rows = riak_pb_ts_codec:decode_rows(R),
+    {ok, {Columns, Rows}}.