From commits-return-29430-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Sat May 13 03:27:11 2017 Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CD191857A for ; Sat, 13 May 2017 03:27:11 +0000 (UTC) Received: (qmail 5504 invoked by uid 500); 13 May 2017 03:27:11 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 5374 invoked by uid 500); 13 May 2017 03:27: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 5220 invoked by uid 99); 13 May 2017 03:27:10 -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; Sat, 13 May 2017 03:27:10 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2770F849A0; Sat, 13 May 2017 03:27:08 +0000 (UTC) Date: Sat, 13 May 2017 03:27:15 +0000 To: "commits@couchdb.apache.org" Subject: [couchdb] 07/10: ss - add legacy engine 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: <149464602842.13623.10675101182473878611@gitbox.apache.org> References: <149464602842.13623.10675101182473878611@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: couchdb X-Git-Refname: refs/heads/COUCHDB-3287-pluggable-storage-engines X-Git-Reftype: branch X-Git-Rev: 52906e4f48513ef0deeebd5fc30247f52c649d42 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.3.dev Auto-Submitted: auto-generated Message-Id: <20170513032709.2770F849A0@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. davisp pushed a commit to branch COUCHDB-3287-pluggable-storage-engines in repository https://gitbox.apache.org/repos/asf/couchdb.git commit 52906e4f48513ef0deeebd5fc30247f52c649d42 Author: Paul J. Davis AuthorDate: Fri May 12 16:06:46 2017 -0500 ss - add legacy engine --- src/couch/src/couch_bt_engine.erl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/couch/src/couch_bt_engine.erl b/src/couch/src/couch_bt_engine.erl index 0cd9d65..42e2142 100644 --- a/src/couch/src/couch_bt_engine.erl +++ b/src/couch/src/couch_bt_engine.erl @@ -193,8 +193,8 @@ get_compacted_seq(#st{header = Header}) -> get_del_doc_count(#st{} = St) -> - {ok, {_, DelCount, _}} = couch_btree:full_reduce(St#st.id_tree), - DelCount. + {ok, Reds} = couch_btree:full_reduce(St#st.id_tree), + {ok, element(2, Reds)}. get_disk_version(#st{header = Header}) -> @@ -202,8 +202,9 @@ get_disk_version(#st{header = Header}) -> get_doc_count(#st{} = St) -> - {ok, {Count, _, _}} = couch_btree:full_reduce(St#st.id_tree), - Count. + {ok, Reds} = couch_btree:full_reduce(St#st.id_tree), + {ok, element(1, Reds)}. + get_epochs(#st{header = Header}) -> couch_bt_engine_header:get(Header, epochs). -- To stop receiving notification emails like this one, please contact "commits@couchdb.apache.org" .