couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject chttpd commit: updated refs/heads/master to c6b0440
Date Wed, 07 Sep 2016 13:03:39 GMT
Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master 00d305e7c -> c6b044006


don't send random etag for _list (COUCHDB-3134)


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

Branch: refs/heads/master
Commit: c6b044006fcb58386099105fb6d9e0a036a62ed9
Parents: 00d305e
Author: Robert Newson <rnewson@apache.org>
Authored: Wed Sep 7 14:03:17 2016 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed Sep 7 14:03:17 2016 +0100

----------------------------------------------------------------------
 src/chttpd_show.erl | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/c6b04400/src/chttpd_show.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_show.erl b/src/chttpd_show.erl
index 1dbecf5..58a9daf 100644
--- a/src/chttpd_show.erl
+++ b/src/chttpd_show.erl
@@ -200,25 +200,21 @@ handle_view_list(Req, Db, DDoc, LName, {ViewDesignName, ViewName}, Keys)
->
     couch_util:get_nested_json_value(DDoc#doc.body, [<<"lists">>, LName]),
     {ok, VDoc} = ddoc_cache:open(Db#db.name, <<"_design/", ViewDesignName/binary>>),
     CB = fun couch_mrview_show:list_cb/2,
-    Etag = [$", couch_uuids:new(), $"],
     QueryArgs = couch_mrview_http:parse_params(Req, Keys),
     Options = [{user_ctx, Req#httpd.user_ctx}],
-    chttpd:etag_respond(Req, Etag, fun() ->
-        couch_query_servers:with_ddoc_proc(DDoc, fun(QServer) ->
-            Acc = #lacc{
-                lname = LName,
-                req = Req,
-                qserver = QServer,
-                db = Db,
-                etag = Etag
-            },
-            case ViewName of
-                <<"_all_docs">> ->
-                    fabric:all_docs(Db, Options, CB, Acc, QueryArgs);
-                _ ->
-                    fabric:query_view(Db, VDoc, ViewName, CB, Acc, QueryArgs)
-            end
-        end)
+    couch_query_servers:with_ddoc_proc(DDoc, fun(QServer) ->
+        Acc = #lacc{
+            lname = LName,
+            req = Req,
+            qserver = QServer,
+            db = Db
+        },
+        case ViewName of
+            <<"_all_docs">> ->
+                fabric:all_docs(Db, Options, CB, Acc, QueryArgs);
+            _ ->
+                fabric:query_view(Db, VDoc, ViewName, CB, Acc, QueryArgs)
+        end
     end).
 
 % Maybe this is in the proplists API


Mime
View raw message