umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Strip ALL_BUCKET - only used in AAE

Browse source
This commit is contained in:
Martin Sumner 2018-10-29 16:56:58 +00:00
parent 2e2c35fe1b
commit 671b6e7f99
1 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/leveled_codec.erl
View file

@ -73,7 +73,6 @@
-define(MAGIC, 53). % riak_kv -> riak_object -define(MAGIC, 53). % riak_kv -> riak_object
-define(LMD_FORMAT, "~4..0w~2..0w~2..0w~2..0w~2..0w"). -define(LMD_FORMAT, "~4..0w~2..0w~2..0w~2..0w~2..0w").
-define(NRT_IDX, "$aae."). -define(NRT_IDX, "$aae.").
-define(ALL_BUCKETS, <<"$all">>).
-type riak_metadata() :: {binary()|delete, % Sibling Metadata -type riak_metadata() :: {binary()|delete, % Sibling Metadata
binary()|null, % Vclock Metadata binary()|null, % Vclock Metadata
@ -247,8 +246,6 @@ from_ledgerkey(_ExpectedTag, _OtherKey) ->
-spec from_ledgerkey(tuple()) -> tuple(). -spec from_ledgerkey(tuple()) -> tuple().
%% @doc %% @doc
%% Return identifying information from the LedgerKey %% Return identifying information from the LedgerKey
from_ledgerkey({?IDX_TAG, ?ALL_BUCKETS, {_IdxFld, IdxVal}, {Bucket, Key}}) ->
{Bucket, Key, IdxVal};
from_ledgerkey({?IDX_TAG, Bucket, {_IdxFld, IdxVal}, Key}) -> from_ledgerkey({?IDX_TAG, Bucket, {_IdxFld, IdxVal}, Key}) ->
{Bucket, Key, IdxVal}; {Bucket, Key, IdxVal};
from_ledgerkey({?HEAD_TAG, Bucket, Key, SubKey}) -> from_ledgerkey({?HEAD_TAG, Bucket, Key, SubKey}) ->
@ -546,22 +543,8 @@ idx_indexspecs(IndexSpecs, Bucket, Key, SQN, TTL) ->
gen_indexspec(Bucket, Key, IdxOp, IdxField, IdxTerm, SQN, TTL) -> gen_indexspec(Bucket, Key, IdxOp, IdxField, IdxTerm, SQN, TTL) ->
Status = set_status(IdxOp, TTL), Status = set_status(IdxOp, TTL),
case Bucket of {to_ledgerkey(Bucket, Key, ?IDX_TAG, IdxField, IdxTerm),
{all, RealBucket} -> {SQN, Status, no_lookup, null}}.
{to_ledgerkey(?ALL_BUCKETS,
{RealBucket, Key},
?IDX_TAG,
IdxField,
IdxTerm),
{SQN, Status, no_lookup, null}};
_ ->
{to_ledgerkey(Bucket,
Key,
?IDX_TAG,
IdxField,
IdxTerm),
{SQN, Status, no_lookup, null}}
end.
gen_headspec(Bucket, Key, IdxOp, SubKey, Value, SQN, TTL) -> gen_headspec(Bucket, Key, IdxOp, SubKey, Value, SQN, TTL) ->
Status = set_status(IdxOp, TTL), Status = set_status(IdxOp, TTL),