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 9729097F9 for ; Fri, 16 Dec 2011 16:02:14 +0000 (UTC) Received: (qmail 39533 invoked by uid 500); 16 Dec 2011 16:02:14 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 39466 invoked by uid 500); 16 Dec 2011 16:02:13 -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 39459 invoked by uid 99); 16 Dec 2011 16:02:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2011 16:02:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2011 16:02:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3CDA61A0722; Fri, 16 Dec 2011 16:01:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Only remove .view files during cleanup Message-Id: <20111216160151.3CDA61A0722@tyr.zones.apache.org> Date: Fri, 16 Dec 2011 16:01:51 +0000 (UTC) Updated Branches: refs/heads/1.1.x 6a04e3336 -> 5bdd8ae7f Only remove .view files during cleanup Thanks to Volker Mische for the patch. Closes COUCHDB-1358 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5bdd8ae7 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5bdd8ae7 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5bdd8ae7 Branch: refs/heads/1.1.x Commit: 5bdd8ae7f132aac6ae9476e925ee2df9b4315a95 Parents: 6a04e33 Author: Paul Joseph Davis Authored: Fri Dec 16 10:00:55 2011 -0600 Committer: Paul Joseph Davis Committed: Fri Dec 16 10:00:55 2011 -0600 ---------------------------------------------------------------------- src/couchdb/couch_view.erl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/5bdd8ae7/src/couchdb/couch_view.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl index 88cadec..b780bc0 100644 --- a/src/couchdb/couch_view.erl +++ b/src/couchdb/couch_view.erl @@ -113,7 +113,9 @@ cleanup_index_files(Db) -> list_index_files(Db) -> % call server to fetch the index files RootDir = couch_config:get("couchdb", "view_index_dir"), - filelib:wildcard(RootDir ++ "/." ++ ?b2l(couch_db:name(Db)) ++ "_design"++"/*"). + filelib:wildcard( + RootDir ++ "/." ++ ?b2l(couch_db:name(Db)) ++ "_design"++"/*.view" + ). get_row_count(#view{btree=Bt}) ->