From af541366361310311dea3cfe3cecc36f8a14e39e Mon Sep 17 00:00:00 2001 From: UENISHI Kota Date: Tue, 21 Jul 2015 17:45:06 +0900 Subject: [PATCH 1/2] Add dvv_enabled to .proto definition and codec --- src/riak.proto | 2 ++ src/riak_pb_codec.erl | 7 +++++-- test/bucket_props_codec_eqc.erl | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/riak.proto b/src/riak.proto index 19aa929f..af1de978 100644 --- a/src/riak.proto +++ b/src/riak.proto @@ -157,6 +157,8 @@ message RpbBucketProps { // KV fast path optional bool write_once = 28; + + optional bool dvv_enabled = 29; } // Authentication request diff --git a/src/riak_pb_codec.erl b/src/riak_pb_codec.erl index 2dbb90e7..05bf3c50 100644 --- a/src/riak_pb_codec.erl +++ b/src/riak_pb_codec.erl @@ -189,7 +189,8 @@ decode_bucket_props(#rpbbucketprops{n_val=N, search_index=Index, datatype=Datatype, consistent=Consistent, - write_once=WriteOnce + write_once=WriteOnce, + dvv_enabled=DVVEnabled }) -> %% Extract numerical properties [ {P,V} || {P,V} <- [ {n_val, N}, {old_vclock, Old}, {young_vclock, Young}, @@ -200,7 +201,7 @@ decode_bucket_props(#rpbbucketprops{n_val=N, {BProp, Bool} <- [{allow_mult, AM}, {last_write_wins, LWW}, {basic_quorum, BQ}, {notfound_ok, NFOK}, {search, Search}, {consistent, Consistent}, - {write_once, WriteOnce}], + {write_once, WriteOnce}, {dvv_enabled, DVVEnabled}], Bool /= undefined ] ++ %% Extract commit hooks @@ -294,6 +295,8 @@ encode_bucket_props([{consistent, S}|Rest], Pb) -> encode_bucket_props(Rest, Pb#rpbbucketprops{consistent = encode_bool(S)}); encode_bucket_props([{write_once, S}|Rest], Pb) -> encode_bucket_props(Rest, Pb#rpbbucketprops{write_once = encode_bool(S)}); +encode_bucket_props([{dvv_enabled, Flag} | Rest], Pb) -> + encode_bucket_props(Rest, Pb#rpbbucketprops{dvv_enabled = encode_bool(Flag)}); encode_bucket_props([_Ignore|Rest], Pb) -> %% Ignore any properties not explicitly part of the PB message encode_bucket_props(Rest, Pb). diff --git a/test/bucket_props_codec_eqc.erl b/test/bucket_props_codec_eqc.erl index 6fc57a27..e4ed05d7 100644 --- a/test/bucket_props_codec_eqc.erl +++ b/test/bucket_props_codec_eqc.erl @@ -94,7 +94,8 @@ bucket_prop() -> yz_index(), datatype(), flag(consistent), - flag(write_once)]). + flag(write_once), + flag(dvv_enabled)]). sortuniq(Gen) -> ?LET(L, Gen, lists:ukeysort(1,L)). From 65f38ae1a601c249c65188e0e8c8e1f2ed277e14 Mon Sep 17 00:00:00 2001 From: UENISHI Kota Date: Tue, 21 Jul 2015 18:01:14 +0900 Subject: [PATCH 2/2] Fix dialyzer mismatch --- src/riak_pb_codec.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/riak_pb_codec.erl b/src/riak_pb_codec.erl index 05bf3c50..c27b4f24 100644 --- a/src/riak_pb_codec.erl +++ b/src/riak_pb_codec.erl @@ -349,11 +349,12 @@ encode_commit_hook({struct, Props}=Hook) -> end. %% @doc Converts a list of RpbCommitHook messages into commit hooks. --spec decode_commit_hooks([ #rpbcommithook{} ]) -> [ commit_hook_property() ]. +-spec decode_commit_hooks([ #rpbcommithook{} ]) -> [ modfun_property() | commit_hook_property() ]. decode_commit_hooks(Hooks) -> [ decode_commit_hook(Hook) || Hook <- Hooks, Hook =/= #rpbcommithook{modfun=undefined, name=undefined} ]. +-spec decode_commit_hook( #rpbcommithook{} ) -> modfun_property() | commit_hook_property(). decode_commit_hook(#rpbcommithook{modfun = Modfun}) when Modfun =/= undefined -> decode_modfun(Modfun, commit_hook); decode_commit_hook(#rpbcommithook{name = Name}) when Name =/= undefined ->