Merge remote-tracking branch 'iilyak/1145-_local_docs-handler'
This closes #13
COUCHDB-1145
diff --git a/src/couch_mrview_test_util.erl b/src/couch_mrview_test_util.erl
index c8da1ee..153d8ea 100644
--- a/src/couch_mrview_test_util.erl
+++ b/src/couch_mrview_test_util.erl
@@ -29,12 +29,12 @@
new_db(Name, Type) ->
- couch_server:delete(Name, [?ADMIN_USER]),
- {ok, Db} = couch_db:create(Name, [?ADMIN_USER]),
+ couch_server:delete(Name, [?ADMIN_CTX]),
+ {ok, Db} = couch_db:create(Name, [?ADMIN_CTX]),
save_docs(Db, [ddoc(Type)]).
delete_db(Name) ->
- couch_server:delete(Name, [?ADMIN_USER]).
+ couch_server:delete(Name, [?ADMIN_CTX]).
save_docs(Db, Docs) ->
{ok, _} = couch_db:update_docs(Db, Docs, []),
diff --git a/src/couch_mrview_updater.erl b/src/couch_mrview_updater.erl
index db5b5e9..d0bd0f5 100644
--- a/src/couch_mrview_updater.erl
+++ b/src/couch_mrview_updater.erl
@@ -187,8 +187,7 @@
({Id, Seq, Rev, deleted}, {SeqAcc, Results}) ->
{erlang:max(Seq, SeqAcc), [{Id, Seq, Rev, []} | Results]};
({Id, Seq, Rev, Doc}, {SeqAcc, Results}) ->
- couch_stats:increment_counter([couchdb, mrview, map_docs],
- 1),
+ couch_stats:increment_counter([couchdb, mrview, map_doc]),
{ok, Res} = couch_query_servers:map_doc_raw(QServer, Doc),
{erlang:max(Seq, SeqAcc), [{Id, Seq, Rev, Res} | Results]}
end,
diff --git a/test/couch_mrview_all_docs_tests.erl b/test/couch_mrview_all_docs_tests.erl
index 0f32d59..5e35279 100644
--- a/test/couch_mrview_all_docs_tests.erl
+++ b/test/couch_mrview_all_docs_tests.erl
@@ -25,7 +25,7 @@
teardown(Db) ->
couch_db:close(Db),
- couch_server:delete(Db#db.name, [?ADMIN_USER]),
+ couch_server:delete(Db#db.name, [?ADMIN_CTX]),
ok.
diff --git a/test/couch_mrview_changes_since_tests.erl b/test/couch_mrview_changes_since_tests.erl
index 69c9646..8b11e3d 100644
--- a/test/couch_mrview_changes_since_tests.erl
+++ b/test/couch_mrview_changes_since_tests.erl
@@ -25,7 +25,7 @@
teardown(Db) ->
couch_db:close(Db),
- couch_server:delete(Db#db.name, [?ADMIN_USER]),
+ couch_server:delete(Db#db.name, [?ADMIN_CTX]),
ok.
diff --git a/test/couch_mrview_collation_tests.erl b/test/couch_mrview_collation_tests.erl
index 2ea6d6b..ccfe5ea 100644
--- a/test/couch_mrview_collation_tests.erl
+++ b/test/couch_mrview_collation_tests.erl
@@ -57,7 +57,7 @@
teardown(Db) ->
couch_db:close(Db),
- couch_server:delete(Db#db.name, [?ADMIN_USER]),
+ couch_server:delete(Db#db.name, [?ADMIN_CTX]),
ok.
diff --git a/test/couch_mrview_compact_tests.erl b/test/couch_mrview_compact_tests.erl
index 385dc3b..079639f 100644
--- a/test/couch_mrview_compact_tests.erl
+++ b/test/couch_mrview_compact_tests.erl
@@ -24,7 +24,7 @@
teardown(Db) ->
couch_db:close(Db),
- couch_server:delete(Db#db.name, [?ADMIN_USER]),
+ couch_server:delete(Db#db.name, [?ADMIN_CTX]),
ok.
diff --git a/test/couch_mrview_index_changes_tests.erl b/test/couch_mrview_index_changes_tests.erl
index 486deb5..8f0c296 100644
--- a/test/couch_mrview_index_changes_tests.erl
+++ b/test/couch_mrview_index_changes_tests.erl
@@ -22,7 +22,7 @@
teardown(Db) ->
couch_db:close(Db),
- couch_server:delete(Db#db.name, [?ADMIN_USER]),
+ couch_server:delete(Db#db.name, [?ADMIN_CTX]),
ok.
changes_index_test() ->
diff --git a/test/couch_mrview_index_info_tests.erl b/test/couch_mrview_index_info_tests.erl
index 3577095..3f88972 100644
--- a/test/couch_mrview_index_info_tests.erl
+++ b/test/couch_mrview_index_info_tests.erl
@@ -28,7 +28,7 @@
teardown({Db, _}) ->
couch_db:close(Db),
- couch_server:delete(Db#db.name, [?ADMIN_USER]),
+ couch_server:delete(Db#db.name, [?ADMIN_CTX]),
ok.
diff --git a/test/couch_mrview_map_views_tests.erl b/test/couch_mrview_map_views_tests.erl
index fe3b8f4..3a19928 100644
--- a/test/couch_mrview_map_views_tests.erl
+++ b/test/couch_mrview_map_views_tests.erl
@@ -24,7 +24,7 @@
teardown(Db) ->
couch_db:close(Db),
- couch_server:delete(Db#db.name, [?ADMIN_USER]),
+ couch_server:delete(Db#db.name, [?ADMIN_CTX]),
ok.
diff --git a/test/couch_mrview_red_views_tests.erl b/test/couch_mrview_red_views_tests.erl
index 8c2ff47..ae3e454 100644
--- a/test/couch_mrview_red_views_tests.erl
+++ b/test/couch_mrview_red_views_tests.erl
@@ -24,7 +24,7 @@
teardown(Db) ->
couch_db:close(Db),
- couch_server:delete(Db#db.name, [?ADMIN_USER]),
+ couch_server:delete(Db#db.name, [?ADMIN_CTX]),
ok.
