You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/09/12 20:30:37 UTC
chttpd commit: updated refs/heads/master to b518e2a
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master 2723f64e1 -> b518e2a33
Revert "add clusterwide compaction for dbs"
This reverts commit 994f132fd0923223ec7fd0802288fc2814bcc634.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/b518e2a3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/b518e2a3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/b518e2a3
Branch: refs/heads/master
Commit: b518e2a336150f7e45c7cf9ba99228952cbbb6df
Parents: 2723f64
Author: Robert Newson <rn...@apache.org>
Authored: Sat Sep 12 19:30:20 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sat Sep 12 19:30:20 2015 +0100
----------------------------------------------------------------------
src/chttpd_db.erl | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/b518e2a3/src/chttpd_db.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl
index 8b260c4..7798deb 100644
--- a/src/chttpd_db.erl
+++ b/src/chttpd_db.erl
@@ -225,20 +225,9 @@ maybe_flush_changes_feed(Acc0, Data, Len) ->
},
{ok, Acc}.
-handle_compact_req(#httpd{method='POST', path_parts=[_DbName, <<"_compact">>, _DesignName | _]}=Req, _Db) ->
- Msg = <<"Compactions for views must be triggered on a per-shard basis in CouchDB">>,
- couch_httpd:send_error(Req, 403, forbidden, Msg);
-
-handle_compact_req(#httpd{method='POST', path_parts=[_DbName, <<"_compact">>]}=Req, Db) ->
- couch_httpd:validate_ctype(Req, "application/json"),
- ok = couch_db:check_is_admin(Db),
- couch_httpd:body(Req),
- fabric:compact_db(Db#db.name),
- send_json(Req, 202, {[{ok, true}]});
-
-handle_compact_req(Req, _Db) ->
- send_method_not_allowed(Req, "POST").
-
+handle_compact_req(Req, _) ->
+ Msg = <<"Compaction must be triggered on a per-shard basis in CouchDB">>,
+ couch_httpd:send_error(Req, 403, forbidden, Msg).
handle_view_cleanup_req(Req, Db) ->
ok = fabric:cleanup_index_files(Db),