[couchdb] branch fix/984/view-keep-update-seq-after-compact updated (11a2109 -> 3cc9932)

[ja...@apache.org]

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

jan pushed a change to branch fix/984/view-keep-update-seq-after-compact
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit 11a2109  Merge branch 'master' into fix/984/view-keep-update-seq-after-compact
    omit 71cf9f4  Adjust deletion tests in different cluster quorum conditions
    omit 177c22d  Deletion responds 200 after a response from every node, and 202 in other case
    omit 80e431f  Fix for issue #1136 - Error 500 deleting DB without quorum
    omit 698efba  Views now retain update_seq after compaction.
     new 3cc9932  Views now retain update_seq after compaction.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (11a2109)
            \
             N -- N -- N   refs/heads/fix/984/view-keep-update-seq-after-compact (3cc9932)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/couch_mrview/src/couch_mrview_compactor.erl          |  1 +
 src/fabric/src/fabric_db_delete.erl                      |  6 +++---
 test/javascript/run                                      |  8 ++++----
 test/javascript/tests-cluster/with-quorum/db_deletion.js | 12 +++---------
 .../tests-cluster/without-quorum/db_creation.js          |  3 ++-
 .../tests-cluster/without-quorum/db_deletion.js          | 16 +++++++---------
 .../without-quorum/db_deletion_overridden_quorum.js      |  8 ++++++--
 7 files changed, 26 insertions(+), 28 deletions(-)

[couchdb] 01/01: Views now retain update_seq after compaction.

[ja...@apache.org]

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

jan pushed a commit to branch fix/984/view-keep-update-seq-after-compact
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 3cc99325df27bc4b42e958dc3025d70df1becbaf
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Jul 13 13:39:28 2018 +0200

    Views now retain update_seq after compaction.
    
    Previously on view compaction, the new index state would not carry
    over the associated database update sequence. As a result, views
    who were compacted at least once could no longer use the ?update_seq
    query option.
    
    Closes #984
---
 src/couch_mrview/src/couch_mrview_compactor.erl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/couch_mrview/src/couch_mrview_compactor.erl b/src/couch_mrview/src/couch_mrview_compactor.erl
index e9be89c..d9872d9 100644
--- a/src/couch_mrview/src/couch_mrview_compactor.erl
+++ b/src/couch_mrview/src/couch_mrview_compactor.erl
@@ -233,6 +233,7 @@ compact_view(#mrview{id_num=VID}=View, EmptyView, BufferSize, Acc0) ->
 
     {EmptyView#mrview{btree=NewBt,
                       seq_btree=NewSeqBt,
+                      update_seq=View#mrview.update_seq,
                       key_byseq_btree=NewKeyBySeqBt}, FinalAcc}.
 
 compact_view_btree(Btree, EmptyBtree, VID, BufferSize, Acc0) ->