diff options
| author | John Christopher Anderson <jchris@apache.org> | 2009-01-04 01:01:33 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2009-01-04 01:01:33 +0000 |
| commit | e27fb8eaa628128f0ec8f1797805e92ec39ec6cb (patch) | |
| tree | 2e91e8365302bc7da520076efca194d4ccafd3eb /src | |
| parent | 449ad331057100adc830016d08dac081077b3df2 (diff) | |
Rename _temp_views to _slow_views. Any clients who were using temp views are encouraged not to use slow views, and instead transition to design documents (or running the views on the client).
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@731144 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 6 | ||||
| -rw-r--r-- | src/couchdb/couch_view.erl | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_view_group.erl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index 35203ced..3a25bd42 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -13,7 +13,7 @@ -module(couch_httpd_view). -include("couch_db.hrl"). --export([handle_view_req/2,handle_temp_view_req/2]). +-export([handle_view_req/2,handle_slow_view_req/2]). -export([parse_view_query/1,parse_view_query/2,make_view_fold_fun/5,finish_view_fold/3]). @@ -57,7 +57,7 @@ handle_view_req(#httpd{method='POST',path_parts=[_,_, Id, ViewName]}=Req, Db) -> handle_view_req(Req, _Db) -> send_method_not_allowed(Req, "GET,POST,HEAD"). -handle_temp_view_req(#httpd{method='POST'}=Req, Db) -> +handle_slow_view_req(#httpd{method='POST'}=Req, Db) -> QueryArgs = parse_view_query(Req), case couch_httpd:primary_header_value(Req, "content-type") of @@ -79,7 +79,7 @@ handle_temp_view_req(#httpd{method='POST'}=Req, Db) -> output_reduce_view(Req, View, QueryArgs, Keys) end; -handle_temp_view_req(Req, _Db) -> +handle_slow_view_req(Req, _Db) -> send_method_not_allowed(Req, "POST"). output_map_view(Req, View, Db, QueryArgs, nil) -> diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl index 665cb6f7..5065b731 100644 --- a/src/couchdb/couch_view.erl +++ b/src/couchdb/couch_view.erl @@ -227,7 +227,7 @@ handle_call({start_temp_updater, DbName, Lang, MapSrc, RedSrc}, _From, #server{r ok end, ?LOG_DEBUG("Spawning new temp update process for db ~s.", [DbName]), - {ok, NewPid} = couch_view_group:start_link({temp_view, DbName, Fd, Lang, MapSrc, RedSrc}), + {ok, NewPid} = couch_view_group:start_link({slow_view, DbName, Fd, Lang, MapSrc, RedSrc}), true = ets:insert(couch_temp_group_fd_by_db, {DbName, Fd, Count + 1}), add_to_ets(NewPid, DbName, Name), NewPid; diff --git a/src/couchdb/couch_view_group.erl b/src/couchdb/couch_view_group.erl index 84c60428..69e90633 100644 --- a/src/couchdb/couch_view_group.erl +++ b/src/couchdb/couch_view_group.erl @@ -246,7 +246,7 @@ prepare_group({view, RootDir, DbName, GroupId}, ForceReset)-> catch delete_index_file(RootDir, DbName, GroupId), Error end; -prepare_group({temp_view, DbName, Fd, Lang, MapSrc, RedSrc}, _ForceReset) -> +prepare_group({slow_view, DbName, Fd, Lang, MapSrc, RedSrc}, _ForceReset) -> case couch_db:open(DbName, []) of {ok, Db} -> View = #view{map_names=["_temp"], |