Removed gentle-rain configuration (#497)

AntidoteDB · Sep 14, 2022 · 1482b81 · 1482b81
1 parent 6f1528f
commit 1482b81
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 281 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 REBAR = $(shell pwd)/rebar3
 COVERPATH = $(shell pwd)/_build/test/cover
-.PHONY: rel test relgentlerain docker-build docker-run
+.PHONY: rel test docker-build docker-run
 
 all: compile
 
@@ -35,9 +35,6 @@ lint:
 
 check: distclean test reltest dialyzer lint
 
-relgentlerain: export TXN_PROTOCOL=gentlerain
-relgentlerain: relclean rel
-
 relnocert: export NO_CERTIFICATION=true
 relnocert: relclean rel
 

diff --git a/apps/antidote/src/cure.erl b/apps/antidote/src/cure.erl
@@ -173,39 +173,13 @@ obtain_objects(Clock, Properties, Objects, StateOrValue) ->
             ),
             {ok, transform_reads([Val], StateOrValue, Objects), CommitTime};
         false ->
-            case application:get_env(antidote, txn_prot) of
-                {ok, clocksi} ->
-                    {ok, TxId} = clocksi_istart_tx(Clock, Properties),
-                    case obtain_objects(Objects, TxId, StateOrValue) of
-                        {ok, Res} ->
-                            {ok, CommitTime} = commit_transaction(TxId),
-                            {ok, Res, CommitTime};
-                        {error, Reason} ->
-                            {error, Reason}
-                    end;
-                {ok, gr} ->
-                    case Objects of
-                        %% Single object read = read latest value
-                        [_Op] ->
-                            {ok, TxId} = clocksi_istart_tx(Clock, Properties),
-                            case obtain_objects(Objects, TxId, StateOrValue) of
-                                {ok, Res} ->
-                                    {ok, CommitTime} = commit_transaction(TxId),
-                                    {ok, Res, CommitTime};
-                                {error, Reason} ->
-                                    {error, Reason}
-                            end;
-                        %% Read Multiple objects  = read from a snapshot
-                        [_ | _] ->
-                            %% Snapshot includes all updates committed at time GST
-                            %% from local and remote replicas
-                            case gr_snapshot_obtain(Clock, Objects, StateOrValue) of
-                                {ok, Result, CommitTime} ->
-                                    {ok, Result, CommitTime};
-                                {error, Reason} ->
-                                    {error, Reason}
-                            end
-                    end
+            {ok, TxId} = clocksi_istart_tx(Clock, Properties),
+            case obtain_objects(Objects, TxId, StateOrValue) of
+                {ok, Res} ->
+                    {ok, CommitTime} = commit_transaction(TxId),
+                    {ok, Res, CommitTime};
+                {error, Reason} ->
+                    {error, Reason}
             end
     end.
 
@@ -256,33 +230,6 @@ clocksi_full_icommit(TxId) ->
             Msg
     end.
 
-%%% Snapshot read for Gentlerain protocol
-gr_snapshot_obtain(ClientClock, Objects, StateOrValue) ->
-    %% GST = scalar stable time
-    %% VST = vector stable time with entries for each dc
-    {ok, GST, VST} = dc_utilities:get_scalar_stable_time(),
-    DcId = dc_utilities:get_my_dc_id(),
-    Dt = vectorclock:get(DcId, ClientClock),
-    case Dt =< GST of
-        true ->
-            %% Set all entries in snapshot as GST
-            ST = vectorclock:set_all(GST, VST),
-            %% ST doesn't contain entry for local dc, hence explicitly
-            %% add it in snapshot time
-            SnapshotTime = vectorclock:set(DcId, GST, ST),
-            {ok, TxId} = clocksi_istart_tx(SnapshotTime, [{update_clock, false}]),
-            case obtain_objects(Objects, TxId, StateOrValue) of
-                {ok, Res} ->
-                    {ok, CommitTime} = commit_transaction(TxId),
-                    {ok, Res, CommitTime};
-                {error, Reason} ->
-                    {error, Reason}
-            end;
-        false ->
-            timer:sleep(10),
-            gr_snapshot_obtain(ClientClock, Objects, StateOrValue)
-    end.
-
 format_read_params(ReadObjects) ->
     lists:map(
         fun({Key, Type, Bucket}) ->

diff --git a/apps/antidote/src/dc_utilities.erl b/apps/antidote/src/dc_utilities.erl
@@ -258,28 +258,12 @@ get_stable_snapshot() ->
             timer:sleep(10),
             get_stable_snapshot();
         SS ->
-            case application:get_env(antidote, txn_prot) of
-                {ok, clocksi} ->
-                    %% This is fine if transactions coordinators exists on the ring (i.e. they have access
-                    %% to riak core meta-data) otherwise will have to change this
-                    {ok, SS};
-                {ok, gr} ->
-                    %% For gentlerain use the same format as clocksi
-                    %% But, replicate GST to all entries in the dict
-                    StableSnapshot = SS,
-                    case vectorclock:size(StableSnapshot) of
-                        0 ->
-                            {ok, StableSnapshot};
-                        _ ->
-                            MembersInDc = dc_utilities:get_my_dc_nodes(),
-                            GST = vectorclock:min_clock(StableSnapshot, MembersInDc),
-                            {ok, vectorclock:set_all(GST, StableSnapshot)}
-                    end
-            end
+            %% This is fine if transactions coordinators exists on the ring (i.e. they have access
+            %% to riak core meta-data) otherwise will have to change this
+            {ok, SS}
     end.
 
 %% Returns the minimum value in the stable vector snapshot time
-%% Useful for gentlerain protocol.
 -spec get_scalar_stable_time() -> {ok, pos_integer(), vectorclock()}.
 get_scalar_stable_time() ->
     {ok, StableSnapshot} = get_stable_snapshot(),

diff --git a/apps/antidote/test/multidc/gr_SUITE.erl b/apps/antidote/test/multidc/gr_SUITE.erl
diff --git a/apps/antidote/test/singledc/gr_SUITE.erl b/apps/antidote/test/singledc/gr_SUITE.erl
diff --git a/config/sys.config.src b/config/sys.config.src
@@ -68,7 +68,6 @@
 
     %% txn_prot:
     %%        clocksi -> uses "Cure" protocol to define snapshots and causal dependencies (https://pages.lip6.fr/Marc.Shapiro/papers/Cure-final-ICDCS16.pdf)
-    %%        gr -> uses "Gentle-rain like" protocol to define snapshots and causal dependencies (https://infoscience.epfl.ch/record/202079)
     %{txn_prot, clocksi},
 
     %% recover_from_log: