diff options
| author | Jan Lehnardt <jan@apache.org> | 2013-02-06 21:45:48 +0100 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2013-02-06 21:45:48 +0100 |
| commit | b267a29011c02712860dd69bd0b680e93739935b (patch) | |
| tree | 572e866f9afb288c0cde300bea753ee9053bef9c | |
| parent | 3fab6bb55759b98c32908f2ca735c761de3479ab (diff) | |
| download | couchdb-b267a29011c02712860dd69bd0b680e93739935b.tar.gz | |
COUCHDB-1667: Revert index_dir to view_index_dir config option.
Patch by Alexander Shorin.
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 2 | ||||
| -rw-r--r-- | src/couch_index/src/couch_index_server.erl | 7 | ||||
| -rw-r--r-- | src/couch_index/src/couch_index_util.erl | 5 | ||||
| -rwxr-xr-x | test/etap/072-cleanup.t | 2 |
4 files changed, 3 insertions, 13 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index be92fcf34..94bf2fe4e 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -7,7 +7,7 @@ version = %version% [couchdb] database_dir = %localstatelibdir% -index_dir = %localstatelibdir% +view_index_dir = %localstatelibdir% util_driver_dir = %couchprivlibdir% max_document_size = 4294967296 ; 4 GB os_process_timeout = 5000 ; 5 seconds. for view and external servers. diff --git a/src/couch_index/src/couch_index_server.erl b/src/couch_index/src/couch_index_server.erl index bc1fce77c..8e2baf699 100644 --- a/src/couch_index/src/couch_index_server.erl +++ b/src/couch_index/src/couch_index_server.erl @@ -75,13 +75,6 @@ init([]) -> ets:new(?BY_DB, [protected, bag, named_table]), couch_db_update_notifier:start_link(fun ?MODULE:update_notify/1), RootDir = couch_index_util:root_dir(), - % Deprecation warning if it wasn't index_dir - case couch_config:get("couchdb", "index_dir") of - undefined -> - Msg = "Deprecation warning: 'view_index_dir' is now 'index_dir'", - ?LOG_ERROR(Msg, []); - _ -> ok - end, couch_file:init_delete_dir(RootDir), {ok, #st{root_dir=RootDir}}. diff --git a/src/couch_index/src/couch_index_util.erl b/src/couch_index/src/couch_index_util.erl index 28ec8d267..0b833d34b 100644 --- a/src/couch_index/src/couch_index_util.erl +++ b/src/couch_index/src/couch_index_util.erl @@ -19,10 +19,7 @@ root_dir() -> - case couch_config:get("couchdb", "index_dir") of - undefined -> couch_config:get("couchdb", "view_index_dir"); - Value -> Value - end. + couch_config:get("couchdb", "view_index_dir"). index_dir(Module, DbName) when is_binary(DbName) -> diff --git a/test/etap/072-cleanup.t b/test/etap/072-cleanup.t index 6721090ec..9cbcdfa3c 100755 --- a/test/etap/072-cleanup.t +++ b/test/etap/072-cleanup.t @@ -121,6 +121,6 @@ view_cleanup() -> count_index_files() -> % call server to fetch the index files - RootDir = couch_config:get("couchdb", "index_dir"), + RootDir = couch_config:get("couchdb", "view_index_dir"), length(filelib:wildcard(RootDir ++ "/." ++ binary_to_list(?TEST_DB) ++ "_design"++"/mrview/*")). |