Merge pull request #339 from basho/features/lrb/use-gpb

Use gpb protobuf library
basho · Dec 8, 2016 · c203271 · c203271
2 parents 736ad33 + 6f09a57
commit c203271
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/rebar.config b/rebar.config
@@ -13,7 +13,7 @@
 ]}.
 
 {deps, [
-    {riak_pb, "2.2.*", {git, "https://github.com/basho/riak_pb", {tag, "2.2.0.2"}}}
+    {riak_pb, "2.2.*", {git, "https://github.com/basho/riak_pb", {branch, "develop"}}}
 ]}.
 
 {edoc_opts, [

diff --git a/src/riakc_pb_socket.erl b/src/riakc_pb_socket.erl
@@ -27,15 +27,14 @@
 
 -module(riakc_pb_socket).
 -include_lib("kernel/include/inet.hrl").
--include_lib("riak_pb/include/riak_pb.hrl").
+-include_lib("riak_pb/include/riak_dt_pb.hrl").
 -include_lib("riak_pb/include/riak_kv_pb.hrl").
+-include_lib("riak_pb/include/riak_pb.hrl").
 -include_lib("riak_pb/include/riak_pb_kv_codec.hrl").
--include_lib("riak_pb/include/riak_ts_pb.hrl").
 -include_lib("riak_pb/include/riak_search_pb.hrl").
--include_lib("riak_pb/include/riak_yokozuna_pb.hrl").
--include_lib("riak_pb/include/riak_dt_pb.hrl").
 -include_lib("riak_pb/include/riak_ts_pb.hrl").
 -include_lib("riak_pb/include/riak_ts_ttb.hrl").
+-include_lib("riak_pb/include/riak_yokozuna_pb.hrl").
 -include("riakc.hrl").
 -behaviour(gen_server).
 
@@ -1565,7 +1564,7 @@ put_options([{timeout, T} | Rest], Req) when is_integer(T) ->
 put_options([{timeout, _T} | _Rest], _Req) ->
     erlang:error(badarg);
 put_options([return_body | Rest], Req) ->
-    put_options(Rest, Req#rpbputreq{return_body = 1});
+    put_options(Rest, Req#rpbputreq{return_body = true});
 put_options([return_head | Rest], Req) ->
     put_options(Rest, Req#rpbputreq{return_head = true});
 put_options([if_not_modified | Rest], Req) ->