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 60A9510AB6 for ; Wed, 12 Feb 2014 23:29:43 +0000 (UTC) Received: (qmail 20107 invoked by uid 500); 12 Feb 2014 23:29:13 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 19796 invoked by uid 500); 12 Feb 2014 23:29:04 -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 19476 invoked by uid 99); 12 Feb 2014 23:28:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Feb 2014 23:28:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F330689D3EB; Wed, 12 Feb 2014 23:28:56 +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 Date: Wed, 12 Feb 2014 23:29:07 -0000 Message-Id: <1c680d9ec11a4b068001789f6b3e4c6b@git.apache.org> In-Reply-To: <03cba45ef52f43d8b911b537d4ab65cf@git.apache.org> References: <03cba45ef52f43d8b911b537d4ab65cf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/25] couch-mrview commit: updated refs/heads/1994-merge-rcouch to 7775266 couch_mrview: add couch_mrview:refresh/2 function function to refresh a view index. Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/fcfc8d29 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/fcfc8d29 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/fcfc8d29 Branch: refs/heads/1994-merge-rcouch Commit: fcfc8d29f18c60732d5798b836b01f38d299164f Parents: 8ca6395 Author: benoitc Authored: Tue Jan 28 23:23:37 2014 +0100 Committer: Paul J. Davis Committed: Wed Feb 12 17:27:39 2014 -0600 ---------------------------------------------------------------------- src/couch_mrview.erl | 20 ++++++++++++++++++++ test/08-changes_since.t | 4 ---- 2 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/fcfc8d29/src/couch_mrview.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl index d8f092c..26538a2 100644 --- a/src/couch_mrview.erl +++ b/src/couch_mrview.erl @@ -17,6 +17,7 @@ -export([view_changes_since/6, view_changes_since/7]). -export([count_view_changes_since/4, count_view_changes_since/5]). -export([get_info/2]). +-export([refresh/2]). -export([compact/2, compact/3, cancel_compaction/2]). -export([cleanup/1]). @@ -146,6 +147,25 @@ get_info(Db, DDoc) -> couch_index:get_info(Pid). +%% @doc refresh a view index +refresh(#db{name=DbName}, DDoc) -> + refresh(DbName, DDoc); + +refresh(Db, DDoc) -> + UpdateSeq = couch_util:with_db(Db, fun(WDb) -> + couch_db:get_update_seq(WDb) + end), + + case couch_index_server:get_index(couch_mrview_index, Db, DDoc) of + {ok, Pid} -> + case catch couch_index:get_state(Pid, UpdateSeq) of + {ok, _} -> ok; + Error -> {error, Error} + end; + Error -> + {error, Error} + end. + compact(Db, DDoc) -> compact(Db, DDoc, []). http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/fcfc8d29/test/08-changes_since.t ---------------------------------------------------------------------- diff --git a/test/08-changes_since.t b/test/08-changes_since.t index 5a10f4c..58c92e9 100644 --- a/test/08-changes_since.t +++ b/test/08-changes_since.t @@ -146,10 +146,6 @@ test_remove_key(Db) -> ]}, etap:is(Result3, Expect2, "removed key OK."). - - - - run_query(Db, Since, Opts) -> Fun = fun(KV, Acc) -> {ok, [KV | Acc]} end, {ok, R} = couch_mrview:view_changes_since(Db, <<"_design/bar">>, <<"baz">>,