You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2018/03/26 20:55:37 UTC

[couchdb] 06/33: WIP - test suite upgrades

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch COUCHDB-3326-clustered-purge-davisp-refactor
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit cd6452aa95f6ed407c5d920a9ff83f7cf463910b
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Mar 26 10:25:49 2018 -0500

    WIP - test suite upgrades
---
 src/couch/src/test_engine_compaction.erl | 16 +++-------------
 src/couch/src/test_engine_util.erl       | 24 ++++--------------------
 2 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/src/couch/src/test_engine_compaction.erl b/src/couch/src/test_engine_compaction.erl
index 51970ee..665b7d8 100644
--- a/src/couch/src/test_engine_compaction.erl
+++ b/src/couch/src/test_engine_compaction.erl
@@ -209,19 +209,9 @@ cet_recompact_purge() ->
         {'$gen_cast', {compact_done, Engine, Term0}} ->
             Term0;
         {'DOWN', Ref, _, _, Reason} ->
-            erlang:error({compactor_died, Reason});
-        {'$gen_call', {NewPid, Ref2}, get_disposable_purge_seq} ->
-            NewPid!{Ref2, {ok, 0}},
-            receive
-                {'$gen_cast', {compact_done, Engine, Term0}} ->
-                    Term0;
-                {'DOWN', Ref, _, _, Reason} ->
-                    erlang:error({compactor_died, Reason})
-                after 10000 ->
-                    erlang:error(compactor_timed_out)
-            end
-        after 10000 ->
-            erlang:error(compactor_timed_out)
+            erlang:error({compactor_died, Reason})
+    after 10000 ->
+        erlang:error(compactor_timed_out)
     end,
 
     {ok, St6, undefined} = Engine:finish_compaction(St5, DbName, [], NewTerm),
diff --git a/src/couch/src/test_engine_util.erl b/src/couch/src/test_engine_util.erl
index bd49969..68e83b1 100644
--- a/src/couch/src/test_engine_util.erl
+++ b/src/couch/src/test_engine_util.erl
@@ -627,26 +627,10 @@ compact(Engine, St1, DbPath) ->
     Term = receive
         {'$gen_cast', {compact_done, Engine, Term0}} ->
             Term0;
-            erlang:error({compactor_died, Reason});
-        {'$gen_call', {Pid, Ref2}, get_disposable_purge_seq} ->
-            % assuming no client exists (no internal replications or indexes)
-            PSeq = Engine:get_purge_seq(St2),
-            OldestPSeq = Engine:get_oldest_purge_seq(St2),
-            PDocsLimit = Engine:get_purged_docs_limit(St2),
-            ExpectedDispPSeq = PSeq - PDocsLimit,
-            DisposablePSeq = if ExpectedDispPSeq > 0 -> ExpectedDispPSeq;
-                    true -> OldestPSeq - 1 end,
-            Pid!{Ref2, {ok, DisposablePSeq}},
-            receive
-                {'$gen_cast', {compact_done, Engine, Term0}} ->
-                    Term0;
-                {'DOWN', Ref, _, _, Reason} ->
-                    erlang:error({compactor_died, Reason})
-                after 10000 ->
-                    erlang:error(compactor_timed_out)
-            end
-        after ?COMPACTOR_TIMEOUT ->
-            erlang:error(compactor_timed_out)
+        {'DOWN', Ref, _, _, Reason} ->
+            erlang:error({compactor_died, Reason})
+    after ?COMPACTOR_TIMEOUT ->
+        erlang:error(compactor_timed_out)
     end,
 
     {ok, St2, DbName, Pid, Term}.

-- 
To stop receiving notification emails like this one, please contact
davisp@apache.org.