Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6EA1D11DEC for ; Thu, 1 May 2014 14:07:20 +0000 (UTC) Received: (qmail 84748 invoked by uid 500); 1 May 2014 14:06:55 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 84322 invoked by uid 500); 1 May 2014 14:06:49 -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 84281 invoked by uid 99); 1 May 2014 14:06:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 14:06:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6D28388B5EA; Thu, 1 May 2014 14:06:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Thu, 01 May 2014 14:06:50 -0000 Message-Id: <6cbf6f4157424d0ca88b36ca8275610b@git.apache.org> In-Reply-To: <05a2236fcff84a5eac43b51cdf0a8dd5@git.apache.org> References: <05a2236fcff84a5eac43b51cdf0a8dd5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/23] couch-replicator commit: updated refs/heads/1843-feature-bigcouch to 4965655 Use latest=true when retrieving revisions This allows the replicator to keep up with revisions that may have occured after missing_revs was called. BugzID: 14241 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/27dbba31 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/27dbba31 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/27dbba31 Branch: refs/heads/1843-feature-bigcouch Commit: 27dbba3162c47261f8acca907b32fa6f70f8716a Parents: 7c9704c Author: Bob Dionne Authored: Tue Aug 7 12:42:36 2012 -0400 Committer: Adam Kocoloski Committed: Wed Oct 2 11:59:02 2013 -0400 ---------------------------------------------------------------------- src/couch_replicator_api_wrap.erl | 2 ++ src/couch_replicator_worker.erl | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/27dbba31/src/couch_replicator_api_wrap.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_api_wrap.erl b/src/couch_replicator_api_wrap.erl index 90cfa8e..cd69e59 100644 --- a/src/couch_replicator_api_wrap.erl +++ b/src/couch_replicator_api_wrap.erl @@ -465,6 +465,8 @@ options_to_query_args([revs | Rest], Acc) -> options_to_query_args(Rest, [{"revs", "true"} | Acc]); options_to_query_args([{open_revs, all} | Rest], Acc) -> options_to_query_args(Rest, [{"open_revs", "all"} | Acc]); +options_to_query_args([latest | Rest], Acc) -> + options_to_query_args(Rest, [{"latest", "true"} | Acc]); options_to_query_args([{open_revs, Revs} | Rest], Acc) -> JsonRevs = ?b2l(?JSON_ENCODE(couch_doc:revs_to_strs(Revs))), options_to_query_args(Rest, [{"open_revs", JsonRevs} | Acc]). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/27dbba31/src/couch_replicator_worker.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_worker.erl b/src/couch_replicator_worker.erl index e8a3570..d66d478 100644 --- a/src/couch_replicator_worker.erl +++ b/src/couch_replicator_worker.erl @@ -296,13 +296,13 @@ spawn_doc_reader(Source, Target, FetchParams) -> fetch_doc(Source, {Id, Revs, PAs}, DocHandler, Acc) -> try couch_replicator_api_wrap:open_doc_revs( - Source, Id, Revs, [{atts_since, PAs}], DocHandler, Acc) + Source, Id, Revs, [{atts_since, PAs}, latest], DocHandler, Acc) catch throw:{missing_stub, _} -> ?LOG_ERROR("Retrying fetch and update of document `~s` due to out of " "sync attachment stubs. Missing revisions are: ~s", [Id, couch_doc:revs_to_strs(Revs)]), - couch_replicator_api_wrap:open_doc_revs(Source, Id, Revs, [], DocHandler, Acc) + couch_replicator_api_wrap:open_doc_revs(Source, Id, Revs, [latest], DocHandler, Acc) end.