couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [18/50] fabric commit: updated refs/heads/windsor-merge-121 to 79e6e2f
Date Fri, 01 Aug 2014 09:12:06 GMT
Fix hot upgrade for new since values


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/60e93b0b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/60e93b0b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/60e93b0b

Branch: refs/heads/windsor-merge-121
Commit: 60e93b0b485b40f09b6263e2c58250a6d6a0ece6
Parents: d9cf946
Author: Robert Newson <robert.newson@cloudant.com>
Authored: Mon Sep 16 22:17:49 2013 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu Jul 31 11:12:34 2014 +0100

----------------------------------------------------------------------
 src/fabric_rpc.erl          | 9 ++++++---
 src/fabric_view_changes.erl | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/60e93b0b/src/fabric_rpc.erl
----------------------------------------------------------------------
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index 20d7a5a..7b4473f 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -277,13 +277,14 @@ changes_enumerator(DocInfo, {Db, _Seq, Args, Options}) ->
         {Go, {Db, Seq, Args, Options}}
     end.
 
+% TODO change to {Seq, uuid(Db)}
 changes_row(Db, #doc_info{id=Id, high_seq=Seq}=DI, Results, Del, true, Opts) ->
     Doc = doc_member(Db, DI, Opts),
-    #change{key={Seq, uuid(Db)}, id=Id, value=Results, doc=Doc, deleted=Del};
+    #change{key={Seq, uuid(Db), []}, id=Id, value=Results, doc=Doc, deleted=Del};
 changes_row(Db, #doc_info{id=Id, high_seq=Seq}, Results, true, _, _) ->
-    #change{key={Seq, uuid(Db)}, id=Id, value=Results, deleted=true};
+    #change{key={Seq, uuid(Db), []}, id=Id, value=Results, deleted=true};
 changes_row(Db, #doc_info{id=Id, high_seq=Seq}, Results, _, _, _) ->
-    #change{key={Seq, uuid(Db)}, id=Id, value=Results}.
+    #change{key={Seq, uuid(Db), []}, id=Id, value=Results}.
 
 doc_member(Shard, DocInfo, Opts) ->
     case couch_db:open_doc(Shard, DocInfo, [deleted | Opts]) of
@@ -367,6 +368,8 @@ set_io_priority(DbName, Options) ->
 
 calculate_start_seq(_Db, _Node, Seq) when is_integer(Seq) ->
     Seq;
+calculate_start_seq(Db, Node, {Seq, Uuid, _}) -> % remove me
+    calculate_start_seq(Db, Node, {Seq, Uuid});
 calculate_start_seq(Db, Node, {Seq, Uuid}) ->
     case is_prefix(Uuid, couch_db:get_uuid(Db)) of
         true ->

http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/60e93b0b/src/fabric_view_changes.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_changes.erl b/src/fabric_view_changes.erl
index 4e0cd9e..a54748a 100644
--- a/src/fabric_view_changes.erl
+++ b/src/fabric_view_changes.erl
@@ -297,6 +297,7 @@ pack_seqs(Workers) ->
     Opaque = couch_util:encodeBase64Url(term_to_binary(SeqList, [compressed])),
     [SeqSum, Opaque].
 
+seq({Seq, _Uuid, _Node}) -> Seq; % remove me
 seq({Seq, _Uuid}) -> Seq;
 seq(Seq)          -> Seq.
 


Mime
View raw message