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 AFD009834 for ; Fri, 16 Dec 2011 16:02:42 +0000 (UTC) Received: (qmail 41544 invoked by uid 500); 16 Dec 2011 16:02:42 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 41508 invoked by uid 500); 16 Dec 2011 16:02:42 -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 41501 invoked by uid 99); 16 Dec 2011 16:02:42 -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:42 +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:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 71D722006C7; Fri, 16 Dec 2011 16:02:20 +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: <20111216160220.71D722006C7@tyr.zones.apache.org> Date: Fri, 16 Dec 2011 16:02:20 +0000 (UTC) Updated Branches: refs/heads/1.2.x 1bbe61973 -> 493d4b3b4 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/493d4b3b Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/493d4b3b Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/493d4b3b Branch: refs/heads/1.2.x Commit: 493d4b3b461b5099a37fc00f07bf6cf9a70b02ba Parents: 1bbe619 Author: Paul Joseph Davis Authored: Fri Dec 16 10:00:55 2011 -0600 Committer: Paul Joseph Davis Committed: Fri Dec 16 10:02:10 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/493d4b3b/src/couchdb/couch_view.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl index 6664388..2c28d05 100644 --- a/src/couchdb/couch_view.erl +++ b/src/couchdb/couch_view.erl @@ -114,7 +114,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}) ->