You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/08/19 18:48:07 UTC
[1/3] couch-mrview commit: updated refs/heads/windsor-merge to cd338d6
Repository: couchdb-couch-mrview
Updated Branches:
refs/heads/windsor-merge 0dfa7b7ef -> cd338d60f (forced update)
Expose language and views from #mrst{} records
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/a6dfc8c4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/a6dfc8c4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/a6dfc8c4
Branch: refs/heads/windsor-merge
Commit: a6dfc8c402a7bc3bc3b4bc919597b4ec33146b91
Parents: 911e5e9
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sun Aug 17 12:37:08 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sun Aug 17 12:37:08 2014 -0500
----------------------------------------------------------------------
src/couch_mrview_index.erl | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a6dfc8c4/src/couch_mrview_index.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_index.erl b/src/couch_mrview_index.erl
index 5baee7c..5cebcf1 100644
--- a/src/couch_mrview_index.erl
+++ b/src/couch_mrview_index.erl
@@ -40,6 +40,10 @@ get(Property, State) ->
LocalSeq = couch_util:get_value(<<"local_seq">>, Opts, false),
if IncDesign -> [include_design]; true -> [] end
++ if LocalSeq -> [local_seq]; true -> [] end;
+ language ->
+ State#mrst.language;
+ views ->
+ State#mrst.views;
info ->
#mrst{
fd = Fd,
[3/3] couch-mrview commit: updated refs/heads/windsor-merge to cd338d6
Posted by da...@apache.org.
Add an API to see if the index file exists
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/cd338d60
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/cd338d60
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/cd338d60
Branch: refs/heads/windsor-merge
Commit: cd338d60f76a699e9f8e222f930ef8afd83fe11e
Parents: d6b5884
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sun Aug 17 15:13:55 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sun Aug 17 15:13:55 2014 -0500
----------------------------------------------------------------------
src/couch_mrview_index.erl | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/cd338d60/src/couch_mrview_index.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_index.erl b/src/couch_mrview_index.erl
index 108d74a..709a6a9 100644
--- a/src/couch_mrview_index.erl
+++ b/src/couch_mrview_index.erl
@@ -17,6 +17,7 @@
-export([init/2, open/2, close/1, reset/1, delete/1]).
-export([start_update/3, purge/4, process_doc/3, finish_update/1, commit/1]).
-export([compact/3, swap_compacted/2]).
+-export([check_index_file/1]).
-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
@@ -164,3 +165,11 @@ compact(Db, State, Opts) ->
swap_compacted(OldState, NewState) ->
couch_mrview_compactor:swap_compacted(OldState, NewState).
+
+check_index_file(State) ->
+ #mrst{
+ db_name=DbName,
+ sig=Sig
+ } = State,
+ IndexFName = couch_mrview_util:index_file(DbName, Sig),
+ filelib:is_file(IndexFName).
[2/3] couch-mrview commit: updated refs/heads/windsor-merge to cd338d6
Posted by da...@apache.org.
Expose access to the file descriptor for monitoring.
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/d6b5884a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/d6b5884a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/d6b5884a
Branch: refs/heads/windsor-merge
Commit: d6b5884a1b3da1af3cdc75f585cb0bf1b48c7294
Parents: a6dfc8c
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sun Aug 17 13:40:20 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sun Aug 17 13:40:20 2014 -0500
----------------------------------------------------------------------
src/couch_mrview_index.erl | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/d6b5884a/src/couch_mrview_index.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_index.erl b/src/couch_mrview_index.erl
index 5cebcf1..108d74a 100644
--- a/src/couch_mrview_index.erl
+++ b/src/couch_mrview_index.erl
@@ -40,6 +40,8 @@ get(Property, State) ->
LocalSeq = couch_util:get_value(<<"local_seq">>, Opts, false),
if IncDesign -> [include_design]; true -> [] end
++ if LocalSeq -> [local_seq]; true -> [] end;
+ fd ->
+ State#mrst.fd;
language ->
State#mrst.language;
views ->