HTTP client API all-in-one [3/3] #1398
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Apr 17, 2016
hmmr
force-pushed
the
feature-az+th-http_client_api_allinone
branch
from
6348791
to
3948210
Compare
A two month worth of commits by @hmmr and @lehoff, squashed. The odd change in riak_kv_qry_worker (preserving lists for records in the return value of query) goes with the list_to_tuple conversion now happening in riak_kv_ts_api. Native lists from riak_kv_qry:submit are immediately consumable by mochijson2:encode, and this is the form we would like to have the query results in wm_timeseries_query.
hmmr
force-pushed
the
feature-az+th-http_client_api_allinone
branch
from
3948210
to
bf62ab8
Compare
| @@ -292,10 +292,8 @@ prepare_final_results2(#riak_sel_clause_v1{col_return_types = ColTypes, | |||
|
|
|||
| prepare_final_results_test() -> | |||
| Rows = [[12, <<"windy">>], [13, <<"windy">>]], | |||
There was a problem hiding this comment.
Shouldn't this be tuples then? I'll test and find out...
There was a problem hiding this comment.
list_to_tuple now happens in riak_kv_ts_svc, right before the records are delivered to the PB/TTB code and further to the client. This is so in order to avoid converting tuples back to lists in riak_kv_wm_timeseries_query, where lists are required for converting the data to json.
Which is why we still have native records-as-lists here.
…client_api_allinone
A two month worth of commits by @hmmr and @lehoff, squashed. The odd change in riak_kv_qry_worker (preserving lists for records in the return value of query) goes with the list_to_tuple conversion now happening in riak_kv_ts_api. Native lists from riak_kv_qry:submit are immediately consumable by mochijson2:encode, and this is the form we would like to have the query results in wm_timeseries_query.
…client_api_allinone
hmmr
force-pushed
the
feature-az+th-http_client_api_allinone
branch
from
bf62ab8
to
1912a98
Compare
added 2 commits
April 19, 2016 20:54
…asho/riak_kv into feature-az+th-http_client_api_allinone
| {ReqId, {error, timeout}} -> | ||
| {mochijson2:encode({struct, [{error, timeout}]}), done}; | ||
| _Weird -> | ||
| %% @todo: should we log this? |
There was a problem hiding this comment.
Probably a good idea. Might be useful to see if bad requests are being sent.
received from riak_kv_keys_fsm
|
👍 94db162 |
|
@borshop merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is Part 3/3 of #1382 broken up and reassembled into new commits.
Requires (includes) #1396, #1397 (with basho/riak_pb#190 (RIAK-2492)).
A two month worth of commits by @hmmr and @lehoff, squashed.
The odd change in riak_kv_qry_worker (preserving lists for records in the return value of query) goes with the list_to_tuple conversion now happening in riak_kv_ts_api. Native lists from riak_kv_qry:submit are immediately consumable by mochijson2:encode, and this is the form we would like to have the query results in wm_timeseries_query.