Return-Path: Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: (qmail 10653 invoked from network); 21 Mar 2010 20:22:25 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Mar 2010 20:22:25 -0000 Received: (qmail 97122 invoked by uid 500); 21 Mar 2010 20:22:24 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 96930 invoked by uid 500); 21 Mar 2010 20:22:24 -0000 Mailing-List: contact dev-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 dev@couchdb.apache.org Received: (qmail 96922 invoked by uid 99); 21 Mar 2010 20:22:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Mar 2010 20:22:24 +0000 X-ASF-Spam-Status: No, hits=0.7 required=10.0 tests=AWL,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [80.244.253.218] (HELO mail.traeumt.net) (80.244.253.218) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Mar 2010 20:22:15 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.traeumt.net (Postfix) with ESMTP id 87EF91B52D for ; Sun, 21 Mar 2010 21:21:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail.g3th.net Received: from unknown by localhost (amavisd-new, unix socket) id 0JKPKD9hxdyS for ; Sun, 21 Mar 2010 21:21:52 +0100 (CET) Received: from [10.0.2.6] (rrcs-97-77-198-17.sw.biz.rr.com [97.77.198.17]) (authenticated) by mail.traeumt.net (amavisd-milter) (authenticated as web50m1); Sun, 21 Mar 2010 21:21:51 +0100 (CET) (envelope-from ) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Apple Message framework v1077) Subject: Re: svn commit: r925497 - /couchdb/trunk/src/couchdb/couch_rep.erl From: Jan Lehnardt In-Reply-To: Date: Sun, 21 Mar 2010 15:21:50 -0500 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20100320002205.4A5EE2388978@eris.apache.org> To: dev@couchdb.apache.org X-Mailer: Apple Mail (2.1077) Done and done. Thanks again Filipe. Cheers Jan -- On 21 Mar 2010, at 07:10, Filipe David Manana wrote: > Jan, >=20 > It would also be a good idea to do the same with the filtered = replication specific parameters ("filter" and "query_params"). The patch = attached to this email does it. >=20 > Also, don't forget the regression test attached to = https://issues.apache.org/jira/browse/COUCHDB-703 >=20 > cheers >=20 > On Sat, Mar 20, 2010 at 12:22 AM, wrote: > Author: jan > Date: Sat Mar 20 00:22:04 2010 > New Revision: 925497 >=20 > URL: http://svn.apache.org/viewvc?rev=3D925497&view=3Drev > Log: > backwards compatible ids for non-docid replications >=20 > Modified: > couchdb/trunk/src/couchdb/couch_rep.erl >=20 > Modified: couchdb/trunk/src/couchdb/couch_rep.erl > URL: = http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep.erl?rev=3D= 925497&r1=3D925496&r2=3D925497&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- couchdb/trunk/src/couchdb/couch_rep.erl (original) > +++ couchdb/trunk/src/couchdb/couch_rep.erl Sat Mar 20 00:22:04 2010 > @@ -455,7 +455,12 @@ make_replication_id({Props}, UserCtx) -> > QueryParams =3D proplists:get_value(<<"query_params">>, Props), > DocIds =3D proplists:get_value(<<"doc_ids">>, Props), > Base =3D couch_util:to_hex(erlang:md5( > - term_to_binary([HostName, Src, Tgt, Filter, QueryParams, = DocIds]) > + case DocIds of > + undefined -> > + term_to_binary([HostName, Src, Tgt, Filter, = QueryParams]); > + DocIds -> > + term_to_binary([HostName, Src, Tgt, Filter, QueryParams, = DocIds]) > + end > )), > Extension =3D maybe_append_options( > [<<"continuous">>, <<"create_target">>], Props), >=20 >=20 >=20 >=20 >=20 > --=20 > Filipe David Manana, > fdmanana@gmail.com >=20 > "Reasonable men adapt themselves to the world. > Unreasonable men adapt the world to themselves. > That's why all progress depends on unreasonable men." >=20 >