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 718AB200D2F for ; Wed, 1 Nov 2017 16:45:39 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6FFA8160BEA; Wed, 1 Nov 2017 15:45:39 +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 B6E95160BE6 for ; Wed, 1 Nov 2017 16:45:38 +0100 (CET) Received: (qmail 24376 invoked by uid 500); 1 Nov 2017 15:45:37 -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 24367 invoked by uid 99); 1 Nov 2017 15:45:37 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2017 15:45:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6B98081675; Wed, 1 Nov 2017 15:45:34 +0000 (UTC) Date: Wed, 01 Nov 2017 15:45:34 +0000 To: "commits@couchdb.apache.org" Subject: [couchdb] branch master updated: Do not always return partial_filter_selector (#951) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150955113432.5718.14780659380035709902@gitbox.apache.org> From: garren@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: couchdb X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 96046e5996f110c616a5ad07b943e7bbba5c25ce X-Git-Newrev: 2e49d7cf9b7fdcd597c8d806e5530047051f1250 X-Git-Rev: 2e49d7cf9b7fdcd597c8d806e5530047051f1250 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Wed, 01 Nov 2017 15:45:39 -0000 This is an automated email from the ASF dual-hosted git repository. garren pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/couchdb.git The following commit(s) were added to refs/heads/master by this push: new 2e49d7c Do not always return partial_filter_selector (#951) 2e49d7c is described below commit 2e49d7cf9b7fdcd597c8d806e5530047051f1250 Author: garren smith AuthorDate: Wed Nov 1 17:45:32 2017 +0200 Do not always return partial_filter_selector (#951) For Get / _index only return the partial_filter_selector for an index if it is set to something other than default --- src/mango/src/mango_idx_text.erl | 4 ++++ src/mango/src/mango_idx_view.erl | 4 ++++ src/mango/test/16-index-selectors-test.py | 13 ++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/mango/src/mango_idx_text.erl b/src/mango/src/mango_idx_text.erl index e4ffc91..1d5ae9b 100644 --- a/src/mango/src/mango_idx_text.erl +++ b/src/mango/src/mango_idx_text.erl @@ -152,6 +152,10 @@ def_to_json([{fields, Fields} | Rest]) -> [{<<"fields">>, fields_to_json(Fields)} | def_to_json(Rest)]; def_to_json([{<<"fields">>, Fields} | Rest]) -> [{<<"fields">>, fields_to_json(Fields)} | def_to_json(Rest)]; +% Don't include partial_filter_selector in the json conversion +% if its the default value +def_to_json([{<<"partial_filter_selector">>, {[]}} | Rest]) -> + def_to_json(Rest); def_to_json([{Key, Value} | Rest]) -> [{Key, Value} | def_to_json(Rest)]. diff --git a/src/mango/src/mango_idx_view.erl b/src/mango/src/mango_idx_view.erl index f1041bb..c9fe4c8 100644 --- a/src/mango/src/mango_idx_view.erl +++ b/src/mango/src/mango_idx_view.erl @@ -195,6 +195,10 @@ def_to_json([{fields, Fields} | Rest]) -> [{<<"fields">>, mango_sort:to_json(Fields)} | def_to_json(Rest)]; def_to_json([{<<"fields">>, Fields} | Rest]) -> [{<<"fields">>, mango_sort:to_json(Fields)} | def_to_json(Rest)]; +% Don't include partial_filter_selector in the json conversion +% if its the default value +def_to_json([{<<"partial_filter_selector">>, {[]}} | Rest]) -> + def_to_json(Rest); def_to_json([{Key, Value} | Rest]) -> [{Key, Value} | def_to_json(Rest)]. diff --git a/src/mango/test/16-index-selectors-test.py b/src/mango/test/16-index-selectors-test.py index 456b396..6d771cc 100644 --- a/src/mango/test/16-index-selectors-test.py +++ b/src/mango/test/16-index-selectors-test.py @@ -161,6 +161,11 @@ class IndexSelectorJson(mango.DbPerClass): indexes = self.db.list_indexes() self.assertEqual(indexes[1]["def"]["partial_filter_selector"], selector) + def test_partial_filter_only_in_return_if_not_default(self): + self.db.create_index(["location"]) + index = self.db.list_indexes()[1] + self.assertEqual('partial_filter_selector' in index['def'], False) + def test_saves_selector_in_index_throws(self): selector = {"location": {"$gte": "FRA"}} try: @@ -264,4 +269,10 @@ class IndexSelectorJson(mango.DbPerClass): resp = self.db.find(selector, explain=True, use_index='oldschooltext') self.assertEqual(resp["index"]["name"], "oldschooltext") docs = self.db.find(selector, use_index='oldschooltext') - self.assertEqual(len(docs), 3) \ No newline at end of file + self.assertEqual(len(docs), 3) + + @unittest.skipUnless(mango.has_text_service(), "requires text service") + def test_text_partial_filter_only_in_return_if_not_default(self): + self.db.create_text_index(fields=[{"name":"location"}]) + index = self.db.list_indexes()[1] + self.assertEqual('partial_filter_selector' in index['def'], False) -- To stop receiving notification emails like this one, please contact ['"commits@couchdb.apache.org" '].