A copy of HTTP client API for TS (#1371)

include/riak_kv_ts.hrl

@@ -76,14 +76,4 @@
           helper_mod            :: atom()
         }).
 
--type ts_requests() :: #tsputreq{} | #tsdelreq{} | #tsgetreq{} |
-                       #tslistkeysreq{} | #tsqueryreq{}.
--type ts_responses() :: #tsputresp{} | #tsdelresp{} | #tsgetresp{} |
-                        #tslistkeysresp{} | #tsqueryresp{} |
-                        #rpberrorresp{}.
--type ts_get_response() :: {tsgetresp, {list(binary()), list(atom()), list(list(term()))}}.
--type ts_query_response() :: {tsqueryresp, {list(binary()), list(atom()), list(list(term()))}}.
--type ts_query_responses() :: #tsqueryresp{} | ts_query_response().
--type ts_query_types() :: ?DDL{} | ?SQL_SELECT{} | #riak_sql_describe_v1{} |
-                          #riak_sql_insert_v1{}.
 -endif.

include/riak_kv_ts_svc.hrl

@@ -24,32 +24,6 @@
 -ifndef(RIAK_KV_TS_SVC_HRL).
 -define(RIAK_KV_TS_SVC_HRL, included).
 
-%% per RIAK-1437, error codes assigned to TS are in the 1000-1500 range
--define(E_SUBMIT,            1001).
--define(E_FETCH,             1002).
--define(E_IRREG,             1003).
--define(E_PUT,               1004).
--define(E_NOCREATE,          1005).   %% unused
--define(E_NOT_TS_TYPE,       1006).
--define(E_MISSING_TYPE,      1007).
--define(E_MISSING_TS_MODULE, 1008).
--define(E_DELETE,            1009).
--define(E_GET,               1010).
--define(E_BAD_KEY_LENGTH,    1011).
--define(E_LISTKEYS,          1012).
--define(E_TIMEOUT,           1013).
--define(E_CREATE,            1014).
--define(E_CREATED_INACTIVE,  1015).
--define(E_CREATED_GHOST,     1016).
--define(E_ACTIVATE,          1017).
--define(E_BAD_QUERY,         1018).
--define(E_TABLE_INACTIVE,    1019).
--define(E_PARSE_ERROR,       1020).
--define(E_NOTFOUND,          1021).
-
--define(FETCH_RETRIES, 10).  %% TODO make it configurable in tsqueryreq
--define(TABLE_ACTIVATE_WAIT, 30). %% ditto
-
 -record(state, {
           req,
           req_ctx,

src/riak_kv_pb_ts.erl

@@ -42,31 +42,31 @@ init() ->
     #state{}.
 
 -spec decode(integer(), binary()) ->
-                    {ok, ts_requests(), {PermSpec::string(), Table::binary()}} |
+                    {ok, riak_kv_ts_svc:ts_requests(), {PermSpec::string(), Table::binary()}} |
                     {error, _}.
 decode(Code, Bin) when Code >= 90, Code =< 103 ->
     Msg = riak_pb_codec:decode(Code, Bin),
     case Msg of
         #tsqueryreq{query = Q, cover_context = Cover} ->
             riak_kv_ts_svc:decode_query_common(Q, Cover);
         #tsgetreq{table = Table}->
-            {ok, Msg, {"riak_kv.ts_get", Table}};
+            {ok, Msg, {riak_kv_ts_api:api_call_to_perm(get), Table}};
         #tsputreq{table = Table} ->
-            {ok, Msg, {"riak_kv.ts_put", Table}};
+            {ok, Msg, {riak_kv_ts_api:api_call_to_perm(put), Table}};
         #tsdelreq{table = Table} ->
-            {ok, Msg, {"riak_kv.ts_del", Table}};
+            {ok, Msg, {riak_kv_ts_api:api_call_to_perm(delete), Table}};
         #tslistkeysreq{table = Table} ->
-            {ok, Msg, {"riak_kv.ts_listkeys", Table}};
+            {ok, Msg, {riak_kv_ts_api:api_call_to_perm(listkeys), Table}};
         #tscoveragereq{table = Table} ->
-            {ok, Msg, {"riak_kv.ts_cover", Table}}
+            {ok, Msg, {riak_kv_ts_api:api_call_to_perm(coverage), Table}}
     end.
 
 -spec encode(tuple()) -> {ok, iolist()}.
 encode(Message) ->
     {ok, riak_pb_codec:encode(Message)}.
 
--spec process(atom() | ts_requests() | ts_query_types(), #state{}) ->
-                     {reply, ts_responses(), #state{}}.
+-spec process(atom() | riak_kv_ts_svc:ts_requests() | riak_kv_ts_svc:ts_query_types(), #state{}) ->
+                     {reply, riak_kv_ts_svc:ts_responses(), #state{}}.
 process(Request, State) ->
     encode_response(riak_kv_ts_svc:process(Request, State)).
 
@@ -76,16 +76,20 @@ process_stream(Message, ReqId, State) ->
     riak_kv_ts_svc:process_stream(Message, ReqId, State).
 
 encode_response({reply, {tsqueryresp, {_, _, []}}, State}) ->
-    Encoded = #tsqueryresp{columns=[], rows=[]},
+    Encoded = #tsqueryresp{columns = {[], []}, rows = []},
     {reply, Encoded, State};
 encode_response({reply, {tsqueryresp, {CNames, CTypes, Rows}}, State}) ->
-    Encoded = #tsqueryresp{columns=riak_pb_ts_codec:encode_columns(CNames, CTypes),
-                           rows=riak_pb_ts_codec:encode_rows(CTypes, Rows)},
+    Encoded = #tsqueryresp{columns = riak_pb_ts_codec:encode_columns(CNames, CTypes),
+                           rows = riak_pb_ts_codec:encode_rows(CTypes, Rows)},
     {reply, Encoded, State};
 encode_response({reply, {tsgetresp, {CNames, CTypes, Rows}}, State}) ->
     C = riak_pb_ts_codec:encode_columns(CNames, CTypes),
     R = riak_pb_ts_codec:encode_rows(CTypes, Rows),
-    Encoded = #tsgetresp{columns=C, rows=R},
+    Encoded = #tsgetresp{columns = C, rows = R},
+    {reply, Encoded, State};
+
+encode_response({reply, {tscoverageresp, Entries}, State}) ->
+    Encoded = #tscoverageresp{entries = riak_pb_ts_codec:encode_cover_list(Entries)},
     {reply, Encoded, State};
 encode_response(Response) ->
-    Response. 
+    Response.