Skip to content
This repository has been archived by the owner on Sep 28, 2021. It is now read-only.

No longer use non-binary term in update. #312

Merged
merged 4 commits into from
Jan 8, 2021
Merged

No longer use non-binary term in update. #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9cb73c
No longer use non-binary term in update.
cmeiklejohn Jan 3, 2021
f3780e2
Prevent usage of non-iolist values as actors.
cmeiklejohn Jan 3, 2021
ee9158b
Replace usage of self() with term_to_binary(self())).
cmeiklejohn Jan 3, 2021
b784092
Merge pull request #313 from lasp-lang/non-binary-terms-2
cmeiklejohn Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ Key1 = <<"key1">>.
AwMapType = {state_awmap, [state_mvregister]}.
{ok, {AwMap, _, _, _}} = lasp:declare({AwMapVarName, AwMapType}, AwMapType).


% Update the CRDT with the content
{ok, _} = lasp:update(AwMap, {apply, Key1, {set, nil, Content}}, self()).
{ok, _} = lasp:update(AwMap, {apply, Key1, {set, nil, Content}}, term_to_binary(self())).
```

Go to node b and retrieve the content of the CRDT:
Expand Down
6 changes: 5 additions & 1 deletion src/lasp.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ declare(Id, Type) ->
%% at the given `Id'.
%%
-spec update(id(), operation(), actor()) -> {ok, var()} | {error, timeout}.
update(Id, Operation, Actor) ->
update(Id, Operation, Actor) when is_list(Actor) ->
do(update, [Id, Operation, Actor]);
update(Id, Operation, Actor) when is_binary(Actor) ->
do(update, [Id, Operation, Actor]);
update(Id, Operation, Actor) when is_atom(Actor) ->
do(update, [Id, Operation, Actor]).

%% @doc Bind a dataflow variable to a value.
Expand Down
36 changes: 18 additions & 18 deletions test/lasp_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,9 +860,9 @@ counter_enforce_once_test(Config) ->
end,

%% Increment counter twice to get trigger to fire.
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, term_to_binary(self())]),

lager:info("Waiting for response..."),
receive
Expand Down Expand Up @@ -924,9 +924,9 @@ counter_strict_enforce_once_test(Config) ->
timer:sleep(1000),

%% Increment counter twice to get trigger to fire.
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, increment, term_to_binary(self())]),

lager:info("Waiting for response..."),
receive
Expand Down Expand Up @@ -981,9 +981,9 @@ awset_enforce_once_test(Config) ->
end,

%% Increment counter twice to get trigger to fire.
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 1}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 2}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 3}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 1}, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 2}, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 3}, term_to_binary(self())]),

lager:info("Waiting for response..."),
receive
Expand Down Expand Up @@ -1035,9 +1035,9 @@ awset_strict_enforce_once_test(Config) ->
end,

%% Increment counter twice to get trigger to fire.
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 1}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 2}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 3}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 1}, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 2}, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 3}, term_to_binary(self())]),

lager:info("Waiting for response..."),
receive
Expand Down Expand Up @@ -1089,9 +1089,9 @@ orset_enforce_once_test(Config) ->
end,

%% Increment counter twice to get trigger to fire.
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 1}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 2}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 3}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 1}, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 2}, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 3}, term_to_binary(self())]),

lager:info("Waiting for response..."),
receive
Expand Down Expand Up @@ -1143,9 +1143,9 @@ orset_strict_enforce_once_test(Config) ->
end,

%% Increment counter twice to get trigger to fire.
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 1}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 2}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 3}, self()]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 1}, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 2}, term_to_binary(self())]),
{ok, _} = rpc:call(Node, lasp, update, [Id, {add, 3}, term_to_binary(self())]),

lager:info("Waiting for response..."),
receive
Expand Down