4nDwzAcUEnrX8tult3z8mY changeset

Changeset353036393132 (b)
ParentNone (a)
ab
0+diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
0+index be92fcf..94bf2fe 100644
0+--- a/etc/couchdb/default.ini.tpl.in
0++++ b/etc/couchdb/default.ini.tpl.in
0+@@ -7,7 +7,7 @@ version = %version%
0+ 
0+ [couchdb]
0+ database_dir = %localstatelibdir%
0+-index_dir = %localstatelibdir%
0++view_index_dir = %localstatelibdir%
0+ util_driver_dir = %couchprivlibdir%
0+ max_document_size = 4294967296 ; 4 GB
0+ os_process_timeout = 5000 ; 5 seconds. for view and external servers.
0+diff --git a/src/couch_index/src/couch_index_server.erl b/src/couch_index/src/couch_index_server.erl
0+index bc1fce7..8e2baf6 100644
0+--- a/src/couch_index/src/couch_index_server.erl
0++++ b/src/couch_index/src/couch_index_server.erl
0+@@ -75,13 +75,6 @@ init([]) ->
0+     ets:new(?BY_DB, [protected, bag, named_table]),
0+     couch_db_update_notifier:start_link(fun ?MODULE:update_notify/1),
0+     RootDir = couch_index_util:root_dir(),
0+-    % Deprecation warning if it wasn't index_dir
0+-    case couch_config:get("couchdb", "index_dir") of
0+-        undefined ->
0+-            Msg = "Deprecation warning: 'view_index_dir' is now 'index_dir'",
0+-            ?LOG_ERROR(Msg, []);
0+-        _ -> ok
0+-    end,
0+     couch_file:init_delete_dir(RootDir),
0+     {ok, #st{root_dir=RootDir}}.
0+ 
0+diff --git a/src/couch_index/src/couch_index_util.erl b/src/couch_index/src/couch_index_util.erl
0+index 28ec8d2..0b833d3 100644
0+--- a/src/couch_index/src/couch_index_util.erl
0++++ b/src/couch_index/src/couch_index_util.erl
0+@@ -19,10 +19,7 @@
0+ 
0+ 
0+ root_dir() ->
0+-    case couch_config:get("couchdb", "index_dir") of
0+-        undefined -> couch_config:get("couchdb", "view_index_dir");
0+-        Value -> Value
0+-    end.
0++  couch_config:get("couchdb", "view_index_dir").
0+ 
0+ 
0+ index_dir(Module, DbName) when is_binary(DbName) ->
0+diff --git a/test/etap/072-cleanup.t b/test/etap/072-cleanup.t
0+index 6721090..9cbcdfa 100755
0+--- a/test/etap/072-cleanup.t
0++++ b/test/etap/072-cleanup.t
0+@@ -121,6 +121,6 @@ view_cleanup() ->
0+ 
0+ count_index_files() ->
0+     % call server to fetch the index files
0+-    RootDir = couch_config:get("couchdb", "index_dir"),
0++    RootDir = couch_config:get("couchdb", "view_index_dir"),
0+     length(filelib:wildcard(RootDir ++ "/." ++
0+         binary_to_list(?TEST_DB) ++ "_design"++"/mrview/*")).
...
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
60
61
62
--- Revision None
+++ Revision 353036393132
@@ -0,0 +1,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/*")).