Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6EAAB200C70 for ; Tue, 4 Apr 2017 23:17:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6D485160BAF; Tue, 4 Apr 2017 21:17:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 97D62160BA1 for ; Tue, 4 Apr 2017 23:17:35 +0200 (CEST) Received: (qmail 87352 invoked by uid 500); 4 Apr 2017 21:17: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 87292 invoked by uid 99); 4 Apr 2017 21:17:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Apr 2017 21:17:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 919F9DFEE9; Tue, 4 Apr 2017 21:17:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Tue, 04 Apr 2017 21:17:36 -0000 Message-Id: In-Reply-To: <4ad9154b5a8f4331b57a15b89ff4cb4b@git.apache.org> References: <4ad9154b5a8f4331b57a15b89ff4cb4b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/19] couch-replicator commit: updated refs/heads/COUCHDB-3288-remove-public-db-record to a8ac02d archived-at: Tue, 04 Apr 2017 21:17:36 -0000 Switch replicator max_document_id_length config to use infinity Default value switched to be `infinity` instead of 0 COUCHDB-3291 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/46f70c73 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/46f70c73 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/46f70c73 Branch: refs/heads/COUCHDB-3288-remove-public-db-record Commit: 46f70c73427e618774872a388287ba682c1376f1 Parents: b18b31c Author: Nick Vatamaniuc Authored: Wed Feb 8 11:46:13 2017 -0500 Committer: Nick Vatamaniuc Committed: Wed Feb 8 11:46:13 2017 -0500 ---------------------------------------------------------------------- src/couch_replicator_changes_reader.erl | 9 +++++++-- test/couch_replicator_id_too_long_tests.erl | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/46f70c73/src/couch_replicator_changes_reader.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_changes_reader.erl b/src/couch_replicator_changes_reader.erl index f9d9097..439f5c9 100644 --- a/src/couch_replicator_changes_reader.erl +++ b/src/couch_replicator_changes_reader.erl @@ -123,5 +123,10 @@ process_change({last_seq, _}, _) -> ok. is_doc_id_too_long(IdLength) -> - ConfigMax = config:get_integer("replicator", "max_document_id_length", 0), - ConfigMax > 0 andalso IdLength > ConfigMax. + case config:get("replicator", "max_document_id_length", "infinity") of + "infinity" -> + false; + ConfigMaxStr -> + ConfigMax = list_to_integer(ConfigMaxStr), + ConfigMax > 0 andalso IdLength > ConfigMax + end. http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/46f70c73/test/couch_replicator_id_too_long_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_replicator_id_too_long_tests.erl b/test/couch_replicator_id_too_long_tests.erl index f5d7165..70eda05 100644 --- a/test/couch_replicator_id_too_long_tests.erl +++ b/test/couch_replicator_id_too_long_tests.erl @@ -28,7 +28,7 @@ setup(_) -> teardown(_, {Ctx, {Source, Target}}) -> delete_db(Source), delete_db(Target), - config:set("replicator", "max_document_id_length", "0"), + config:set("replicator", "max_document_id_length", "infinity"), ok = test_util:stop_couch(Ctx).