couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couch-index commit: updated refs/heads/master to ef483cb
Date Wed, 14 May 2014 15:13:35 GMT
Repository: couchdb-couch-index
Updated Branches:
  refs/heads/master [created] ef483cbcc


Merge remote-tracking branch 'origin/import-master'

Conflicts:
	Makefile.am
	src/couch_index.erl
	src/couch_index_server.erl
	src/couch_index_util.erl


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/commit/ef483cbc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/tree/ef483cbc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/diff/ef483cbc

Branch: refs/heads/master
Commit: ef483cbccbb39feffefe112832d15fba3090dbfb
Parents: 2b6ccb0 7a61bc8
Author: Robert Newson <rnewson@apache.org>
Authored: Wed May 14 16:06:19 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed May 14 16:06:27 2014 +0100

----------------------------------------------------------------------
 src/couch_index.erl        | 10 +++++++++-
 src/couch_index_server.erl |  7 -------
 src/couch_index_util.erl   |  5 +----
 3 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/ef483cbc/src/couch_index.erl
----------------------------------------------------------------------
diff --cc src/couch_index.erl
index 3253a32,df004b4..75cf7d1
--- a/src/couch_index.erl
+++ b/src/couch_index.erl
@@@ -16,8 -16,8 +16,9 @@@
  
  %% API
  -export([start_link/1, stop/1, get_state/2, get_info/1]).
 +-export([trigger_update/2]).
- -export([compact/1, compact/2]).
+ -export([compact/1, compact/2, get_compactor_pid/1]).
+ -export([config_change/3]).
  
  %% gen_server callbacks
  -export([init/1, terminate/2, code_change/3]).
@@@ -74,8 -67,15 +75,15 @@@ compact(Pid, Options) -
      end.
  
  
+ get_compactor_pid(Pid) ->
+     gen_server:call(Pid, get_compactor_pid).
+ 
+ config_change("query_server_config", "commit_freq", NewValue) ->
+     ok = gen_server:cast(?MODULE, {config_update, NewValue}).
+ 
+ 
  init({Mod, IdxState}) ->
 -    ok = couch_config:register(fun ?MODULE:config_change/3),
 +    ok = config:listen_for_changes(?MODULE, nil),
      DbName = Mod:get(db_name, IdxState),
      Resp = couch_util:with_db(DbName, fun(Db) ->
          case Mod:open(Db, IdxState) of

http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/ef483cbc/src/couch_index_server.erl
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/ef483cbc/src/couch_index_util.erl
----------------------------------------------------------------------
diff --cc src/couch_index_util.erl
index cf1ff75,0b833d3..5694641
--- a/src/couch_index_util.erl
+++ b/src/couch_index_util.erl
@@@ -19,10 -19,7 +19,7 @@@
  
  
  root_dir() ->
-     case config:get("couchdb", "index_dir") of
-         undefined -> config:get("couchdb", "view_index_dir");
-         Value -> Value
-     end.
 -  couch_config:get("couchdb", "view_index_dir").
++  config:get("couchdb", "view_index_dir").
  
  
  index_dir(Module, DbName) when is_binary(DbName) ->


Mime
View raw message