couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject fabric commit: updated refs/heads/master to 42a67d0
Date Mon, 24 Aug 2015 16:11:47 GMT
Repository: couchdb-fabric
Updated Branches:
  refs/heads/master dcfcb2a97 -> 42a67d0a0


Use BigCouch/Cloudant seq format

Let's ease 2.0 transition by not introducing a new sequence format,
it's not even necessary now.


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

Branch: refs/heads/master
Commit: 42a67d0a018868d3760df90eca9d2e8e10614fd7
Parents: dcfcb2a
Author: Robert Newson <rnewson@apache.org>
Authored: Mon Aug 24 12:11:58 2015 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Mon Aug 24 17:11:30 2015 +0100

----------------------------------------------------------------------
 src/fabric_view_changes.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/42a67d0a/src/fabric_view_changes.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_changes.erl b/src/fabric_view_changes.erl
index 7bb4217..4855989 100644
--- a/src/fabric_view_changes.erl
+++ b/src/fabric_view_changes.erl
@@ -360,7 +360,7 @@ pack_seqs(Workers) ->
     SeqList = [{N,R,S} || {#shard{node=N, range=R}, S} <- Workers],
     SeqSum = lists:sum([seq(S) || {_,_,S} <- SeqList]),
     Opaque = couch_util:encodeBase64Url(term_to_binary(SeqList, [compressed])),
-    [SeqSum, Opaque].
+    ?l2b([integer_to_list(SeqSum), $-, Opaque]).
 
 seq({Seq, _Uuid, _Node}) -> Seq;
 seq({Seq, _Uuid}) -> Seq;
@@ -372,7 +372,7 @@ unpack_seqs(0, DbName) ->
 unpack_seqs("0", DbName) ->
     fabric_dict:init(mem3:shards(DbName), 0);
 
-unpack_seqs([_SeqNum, Opaque], DbName) ->
+unpack_seqs([_SeqNum, Opaque], DbName) -> % deprecated
     do_unpack_seqs(Opaque, DbName);
 
 unpack_seqs(Packed, DbName) ->


Mime
View raw message