From ed7b6e68b53f87ce9b9d081e81d722fe9773f787 Mon Sep 17 00:00:00 2001 From: Zeeshan Lakhani Date: Mon, 9 Mar 2015 01:07:34 -0400 Subject: [PATCH] * add optional timeout parameter to RpbYokozunaIndexPutReq --- dialyzer.ignore-warnings | 12 ++++-------- src/riak_yokozuna.proto | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dialyzer.ignore-warnings b/dialyzer.ignore-warnings index fd3e67eb..ef8bb4a1 100644 --- a/dialyzer.ignore-warnings +++ b/dialyzer.ignore-warnings @@ -47,19 +47,15 @@ riak_pb.erl:202: The pattern can never match the type <_,'boo riak_pb.erl:201: The pattern can never match the type <_,'bool' | 'bytes' | 'rpbbucketprops' | 'rpbbucketprops_rpbreplmode' | 'rpbcommithook' | 'rpbmodfun' | 'uint32'> riak_pb.erl:221: The pattern can never match the type <_,[],[{_,_}]> riak_search_pb.erl:46: Guard test is_list(Records::tuple()) can never succeed -riak_search_pb.erl:74: The pattern <_, 'repeated_packed', 'undefined', _, _> can never match the type <1..255,'optional' | 'repeated' | 'required',_,'bool' | 'bytes' | 'float' | 'int64' | 'rpbbucketkeypreflistitem' | 'rpbbucketprops' | 'rpbbucketprops_rpbreplmode' | 'rpbcommithook' | 'rpbmodfun' | 'rpbpair' | 'rpbsearchdoc' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> -riak_search_pb.erl:75: The pattern <_, 'repeated_packed', [], _, _> can never match the type <1..255,'optional' | 'repeated' | 'required',_,'bool' | 'bytes' | 'float' | 'int64' | 'rpbbucketkeypreflistitem' | 'rpbbucketprops' | 'rpbbucketprops_rpbreplmode' | 'rpbcommithook' | 'rpbmodfun' | 'rpbpair' | 'rpbsearchdoc' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> -riak_search_pb.erl:86: The pattern can never match the type <1..255,'optional' | 'repeated' | 'required',_,'bool' | 'bytes' | 'float' | 'int64' | 'rpbbucketkeypreflistitem' | 'rpbbucketprops' | 'rpbbucketprops_rpbreplmode' | 'rpbcommithook' | 'rpbmodfun' | 'rpbpair' | 'rpbsearchdoc' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> riak_search_pb.erl:202: The pattern can never match the type <_,'bool' | 'bytes' | 'float' | 'int64' | 'rpbbucketkeypreflistitem' | 'rpbbucketprops' | 'rpbbucketprops_rpbreplmode' | 'rpbcommithook' | 'rpbmodfun' | 'rpbpair' | 'rpbsearchdoc' | 'uint32'> riak_search_pb.erl:221: The pattern can never match the type <_,[],[{_,_}]> riak_yokozuna_pb.erl:46: Guard test is_list(Records::tuple()) can never succeed -riak_yokozuna_pb.erl:73: The pattern <_, 'repeated_packed', 'undefined', _, _> can never match the type <1 | 2 | 3,'optional' | 'repeated' | 'required',_,'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> -riak_yokozuna_pb.erl:74: The pattern <_, 'repeated_packed', [], _, _> can never match the type <1 | 2 | 3,'optional' | 'repeated' | 'required',_,'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> -riak_yokozuna_pb.erl:85: The pattern can never match the type <1 | 2 | 3,'optional' | 'repeated' | 'required',_,'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> -riak_yokozuna_pb.erl:100: The call riak_yokozuna_pb:enum_to_int(Type::'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32',Data::atom()) will never return since it differs in the 1st argument from the success typing arguments: ('pikachu','value') +riak_yokozuna_pb.erl:74: The pattern <_, 'repeated_packed', 'undefined', _, _> can never match the type <1 | 2 | 3 | 4,'optional' | 'repeated' | 'required',_,'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> +riak_yokozuna_pb.erl:75: The pattern <_, 'repeated_packed', [], _, _> can never match the type <1 | 2 | 3 | 4,'optional' | 'repeated' | 'required',_,'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> +riak_yokozuna_pb.erl:86: The pattern can never match the type <1 | 2 | 3 | 4,'optional' | 'repeated' | 'required',_,'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32',[[binary() | maybe_improper_list(any(),binary() | [])]]> riak_yokozuna_pb.erl:102: Function enum_to_int/2 has no local return riak_yokozuna_pb.erl:102: The pattern <'pikachu', 'value'> can never match the type <'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32',atom()> -riak_yokozuna_pb.erl:201: The pattern can never match the type <_,'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32'> +riak_yokozuna_pb.erl:202: The pattern can never match the type <_,'bool' | 'bytes' | 'rpbyokozunaindex' | 'rpbyokozunaschema' | 'uint32'> riak_yokozuna_pb.erl:221: The pattern can never match the type <_,[],[{_,_}]> ## Insufficient typing on record in generated code riak_pb_codec.erl:345: Invalid type specification for function riak_pb_codec:decode_commit_hooks/1. The success typing is ([any()]) -> [{atom(),atom() | [any(),...]} | {'modfun',atom(),atom() | [any(),...]}] diff --git a/src/riak_yokozuna.proto b/src/riak_yokozuna.proto index 085ca1ca..a9ea6944 100644 --- a/src/riak_yokozuna.proto +++ b/src/riak_yokozuna.proto @@ -49,6 +49,7 @@ message RpbYokozunaIndexGetResp { // PUT request - Create a new index message RpbYokozunaIndexPutReq { required RpbYokozunaIndex index = 1; + optional uint32 timeout = 2; // Timeout value } // DELETE request - Remove an index