Revision 353036393132 () - Diff

Link to this snippet: https://friendpaste.com/4nDwzAcUEnrX8tult3z8mY
Embed:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index be92fcf..94bf2fe 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 bc1fce7..8e2baf6 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 28ec8d2..0b833d3 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 6721090..9cbcdfa 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/*")).