valitydev/bender
14
0
Fork 0
mirror of https://github.com/valitydev/bender.git synced 2024-11-06 00:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MSPF-566: bender integers (#28)

Browse Source 
* update proto

* fix spelling

* add integer id type

* update tests

* update generator

* update handler

* improve naming

* more naming updates

* revert test naming
This commit is contained in:
Roman Pushkov 2020-08-10 16:36:34 +03:00 committed by GitHub
parent 786f3ef63d
commit 90ca71b80a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/bender/src/bender_generator.erl
View File

@ -126,11 +126,13 @@ not_implemented(What) ->
internal_id().
generate(snowflake, _WoodyCtx) ->
bender_utils:unique_id();
<<IntegerID:64>> = snowflake:new(),
ID = genlib_format:format_int_base(IntegerID, 62),
{ID, IntegerID};
generate(#constant{internal_id = InternalID}, _WoodyCtx) ->
InternalID;
generate(#sequence{id = SequenceID, minimum = Minimum}, WoodyCtx) ->
{ok, Value} = bender_sequence:get_next(SequenceID, Minimum, WoodyCtx),
integer_to_binary(Value).
{ok, IntegerID} = bender_sequence:get_next(SequenceID, Minimum, WoodyCtx),
{integer_to_binary(IntegerID), IntegerID}.

53
apps/bender/test/bender_tests_SUITE.erl
View File

@ -18,8 +18,8 @@
-export([contention/1]).
-export([generator_init/1]).
-export([retreive_unknown_id/1]).
-export([retreive_known_id/1]).
-export([retrieve_unknown_id/1]).
-export([retrieve_known_id/1]).
-include_lib("bender_proto/include/bender_thrift.hrl").
@ -36,7 +36,7 @@ all() ->
[
{group, main},
{group, contention},
{group, retreive_id}
{group, retrieve_id}
].
-define(parallel_workers, 100).
@ -62,9 +62,9 @@ groups() ->
{contention, [{repeat_until_all_ok, 10}], [
contention
]},
{retreive_id, [parallel], [
retreive_unknown_id,
retreive_known_id
{retrieve_id, [parallel], [
retrieve_unknown_id,
retrieve_known_id
]}
].
@ -144,10 +144,10 @@ sequence(C) ->
ExternalID = bender_utils:unique_id(),
Schema = {sequence, #bender_SequenceSchema{sequence_id = SequenceID}},
UserCtx = {bin, <<"come to daddy">>},
<<"1">> = generate_weak(ExternalID, Schema, UserCtx, Client),
{<<"1">>, 1} = generate_weak(ExternalID, Schema, UserCtx, Client),
OtherID = bender_utils:unique_id(),
<<"2">> = generate_weak(OtherID, Schema, UserCtx, Client),
<<"1">> = generate_strict(ExternalID, Schema, UserCtx, Client),
{<<"2">>, 2} = generate_weak(OtherID, Schema, UserCtx, Client),
{<<"1">>, 1} = generate_strict(ExternalID, Schema, UserCtx, Client),
ok.
-spec sequence_minimum(config()) ->
@ -158,12 +158,12 @@ sequence_minimum(C) ->
SequenceID = bender_utils:unique_id(),
Schema1 = {sequence, #bender_SequenceSchema{sequence_id = SequenceID}},
UserCtx = {bin, <<"benutzerkontext">>},
<<"1">> = generate_weak(bender_utils:unique_id(), Schema1, UserCtx, Client),
Schema2 = {sequence, #bender_SequenceSchema{sequence_id = SequenceID, minimum = 10}},
<<"10">> = generate_weak(bender_utils:unique_id(), Schema2, UserCtx, Client),
{<<"1">>, 1} = generate_weak(bender_utils:unique_id(), Schema1, UserCtx, Client),
Schema2 = {sequence, #bender_SequenceSchema{sequence_id = SequenceID, minimum = 4}},
{<<"4">>, 4} = generate_weak(bender_utils:unique_id(), Schema2, UserCtx, Client),
OtherSeqID = bender_utils:unique_id(),
Schema3 = {sequence, #bender_SequenceSchema{sequence_id = OtherSeqID, minimum = 42}},
<<"42">> = generate_weak(bender_utils:unique_id(), Schema3, UserCtx, Client),
Schema3 = {sequence, #bender_SequenceSchema{sequence_id = OtherSeqID, minimum = 8}},
{<<"8">>, 8} = generate_weak(bender_utils:unique_id(), Schema3, UserCtx, Client),
ok.
-spec snowflake(config()) ->
@ -174,8 +174,8 @@ snowflake(C) ->
ExternalID = bender_utils:unique_id(),
Schema = {snowflake, #bender_SnowflakeSchema{}},
UserCtx = {bin, <<"breaking nudes">>},
InternalID = generate_weak(ExternalID, Schema, UserCtx, Client),
InternalID = generate_strict(ExternalID, Schema, UserCtx, Client),
{InternalID, IntegerInternalID} = generate_weak(ExternalID, Schema, UserCtx, Client),
{InternalID, IntegerInternalID} = generate_strict(ExternalID, Schema, UserCtx, Client),
ok.
-spec different_schemas(config()) ->
@ -264,10 +264,10 @@ generator_init(_C) ->
},
{ok, _Result} = woody_client:call(Call, Options).
-spec retreive_unknown_id(config()) ->
-spec retrieve_unknown_id(config()) ->
ok.
retreive_unknown_id(C) ->
retrieve_unknown_id(C) ->
Client = get_client(C),
ExternalID = bender_utils:unique_id(),
try
@ -278,10 +278,10 @@ retreive_unknown_id(C) ->
ok
end.
-spec retreive_known_id(config()) ->
-spec retrieve_known_id(config()) ->
ok.
retreive_known_id(C) ->
retrieve_known_id(C) ->
Client = get_client(C),
ExternalID = bender_utils:unique_id(),
InternalID = bender_utils:unique_id(),
@ -299,11 +299,18 @@ get_client(C) ->
?config(client, C).
generate(ExternalID, Schema, UserCtx, Client) ->
case bender_client:generate_id(ExternalID, Schema, UserCtx, Client) of
#bender_GenerationResult{
internal_id = InternalID,
context = PrevUserCtx
} = bender_client:generate_id(ExternalID, Schema, UserCtx, Client),
{InternalID, PrevUserCtx}.
context = PrevUserCtx,
integer_internal_id = undefined
} -> {InternalID, PrevUserCtx};
#bender_GenerationResult{
internal_id = InternalID,
context = PrevUserCtx,
integer_internal_id = IntegerInternalID
} -> {{InternalID, IntegerInternalID}, PrevUserCtx}
end.
generate_strict(ExternalID, Schema, UserCtx, Client) ->
{InternalID, UserCtx} = generate(ExternalID, Schema, UserCtx, Client),