You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2018/07/13 17:48:34 UTC
[couchdb] branch fix/984/view-keep-update-seq-after-compact updated
(8d6cb38 -> a19ef1d)
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 8d6cb38 Merge branch 'master' into fix/984/view-keep-update-seq-after-compact
omit 7f29417 Views now retain update_seq after compaction.
omit 572234f Add tests for mango conflict finding
omit 45a0ad9 Add `conflicts: true` option to mango selectors
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
new a19ef1d 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 (8d6cb38)
\
N -- N -- N refs/heads/fix/984/view-keep-update-seq-after-compact (a19ef1d)
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 ++--
src/mango/src/mango_cursor_view.erl | 8 ++---
src/mango/test/19-find-conflicts.py | 41 ----------------------
src/mango/test/mango.py | 5 ---
test/javascript/run | 8 ++---
.../tests-cluster/with-quorum/db_deletion.js | 12 ++-----
.../tests-cluster/without-quorum/db_creation.js | 3 +-
.../tests-cluster/without-quorum/db_deletion.js | 16 ++++-----
.../db_deletion_overridden_quorum.js | 8 +++--
10 files changed, 29 insertions(+), 79 deletions(-)
delete mode 100644 src/mango/test/19-find-conflicts.py
[couchdb] 01/01: Views now retain update_seq after compaction.
Posted by 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 a19ef1da9d6f0fdc39d9b8d249bb9225a37b01a8
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 and purge sequences. As a
result, views who were compacted at least once could no longer
use the ?update_seq query option, or purge properly.
Closes #984
---
src/couch_mrview/src/couch_mrview_compactor.erl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/couch_mrview/src/couch_mrview_compactor.erl b/src/couch_mrview/src/couch_mrview_compactor.erl
index e9be89c..3ef1180 100644
--- a/src/couch_mrview/src/couch_mrview_compactor.erl
+++ b/src/couch_mrview/src/couch_mrview_compactor.erl
@@ -233,6 +233,8 @@ compact_view(#mrview{id_num=VID}=View, EmptyView, BufferSize, Acc0) ->
{EmptyView#mrview{btree=NewBt,
seq_btree=NewSeqBt,
+ update_seq=View#mrview.update_seq,
+ purge_seq=View#mrview.purge_seq,
key_byseq_btree=NewKeyBySeqBt}, FinalAcc}.
compact_view_btree(Btree, EmptyBtree, VID, BufferSize, Acc0) ->