Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 92723 invoked from network); 27 Jan 2011 15:24:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Jan 2011 15:24:56 -0000 Received: (qmail 84649 invoked by uid 500); 27 Jan 2011 15:24:56 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 84516 invoked by uid 500); 27 Jan 2011 15:24:53 -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 84499 invoked by uid 99); 27 Jan 2011 15:24:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jan 2011 15:24:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 27 Jan 2011 15:24:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 00D3623889E0; Thu, 27 Jan 2011 15:24:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1064157 - /couchdb/trunk/src/couchdb/couch_rep_reader.erl Date: Thu, 27 Jan 2011 15:24:29 -0000 To: commits@couchdb.apache.org From: kocolosk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110127152430.00D3623889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kocolosk Date: Thu Jan 27 15:24:29 2011 New Revision: 1064157 URL: http://svn.apache.org/viewvc?rev=1064157&view=rev Log: Fix calculation of URL length in replicator COUCHDB-644, COUCHDB-1044 Modified: couchdb/trunk/src/couchdb/couch_rep_reader.erl Modified: couchdb/trunk/src/couchdb/couch_rep_reader.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep_reader.erl?rev=1064157&r1=1064156&r2=1064157&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_rep_reader.erl (original) +++ couchdb/trunk/src/couchdb/couch_rep_reader.erl Thu Jan 27 15:24:29 2011 @@ -177,9 +177,9 @@ calculate_new_high_seq(State) -> hd(State#state.opened_seqs). split_revlist(Rev, {[CurrentAcc|Rest], BaseLength, Length}) -> - case Length+size(Rev) > 8192 of + case Length+size(Rev)+3 > 8192 of false -> - {[[Rev|CurrentAcc] | Rest], BaseLength, Length+size(Rev)}; + {[[Rev|CurrentAcc] | Rest], BaseLength, Length+size(Rev)+3}; true -> {[[Rev],CurrentAcc|Rest], BaseLength, BaseLength} end. @@ -214,7 +214,7 @@ open_doc_revs(#http_db{url = Url} = DbS, %% MochiWeb into multiple requests BaseQS = [{revs,true}, {latest,true}, {att_encoding_info,true}], BaseReq = DbS#http_db{resource=encode_doc_id(DocId), qs=BaseQS}, - BaseLength = length(couch_rep_httpc:full_url(BaseReq)) + 11, % &open_revs= + BaseLength = length(couch_rep_httpc:full_url(BaseReq) ++ "&open_revs=[]"), {RevLists, _, _} = lists:foldl(fun split_revlist/2, {[[]], BaseLength, BaseLength}, couch_doc:revs_to_strs(Revs)),