couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [06/11] git commit: Fix limit=N for non-admins by counting post-filter
Date Fri, 01 Aug 2014 12:06:07 GMT
Fix limit=N for non-admins by counting post-filter

Prior to this commit, the _db_updates endpoint would often return less
than N results for limit=N queries, even when there were N changes to
return. This was because the limiting was done by passing the limit
parameter to fabric:changes, which doesn't account for the per-user
filtering done in global_changes_httpd.

This commit adds explicit counting of the filtered changes in
global_changes_httpd and manually ends the request when N post-filter
changes have been seen.

BugzID: 25272


Project: http://git-wip-us.apache.org/repos/asf/couchdb-global-changes/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-global-changes/commit/df64e86e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-global-changes/tree/df64e86e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-global-changes/diff/df64e86e

Branch: refs/heads/windsor-merge
Commit: df64e86e9329d433b632ab12f8cd8ea747e43c5e
Parents: f3b10d8
Author: Benjamin Bastian <benjamin.bastian@gmail.com>
Authored: Tue Dec 10 13:50:00 2013 -0800
Committer: Robert Newson <rnewson@apache.org>
Committed: Fri Aug 1 13:03:13 2014 +0100

----------------------------------------------------------------------
 src/global_changes_httpd.erl | 45 +++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-global-changes/blob/df64e86e/src/global_changes_httpd.erl
----------------------------------------------------------------------
diff --git a/src/global_changes_httpd.erl b/src/global_changes_httpd.erl
index a23b1e2..f3680c6 100644
--- a/src/global_changes_httpd.erl
+++ b/src/global_changes_httpd.erl
@@ -13,7 +13,8 @@
     prepend,
     resp,
     etag,
-    username
+    username,
+    limit
 }).
 
 handle_global_changes_req(#httpd{method='GET'}=Req) ->
@@ -25,22 +26,27 @@ handle_global_changes_req(#httpd{method='GET'}=Req) ->
         {heartbeat, Other} -> Other;
         false -> false
     end,
+    % Limit is handled in the changes callback, since the limit count needs to
+    % only account for changes which happen after the filter.
+    Limit = couch_util:get_value(limit, Options),
+    Options1 = lists:keydelete(limit, 1, Options),
     chttpd:verify_is_server_admin(Req),
     Acc = #acc{
         username=admin,
         feed=Feed,
         resp=Req,
-        heartbeat_interval=Heartbeat
+        heartbeat_interval=Heartbeat,
+        limit=Limit
     },
     case Feed of
         "normal" ->
             {ok, Info} = fabric:get_db_info(Db),
             Etag = chttpd:make_etag(Info),
             chttpd:etag_respond(Req, Etag, fun() ->
-                fabric:changes(Db, fun changes_callback/2, Acc#acc{etag=Etag}, Options)
+                fabric:changes(Db, fun changes_callback/2, Acc#acc{etag=Etag}, Options1)
             end);
         Feed when Feed =:= "continuous"; Feed =:= "longpoll" ->
-            fabric:changes(Db, fun changes_callback/2, Acc, Options);
+            fabric:changes(Db, fun changes_callback/2, Acc, Options1);
         _ ->
             Msg = <<"Supported `feed` types: normal, continuous, longpoll">>,
             throw({bad_request, Msg})
@@ -84,6 +90,11 @@ transform_change(Username, Resp, {Props}) ->
     end.
 
 
+% This clause is only hit when _db_updates is queried with limit=0. For
+% limit>0, the request is stopped by maybe_finish/1.
+changes_callback({change, _}, #acc{limit=0}=Acc) ->
+    {stop, Acc};
+
 % callbacks for continuous feed (newline-delimited JSON Objects)
 changes_callback(start, #acc{feed="continuous"}=Acc) ->
     #acc{resp=Req} = Acc,
@@ -97,7 +108,11 @@ changes_callback({change, Change0}, #acc{feed="continuous"}=Acc) ->
         Change ->
             Line = [?JSON_ENCODE(Change) | "\n"],
             {ok, Resp1} = chttpd:send_delayed_chunk(Resp, Line),
-            {ok, Acc#acc{resp=Resp1, last_data_sent_time=os:timestamp()}}
+            Acc1 = Acc#acc{
+                resp=Resp1,
+                last_data_sent_time=os:timestamp()
+            },
+            maybe_finish(Acc1)
     end;
 changes_callback({stop, EndSeq}, #acc{feed="continuous"}=Acc) ->
     % Temporary upgrade clause - Case 24236
@@ -120,7 +135,12 @@ changes_callback(start, Acc) ->
     #acc{resp=Req} = Acc,
     FirstChunk = "{\"results\":[\n",
     {ok, Resp} = chttpd:start_delayed_json_response(Req, 200, [], FirstChunk),
-    {ok, Acc#acc{resp=Resp, prepend="", last_data_sent_time=os:timestamp()}};
+    Acc1 = Acc#acc{
+        resp=Resp,
+        prepend="",
+        last_data_sent_time=os:timestamp()
+    },
+    maybe_finish(Acc1);
 changes_callback({change, Change0}, Acc) ->
     #acc{resp=Resp, prepend=Prepend, username=Username} = Acc,
     case transform_change(Username, Resp, Change0) of
@@ -135,7 +155,7 @@ changes_callback({change, Change0}, Acc) ->
                 resp=Resp1,
                 last_data_sent_time=os:timestamp()
             },
-            {ok, Acc1}
+            maybe_finish(Acc1)
     end;
 changes_callback({stop, EndSeq}, Acc) ->
     % Temporary upgrade clause - Case 24236
@@ -161,6 +181,17 @@ changes_callback({error, Reason}, Acc) ->
     end.
 
 
+maybe_finish(Acc) ->
+    case Acc#acc.limit of
+        0 ->
+            {stop, Acc};
+        undefined ->
+            {ok, Acc};
+        Limit ->
+            {ok, Acc#acc{limit=Limit-1}}
+    end.
+
+
 maybe_send_heartbeat(#acc{heartbeat_interval=false}=Acc) ->
     Acc;
 maybe_send_heartbeat(Acc) ->


Mime
View raw message