summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenoit Chesneau <benoitc@apache.org>2010-10-13 21:02:46 +0000
committerBenoit Chesneau <benoitc@apache.org>2010-10-13 21:02:46 +0000
commit3072bbc46e4d9e0bc2938776c965a5d2e6a15881 (patch)
tree178cdaa80262b96d47ae562696412369befd08c6 /src
parentc15fe1593ab99b439d2dfc187e6d0b0e20b985a8 (diff)
get _changes on specific docids
/POST /db/_changes {"doc_ids": ["docid1", ...]} git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1022291 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_changes.erl15
-rw-r--r--src/couchdb/couch_httpd_db.erl32
2 files changed, 42 insertions, 5 deletions
diff --git a/src/couchdb/couch_changes.erl b/src/couchdb/couch_changes.erl
index dd884cad..6fc4597a 100644
--- a/src/couchdb/couch_changes.erl
+++ b/src/couchdb/couch_changes.erl
@@ -78,6 +78,21 @@ get_callback_acc(Callback) when is_function(Callback, 2) ->
{fun(Ev, Data, _) -> Callback(Ev, Data) end, ok}.
%% @type Req -> #httpd{} | {json_req, JsonObj()}
+make_filter_fun({docids, Docids}, Style, _Req, _Db) ->
+ fun(#doc_info{id=DocId, revs=[#rev_info{rev=Rev}|_]=Revs}) ->
+ case lists:member(DocId, Docids) of
+ true ->
+ case Style of
+ main_only ->
+ [{[{<<"rev">>, couch_doc:rev_to_str(Rev)}]}];
+ all_docs ->
+ [{[{<<"rev">>, couch_doc:rev_to_str(R)}]}
+ || #rev_info{rev=R} <- Revs]
+ end;
+ _ -> []
+ end
+ end;
+
make_filter_fun(FilterName, Style, Req, Db) ->
case [list_to_binary(couch_httpd:unquote(Part))
|| Part <- string:tokens(FilterName, "/")] of
diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl
index 51c9ae9a..412b6e99 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/src/couchdb/couch_httpd_db.erl
@@ -56,6 +56,25 @@ handle_request(#httpd{path_parts=[DbName|RestParts],method=Method,
end.
handle_changes_req(#httpd{method='GET'}=Req, Db) ->
+ handle_changes_req1(Req, Db, nil);
+
+handle_changes_req(#httpd{method='POST'}=Req, Db) ->
+ couch_httpd:validate_ctype(Req, "application/json"),
+ {Props} = couch_httpd:json_body_obj(Req),
+ case couch_util:get_value(<<"doc_ids">>, Props, nil) of
+ nil ->
+ handle_changes_req1(Req, Db, nil);
+ Docids when is_list(Docids) ->
+ handle_changes_req1(Req, Db, Docids);
+ _ ->
+ throw({bad_request, "`docids` member must be a array."})
+ end;
+
+handle_changes_req(#httpd{path_parts=[_,<<"_changes">>]}=Req, _Db) ->
+ send_method_not_allowed(Req, "GET,HEAD,POST").
+
+
+handle_changes_req1(Req, Db, Docids) ->
MakeCallback = fun(Resp) ->
fun({change, Change, _}, "continuous") ->
send_chunk(Resp, [?JSON_ENCODE(Change) | "\n"]);
@@ -82,8 +101,13 @@ handle_changes_req(#httpd{method='GET'}=Req, Db) ->
end
end,
ChangesArgs = parse_changes_query(Req),
- ChangesFun = couch_changes:handle_changes(ChangesArgs, Req, Db),
- WrapperFun = case ChangesArgs#changes_args.feed of
+ ChangesArgs1 = case Docids of
+ nil -> ChangesArgs;
+ _ -> ChangesArgs#changes_args{filter={docids, Docids}}
+ end,
+
+ ChangesFun = couch_changes:handle_changes(ChangesArgs1, Req, Db),
+ WrapperFun = case ChangesArgs1#changes_args.feed of
"normal" ->
{ok, Info} = couch_db:get_db_info(Db),
CurrentEtag = couch_httpd:make_etag(Info),
@@ -109,10 +133,8 @@ handle_changes_req(#httpd{method='GET'}=Req, Db) ->
couch_stats_collector:track_process_count(
{httpd, clients_requesting_changes}
),
- WrapperFun(ChangesFun);
+ WrapperFun(ChangesFun).
-handle_changes_req(#httpd{path_parts=[_,<<"_changes">>]}=Req, _Db) ->
- send_method_not_allowed(Req, "GET,HEAD").
handle_compact_req(#httpd{method='POST',path_parts=[DbName,_,Id|_]}=Req, Db) ->
ok = couch_db:check_is_admin(Db),