Skip to content

Add new backend capability for Riak r_object use #552

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.

Sign up for GitHub

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

Closed
slfritchie wants to merge 3 commits into from
Closed

Add new backend capability for Riak r_object use #552

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44167e7
Intermediate refactoring: isolate Mod:put() and Mod:get()
slfritchie May 4, 2013
a23dec8
QuickCheck-related changes for fs2 backend
slfritchie May 15, 2013
15fb639
Address Jordan's review comments
slfritchie May 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Address Jordan's review comments
  • Loading branch information
@slfritchie
slfritchie committed May 17, 2013
commit 15fb639b5865a95cdb142928f7d090140e834085
26 changes: 13 additions & 13 deletions src/riak_kv_vnode.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ perform_put({true, Obj},
bkey={Bucket, Key},
reqid=ReqID,
index_specs=IndexSpecs}) ->
case encode_and_Mod_put(Obj, Mod, Bucket, Key, IndexSpecs, ModState) of
case encode_and_put(Obj, Mod, Bucket, Key, IndexSpecs, ModState) of
{{ok, UpdModState}, EncodedVal} ->
update_hashtree(Bucket, Key, EncodedVal, State),
case RB of
Expand Down Expand Up @@ -1130,15 +1130,15 @@ do_get_term({Bucket, Key}, Mod, ModState) ->
end.

do_get_binary(Bucket, Key, Mod, ModState) ->
case mod_capability_uses_r_object(Mod, ModState, Bucket) of
case uses_r_object(Mod, ModState, Bucket) of
true ->
Mod:get_object(Bucket, Key, true, ModState);
false ->
Mod:get(Bucket, Key, ModState)
end.

do_get_object(Bucket, Key, Mod, ModState) ->
case mod_capability_uses_r_object(Mod, ModState, Bucket) of
case uses_r_object(Mod, ModState, Bucket) of
true ->
Mod:get_object(Bucket, Key, false, ModState);
false ->
Expand Down Expand Up @@ -1330,8 +1330,8 @@ do_diffobj_put({Bucket, Key}, DiffObj,
false ->
IndexSpecs = []
end,
case encode_and_Mod_put(DiffObj, Mod, Bucket, Key,
IndexSpecs, ModState) of
case encode_and_put(DiffObj, Mod, Bucket, Key,
IndexSpecs, ModState) of
{{ok, _UpdModState} = InnerRes, EncodedVal} ->
update_hashtree(Bucket, Key, EncodedVal, StateData),
update_index_write_stats(IndexBackend, IndexSpecs),
Expand All @@ -1355,8 +1355,8 @@ do_diffobj_put({Bucket, Key}, DiffObj,
false ->
IndexSpecs = []
end,
case encode_and_Mod_put(AMObj, Mod, Bucket, Key,
IndexSpecs, ModState) of
case encode_and_put(AMObj, Mod, Bucket, Key,
IndexSpecs, ModState) of
{{ok, _UpdModState} = InnerRes, EncodedVal} ->
update_hashtree(Bucket, Key, EncodedVal, StateData),
update_index_write_stats(IndexBackend, IndexSpecs),
Expand Down Expand Up @@ -1541,14 +1541,14 @@ object_info({Bucket, _Key}=BKey) ->
Hash = riak_core_util:chash_key(BKey),
{Bucket, Hash}.

-spec encode_and_Mod_put(
Obj::riak_object:riak_object(), Mod::term(), Bucket::riak_object:bucket(),
Key::riak_object:key(), IndexSpecs::list(), ModState::term()) ->
-spec encode_and_put(
Obj::riak_object:riak_object(), Mod::term(), Bucket::riak_object:bucket(),
Key::riak_object:key(), IndexSpecs::list(), ModState::term()) ->
{{ok, UpdModState::term()}, EncodedObj::binary()} |
{{error, Reason::term(), UpdModState::term()}, EncodedObj::binary()}.

encode_and_Mod_put(Obj, Mod, Bucket, Key, IndexSpecs, ModState) ->
case mod_capability_uses_r_object(Mod, ModState, Bucket) of
encode_and_put(Obj, Mod, Bucket, Key, IndexSpecs, ModState) ->
case uses_r_object(Mod, ModState, Bucket) of
true ->
Mod:put_object(Bucket, Key, IndexSpecs, Obj, ModState);
false ->
Expand All @@ -1557,7 +1557,7 @@ encode_and_Mod_put(Obj, Mod, Bucket, Key, IndexSpecs, ModState) ->
{Mod:put(Bucket, Key, IndexSpecs, EncodedVal, ModState), EncodedVal}
end.

mod_capability_uses_r_object(Mod, ModState, Bucket) ->
uses_r_object(Mod, ModState, Bucket) ->
{ok, Capabilities} = Mod:capabilities(Bucket, ModState),
lists:member(uses_r_object, Capabilities).

Expand Down