Skip to content

Commit

Permalink
shorten lines, add spaces around operators
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrei Zavada committed Apr 17, 2016
1 parent 711933d commit 3cd3730
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/riak_kv_pb_ts.erl
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ 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(Response) ->
Response.
Response.
3 changes: 2 additions & 1 deletion src/riak_kv_ts_svc.erl
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ process_stream({ReqId, Error}, ReqId,
-spec create_table({?DDL{}, proplists:proplist()}, #state{}) ->
{reply, tsqueryresp | #rpberrorresp{}, #state{}}.
create_table({DDL = ?DDL{table = Table}, WithProps}, State) ->
{ok, Props1} = riak_kv_ts_util:apply_timeseries_bucket_props(DDL, riak_ql_ddl_compiler:get_compiler_version(), WithProps),
{ok, Props1} = riak_kv_ts_util:apply_timeseries_bucket_props(
DDL, riak_ql_ddl_compiler:get_compiler_version(), WithProps),
case catch [riak_kv_wm_utils:erlify_bucket_prop(P) || P <- Props1] of
{bad_linkfun_modfun, {M, F}} ->
{reply, make_table_create_fail_resp(
Expand Down

0 comments on commit 3cd3730

Please sign in to comment.