Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 54286 invoked from network); 13 Mar 2011 13:01:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Mar 2011 13:01:34 -0000 Received: (qmail 45521 invoked by uid 500); 13 Mar 2011 13:01:34 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 45484 invoked by uid 500); 13 Mar 2011 13:01:34 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 45477 invoked by uid 99); 13 Mar 2011 13:01:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Mar 2011 13:01:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Mar 2011 13:01:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E0C4823889E5; Sun, 13 Mar 2011 13:01:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1081107 - /couchdb/branches/1.1.x/src/couchdb/couch_rep.erl Date: Sun, 13 Mar 2011 13:01:08 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110313130108.E0C4823889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fdmanana Date: Sun Mar 13 13:01:08 2011 New Revision: 1081107 URL: http://svn.apache.org/viewvc?rev=1081107&view=rev Log: Merged revision 1081106 from trunk Add replication ID version information to checkpoints Now that we have versioned replication IDs (introduced by COUCHDB-810), it's useful to know which version is being used in the replication checkpoints. This is mostly for debugging purposes. Modified: couchdb/branches/1.1.x/src/couchdb/couch_rep.erl Modified: couchdb/branches/1.1.x/src/couchdb/couch_rep.erl URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/src/couchdb/couch_rep.erl?rev=1081107&r1=1081106&r2=1081107&view=diff ============================================================================== --- couchdb/branches/1.1.x/src/couchdb/couch_rep.erl (original) +++ couchdb/branches/1.1.x/src/couchdb/couch_rep.erl Sun Mar 13 13:01:08 2011 @@ -679,7 +679,8 @@ do_checkpoint(State) -> ]}, BaseHistory = [ {<<"session_id">>, SessionId}, - {<<"source_last_seq">>, NewSeqNum} + {<<"source_last_seq">>, NewSeqNum}, + {<<"replication_id_version">>, ?REP_ID_VERSION} ] ++ case couch_util:get_value(<<"doc_ids">>, RepDoc) of undefined -> [];