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 3AA4C200B99 for ; Wed, 5 Oct 2016 18:44:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 39266160ADE; Wed, 5 Oct 2016 16:44: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 7DA72160AC9 for ; Wed, 5 Oct 2016 18:44:35 +0200 (CEST) Received: (qmail 93398 invoked by uid 500); 5 Oct 2016 16:44:32 -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 93385 invoked by uid 99); 5 Oct 2016 16:44:32 -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; Wed, 05 Oct 2016 16:44:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 067B6DFB92; Wed, 5 Oct 2016 16:44:32 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: couchdb-mango git commit: Configurable default limit Date: Wed, 5 Oct 2016 16:44:32 +0000 (UTC) archived-at: Wed, 05 Oct 2016 16:44:36 -0000 Repository: couchdb-mango Updated Branches: refs/heads/master 610ccb60d -> ddd6a4d44 Configurable default limit Project: http://git-wip-us.apache.org/repos/asf/couchdb-mango/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mango/commit/ddd6a4d4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mango/tree/ddd6a4d4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mango/diff/ddd6a4d4 Branch: refs/heads/master Commit: ddd6a4d44019975efe660203859e67211da1d255 Parents: 610ccb6 Author: Robert Newson Authored: Fri Sep 30 12:40:31 2016 +0100 Committer: Robert Newson Committed: Fri Sep 30 12:40:51 2016 +0100 ---------------------------------------------------------------------- src/mango_cursor.hrl | 4 ++-- src/mango_cursor_special.erl | 2 +- src/mango_cursor_text.erl | 2 +- src/mango_cursor_view.erl | 2 +- src/mango_opts.erl | 8 ++++++-- 5 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/ddd6a4d4/src/mango_cursor.hrl ---------------------------------------------------------------------- diff --git a/src/mango_cursor.hrl b/src/mango_cursor.hrl index 5706b6b..58782e5 100644 --- a/src/mango_cursor.hrl +++ b/src/mango_cursor.hrl @@ -16,9 +16,9 @@ ranges, selector, opts, - limit = 25, + limit, skip = 0, fields = undefined, user_fun, user_acc -}). \ No newline at end of file +}). http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/ddd6a4d4/src/mango_cursor_special.erl ---------------------------------------------------------------------- diff --git a/src/mango_cursor_special.erl b/src/mango_cursor_special.erl index 6058217..8404bc0 100644 --- a/src/mango_cursor_special.erl +++ b/src/mango_cursor_special.erl @@ -35,7 +35,7 @@ create(Db, Indexes, Selector, Opts) -> Composited = mango_cursor_view:composite_indexes(Indexes, FieldRanges), {Index, IndexRanges} = mango_cursor_view:choose_best_index(Db, Composited), - Limit = couch_util:get_value(limit, Opts, 10000000000), + Limit = couch_util:get_value(limit, Opts, mango_opts:default_limit()), Skip = couch_util:get_value(skip, Opts, 0), Fields = couch_util:get_value(fields, Opts, all_fields), http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/ddd6a4d4/src/mango_cursor_text.erl ---------------------------------------------------------------------- diff --git a/src/mango_cursor_text.erl b/src/mango_cursor_text.erl index 920f6f7..a094b55 100644 --- a/src/mango_cursor_text.erl +++ b/src/mango_cursor_text.erl @@ -51,7 +51,7 @@ create(Db, Indexes, Selector, Opts0) -> Opts = unpack_bookmark(Db#db.name, Opts0), DreyfusLimit = get_dreyfus_limit(), - Limit = erlang:min(DreyfusLimit, couch_util:get_value(limit, Opts, 50)), + Limit = erlang:min(DreyfusLimit, couch_util:get_value(limit, Opts, mango_opts:default_limit())), Skip = couch_util:get_value(skip, Opts, 0), Fields = couch_util:get_value(fields, Opts, all_fields), http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/ddd6a4d4/src/mango_cursor_view.erl ---------------------------------------------------------------------- diff --git a/src/mango_cursor_view.erl b/src/mango_cursor_view.erl index 5f109cd..302acd3 100644 --- a/src/mango_cursor_view.erl +++ b/src/mango_cursor_view.erl @@ -35,7 +35,7 @@ create(Db, Indexes, Selector, Opts) -> Composited = composite_indexes(Indexes, FieldRanges), {Index, IndexRanges} = choose_best_index(Db, Composited), - Limit = couch_util:get_value(limit, Opts, 10000000000), + Limit = couch_util:get_value(limit, Opts, mango_opts:default_limit()), Skip = couch_util:get_value(skip, Opts, 0), Fields = couch_util:get_value(fields, Opts, all_fields), http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/ddd6a4d4/src/mango_opts.erl ---------------------------------------------------------------------- diff --git a/src/mango_opts.erl b/src/mango_opts.erl index 40e3504..af318d2 100644 --- a/src/mango_opts.erl +++ b/src/mango_opts.erl @@ -32,7 +32,9 @@ validate_bookmark/1, validate_sort/1, validate_fields/1, - validate_bulk_delete/1 + validate_bulk_delete/1, + + default_limit/0 ]). @@ -93,7 +95,7 @@ validate_find({Props}) -> {<<"limit">>, [ {tag, limit}, {optional, true}, - {default, 25}, + {default, default_limit()}, {validator, fun is_non_neg_integer/1} ]}, {<<"skip">>, [ @@ -308,3 +310,5 @@ validate_opt(Name, [{validator, Fun} | Rest], Value) -> end. +default_limit() -> + config:get_integer("mango", "default_limit", 25).