You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ei...@apache.org on 2019/11/22 01:58:03 UTC
[couchdb] 14/14: Change mrheader record
This is an automated email from the ASF dual-hosted git repository.
eiri pushed a commit to branch 2167-no-view-changes
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit def6707e3b9c7fec54ddc8db99690b9f3e9db0b1
Author: Eric Avdey <ei...@eiri.ca>
AuthorDate: Tue Nov 19 12:44:47 2019 -0400
Change mrheader record
---
src/couch_mrview/include/couch_mrview.hrl | 1 -
src/couch_mrview/src/couch_mrview_util.erl | 12 +++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/couch_mrview/include/couch_mrview.hrl b/src/couch_mrview/include/couch_mrview.hrl
index 0f0fbf3..bb0ab0b 100644
--- a/src/couch_mrview/include/couch_mrview.hrl
+++ b/src/couch_mrview/include/couch_mrview.hrl
@@ -49,7 +49,6 @@
seq=0,
purge_seq=0,
id_btree_state=nil,
- log_btree_state=nil,
view_states=nil
}).
diff --git a/src/couch_mrview/src/couch_mrview_util.erl b/src/couch_mrview/src/couch_mrview_util.erl
index d8127ef..6f58e9d 100644
--- a/src/couch_mrview/src/couch_mrview_util.erl
+++ b/src/couch_mrview/src/couch_mrview_util.erl
@@ -286,7 +286,7 @@ init_state(Db, Fd, State, Header) ->
purge_seq=PurgeSeq,
id_btree_state=IdBtreeState,
view_states=ViewStates
- } = Header,
+ } = maybe_update_header(Header),
IdBtOpts = [
{compression, couch_compress:get_compression_method()}
@@ -1016,6 +1016,16 @@ old_view_format(View, SI, KSI) ->
View#mrview.options
}.
+maybe_update_header(#mrheader{} = Header) ->
+ Header;
+maybe_update_header(Header) when tuple_size(Header) == 6 ->
+ #mrheader{
+ seq = element(2, Header),
+ purge_seq = element(3, Header),
+ id_btree_state = element(4, Header),
+ view_states = element(6, Header)
+ }.
+
%% End of <= 2.x upgrade code.
make_view_state(#mrview{} = View) ->