You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2015/10/12 23:36:00 UTC
[1/2] couch commit: updated refs/heads/add-filter-revs-limit to
9c5b8b7
Repository: couchdb-couch
Updated Branches:
refs/heads/add-filter-revs-limit 6198f804c -> 9c5b8b7f4
Whitespace
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/e8c489f7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/e8c489f7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/e8c489f7
Branch: refs/heads/add-filter-revs-limit
Commit: e8c489f7037840d05bb3e2475147a46732fc50e3
Parents: 6198f80
Author: Russell Branca <ch...@apache.org>
Authored: Mon Oct 12 21:29:12 2015 +0000
Committer: Russell Branca <ch...@apache.org>
Committed: Mon Oct 12 21:29:12 2015 +0000
----------------------------------------------------------------------
src/couch_query_servers.erl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e8c489f7/src/couch_query_servers.erl
----------------------------------------------------------------------
diff --git a/src/couch_query_servers.erl b/src/couch_query_servers.erl
index 632cb5c..d48b9df 100644
--- a/src/couch_query_servers.erl
+++ b/src/couch_query_servers.erl
@@ -309,10 +309,10 @@ filter_view(DDoc, VName, Docs) ->
filter_docs(Req, Db, DDoc, FName, Docs) ->
JsonReq = case Req of
- {json_req, JsonObj} ->
- JsonObj;
- #httpd{} = HttpReq ->
- couch_httpd_external:json_req_obj(HttpReq, Db)
+ {json_req, JsonObj} ->
+ JsonObj;
+ #httpd{} = HttpReq ->
+ couch_httpd_external:json_req_obj(HttpReq, Db)
end,
JsonDocs = [json_doc(Doc) || Doc <- Docs],
[true, Passes] = ddoc_prompt(DDoc, [<<"filters">>, FName],
[2/2] couch commit: updated refs/heads/add-filter-revs-limit to
9c5b8b7
Posted by ch...@apache.org.
Don't load query server options every iteration
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/9c5b8b7f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/9c5b8b7f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/9c5b8b7f
Branch: refs/heads/add-filter-revs-limit
Commit: 9c5b8b7f49a9bb853c50dc6c90f8a3a9c6588a3f
Parents: e8c489f
Author: Russell Branca <ch...@apache.org>
Authored: Mon Oct 12 21:35:43 2015 +0000
Committer: Russell Branca <ch...@apache.org>
Committed: Mon Oct 12 21:35:43 2015 +0000
----------------------------------------------------------------------
src/couch_query_servers.erl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/9c5b8b7f/src/couch_query_servers.erl
----------------------------------------------------------------------
diff --git a/src/couch_query_servers.erl b/src/couch_query_servers.erl
index d48b9df..c30a871 100644
--- a/src/couch_query_servers.erl
+++ b/src/couch_query_servers.erl
@@ -303,7 +303,8 @@ json_doc(Doc, Options) ->
couch_doc:to_json_obj(Doc, Options).
filter_view(DDoc, VName, Docs) ->
- JsonDocs = [json_doc(Doc) || Doc <- Docs],
+ Options = json_doc_options(),
+ JsonDocs = [json_doc(Doc, Options) || Doc <- Docs],
[true, Passes] = ddoc_prompt(DDoc, [<<"views">>, VName, <<"map">>], [JsonDocs]),
{ok, Passes}.
@@ -314,7 +315,8 @@ filter_docs(Req, Db, DDoc, FName, Docs) ->
#httpd{} = HttpReq ->
couch_httpd_external:json_req_obj(HttpReq, Db)
end,
- JsonDocs = [json_doc(Doc) || Doc <- Docs],
+ Options = json_doc_options(),
+ JsonDocs = [json_doc(Doc, Options) || Doc <- Docs],
[true, Passes] = ddoc_prompt(DDoc, [<<"filters">>, FName],
[JsonDocs, JsonReq]),
{ok, Passes}.