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 15411200C72 for ; Fri, 12 May 2017 17:33:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 13F18160BB8; Fri, 12 May 2017 15:33:13 +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 8B229160BCE for ; Fri, 12 May 2017 17:33:12 +0200 (CEST) Received: (qmail 31518 invoked by uid 500); 12 May 2017 15:33:11 -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 31444 invoked by uid 99); 12 May 2017 15:33:11 -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; Fri, 12 May 2017 15:33:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 17E138499A; Fri, 12 May 2017 15:33:09 +0000 (UTC) Date: Fri, 12 May 2017 15:33:11 +0000 To: "commits@couchdb.apache.org" Subject: [couchdb] 02/05: Avoid bad match on really old databases MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: davisp@apache.org Reply-To: "commits@couchdb.apache.org" In-Reply-To: <149460318958.22880.18349149377464029670@gitbox.apache.org> References: <149460318958.22880.18349149377464029670@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: couchdb X-Git-Refname: refs/heads/COUCHDB-3288-mixed-cluster-upgrade X-Git-Reftype: branch X-Git-Rev: d0ef7571a74b3d6c7d892a039c580556a1848f09 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.3.dev Auto-Submitted: auto-generated Message-Id: <20170512153310.17E138499A@gitbox.apache.org> archived-at: Fri, 12 May 2017 15:33:13 -0000 This is an automated email from the ASF dual-hosted git repository. davisp pushed a commit to branch COUCHDB-3288-mixed-cluster-upgrade in repository https://gitbox.apache.org/repos/asf/couchdb.git commit d0ef7571a74b3d6c7d892a039c580556a1848f09 Author: Paul J. Davis AuthorDate: Wed May 10 10:12:14 2017 -0500 Avoid bad match on really old databases --- src/couch/src/couch_db.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/couch/src/couch_db.erl b/src/couch/src/couch_db.erl index afd3e5d..35bbc09 100644 --- a/src/couch/src/couch_db.erl +++ b/src/couch/src/couch_db.erl @@ -393,8 +393,8 @@ get_pid(#db{main_pid = Pid}) -> Pid. get_doc_count(Db) -> - {ok, {Count, _, _}} = couch_btree:full_reduce(Db#db.id_tree), - {ok, Count}. + {ok, Reds} = couch_btree:full_reduce(Db#db.id_tree), + {ok, element(1, Reds)}. get_uuid(#db{}=Db) -> couch_db_header:uuid(Db#db.header). -- To stop receiving notification emails like this one, please contact "commits@couchdb.apache.org" .