couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [couchdb] 19/31: All tests passing
Date Tue, 23 Jul 2019 21:55:04 GMT
This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch prototype/views
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit cefa11130a7fb094795d4746a4797ac5d6cc8866
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
AuthorDate: Tue Jul 23 11:51:49 2019 -0500

    All tests passing
---
 src/couch_views/src/couch_views_reader.erl    | 4 +---
 src/couch_views/test/couch_views_map_test.erl | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/couch_views/src/couch_views_reader.erl b/src/couch_views/src/couch_views_reader.erl
index 2deb9f6..25144ba 100644
--- a/src/couch_views/src/couch_views_reader.erl
+++ b/src/couch_views/src/couch_views_reader.erl
@@ -153,9 +153,7 @@ mrargs_to_fdb_options(Args) ->
         {EndKey1, EndKeyDocId, _} when not InclusiveEnd ->
             [{end_key_gt, {EndKey1, EndKeyDocId}}];
         {EndKey1, EndKeyDocId, _} when InclusiveEnd ->
-            [{end_key, {EndKey1, EndKeyDocId}}];
-        {EndKey1, EndKeyDocId, _} when InclusiveEnd ->
-            [{end_key_gt, {EndKey1, EndKeyDocId}}]
+            [{end_key, {EndKey1, EndKeyDocId}}]
     end,
 
     [
diff --git a/src/couch_views/test/couch_views_map_test.erl b/src/couch_views/test/couch_views_map_test.erl
index c5db382..8fe9ffd 100644
--- a/src/couch_views/test/couch_views_map_test.erl
+++ b/src/couch_views/test/couch_views_map_test.erl
@@ -401,8 +401,9 @@ should_map_update_is_lazy() ->
     ?assertEqual({ok, []}, Result1),
 
     {ok, Mrst} = couch_views_util:ddoc_to_mrst(DbName, DDoc),
-    {ok, Subscription, _, _} = couch_views_jobs:subscribe(Db, Mrst),
-    couch_jobs:wait(Subscription, finished, 1000),
+    JobId = couch_views_jobs:job_id(Db, Mrst),
+    UpdateSeq = fabric2_db:get_update_seq(Db),
+    ok = couch_views_jobs:wait_for_job(JobId, UpdateSeq),
 
     Args2 = #{
         start_key => 8,


Mime
View raw message