Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup az post ttb and develop merge #277

Merged
merged 2 commits into from
Apr 19, 2016

Conversation

hmmr
Copy link
Contributor

@hmmr hmmr commented Apr 15, 2016

Relates to basho/riak_kv#1382, requires basho/riak_pb#190.

Contains a fix for the case of riakc_ts:get returning an empty set, where the client connection is broken with an error message implicating 'tsgetresp'.

Also, properly decode the error message of get_coverage (previously, this was done in riak_kv_ts_svc, which is not the right place for assembling #ts... records since this module now serves PB as well as TTB messages).

@@ -46,6 +46,8 @@ deserialize({error, {Code, Message}}) when is_integer(Code), is_atom(Message) ->
{error, {Code, iolist_to_binary(atom_to_list(Message))}};
deserialize({error, Message}) ->
{error, Message};
deserialize(tsgetresp) ->
{ok, {[], []}};
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hmmr Looks like we had similar solutions to this problem: #276 Adding the second head I added (with empty rows) would make it consistent with riakc_ts_query_operator:deserialize.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. Sorry I didn't see your PR in time (it had taken me a good hour to arrive at the same conclusion).

@lukebakken
Copy link
Contributor

Testing manually works fine. Build errors:

==> build (compile)
./rebar xref skip_deps=true
==> build (xref)
src/riak_pb_ts_codec.erl: Warning: riak_pb_ts_codec:decode_cover_list/1 is undefined function (Xref)
src/riakc_ts.erl:95: Warning: riakc_ts:get_coverage/3 calls undefined function riak_pb_ts_codec:decode_cover_list/1 (Xref)
ERROR: xref failed while processing /home/buildbot/masters/riak/erlang-client-test/build: rebar_abort
make[1]: *** [xref] Error 1
make[1]: Leaving directory `/home/buildbot/masters/riak/erlang-client-test/build'
make: *** [lint] Error 2
make: Leaving directory `/home/buildbot/masters/riak/erlang-client-test/build/buildbot'

@hmmr
Copy link
Contributor Author

hmmr commented Apr 15, 2016

But you need basho/riak_pb#190 (that is, the branch in it).

@lukebakken
Copy link
Contributor

lukebakken commented Apr 15, 2016

That's from buildbot, not my machine. Too bad we don't have a better way to specify deps.

Anyway, make -C buildbot lint is fine on my machine.

+1 e8272aa

@hazen
Copy link

hazen commented Apr 19, 2016

👍 bff6899

@hazen
Copy link

hazen commented Apr 19, 2016

@borshop merge

@hazen hazen merged commit 6786f04 into riak_ts-develop Apr 19, 2016
@hazen hazen deleted the fixup-az-post_ttb_and_develop_merge branch April 19, 2016 03:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants