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 D9B8B200B38 for ; Thu, 23 Jun 2016 19:51:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D8C5A160A59; Thu, 23 Jun 2016 17:51:56 +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 284F4160A35 for ; Thu, 23 Jun 2016 19:51:56 +0200 (CEST) Received: (qmail 84242 invoked by uid 500); 23 Jun 2016 17:51:55 -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 84231 invoked by uid 99); 23 Jun 2016 17:51:55 -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; Thu, 23 Jun 2016 17:51:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 291B7E38B1; Thu, 23 Jun 2016 17:51:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Thu, 23 Jun 2016 17:51:55 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/5] couch commit: updated refs/heads/master to 1bcf525 archived-at: Thu, 23 Jun 2016 17:51:57 -0000 Repository: couchdb-couch Updated Branches: refs/heads/master 411c130ea -> 1bcf52545 Dead code elimination Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/17279852 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/17279852 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/17279852 Branch: refs/heads/master Commit: 1727985212cf2658f5c46a26f8ac57046af188aa Parents: 411c130 Author: ILYA Khlopotov Authored: Wed Jun 22 10:29:11 2016 -0700 Committer: ILYA Khlopotov Committed: Wed Jun 22 10:29:11 2016 -0700 ---------------------------------------------------------------------- src/couch_changes.erl | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/17279852/src/couch_changes.erl ---------------------------------------------------------------------- diff --git a/src/couch_changes.erl b/src/couch_changes.erl index 75ec1cd..beac089 100644 --- a/src/couch_changes.erl +++ b/src/couch_changes.erl @@ -804,25 +804,19 @@ changes_row(Results, DocInfo, Acc) -> maybe_get_changes_doc(Value, #changes_acc{include_docs=true}=Acc) -> #changes_acc{ db = Db, - include_docs = IncDoc, doc_options = DocOpts, conflicts = Conflicts } = Acc, - case IncDoc of - true -> - Opts = case Conflicts of - true -> [deleted, conflicts]; - false -> [deleted] - end, - Doc = couch_index_util:load_doc(Db, Value, Opts), - case Doc of - null -> - [{doc, null}]; - _ -> - [{doc, couch_doc:to_json_obj(Doc, DocOpts)}] - end; - false -> - [] + Opts = case Conflicts of + true -> [deleted, conflicts]; + false -> [deleted] + end, + Doc = couch_index_util:load_doc(Db, Value, Opts), + case Doc of + null -> + [{doc, null}]; + _ -> + [{doc, couch_doc:to_json_obj(Doc, DocOpts)}] end; maybe_get_changes_doc(_Value, _Acc) -> [].