Permalink
Browse files

provide the update_seq in all_docs view even when it is zero

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@983336 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 1423d6f commit 6153cdaacbbd87f521d692ffa7325ceda31934dc @jchris jchris committed Aug 8, 2010
Showing with 17 additions and 5 deletions.
  1. +1 −0 THANKS
  2. +6 −1 share/www/script/test/view_update_seq.js
  3. +9 −3 src/couchdb/couch_httpd_db.erl
  4. +1 −1 src/couchdb/couch_httpd_view.erl
View
@@ -67,5 +67,6 @@ suggesting improvements or submitting changes. Some of these people are:
* Jonathan D. Knezek <jdknezek@gmail.com>
* David Rose <doppler@gmail.com>
* Lim Yue Chuan <shasderias@gmail.com>
+ * David Davis <xantus@xantus.org>
For a list of authors see the `AUTHORS` file.
@@ -18,6 +18,11 @@ couchTests.view_update_seq = function(debug) {
T(db.info().update_seq == 0);
+ resp = db.allDocs({update_seq:true});
+
+ T(resp.rows.length == 0);
+ T(resp.update_seq == 0);
+
var designDoc = {
_id:"_design/test",
language: "javascript",
@@ -35,7 +40,7 @@ couchTests.view_update_seq = function(debug) {
T(db.info().update_seq == 1);
- var resp = db.allDocs({update_seq:true});
+ resp = db.allDocs({update_seq:true});
T(resp.rows.length == 1);
T(resp.update_seq == 1);
@@ -486,7 +486,13 @@ all_docs_view(Req, Db, Keys) ->
true -> EndDocId
end,
FoldAccInit = {Limit, SkipCount, undefined, []},
- UpdateSeq = couch_db:get_update_seq(Db),
+ UpdateSeq = couch_db:get_update_seq(Db),
+ JsonParams = case couch_httpd:qs_value(Req, "update_seq") of
+ "true" ->
+ [{update_seq, UpdateSeq}];
+ _Else ->
+ []
+ end,
case Keys of
nil ->
FoldlFun = couch_httpd_view:make_view_fold_fun(Req, QueryArgs, CurrentEtag, Db, UpdateSeq,
@@ -504,7 +510,7 @@ all_docs_view(Req, Db, Keys) ->
{ok, LastOffset, FoldResult} = couch_db:enum_docs(Db,
AdapterFun, FoldAccInit, [{start_key, StartId}, {dir, Dir},
{if Inclusive -> end_key; true -> end_key_gt end, EndId}]),
- couch_httpd_view:finish_view_fold(Req, TotalRowCount, LastOffset, FoldResult);
+ couch_httpd_view:finish_view_fold(Req, TotalRowCount, LastOffset, FoldResult, JsonParams);
_ ->
FoldlFun = couch_httpd_view:make_view_fold_fun(Req, QueryArgs, CurrentEtag, Db, UpdateSeq,
TotalRowCount, #view_fold_helper_funs{
@@ -533,7 +539,7 @@ all_docs_view(Req, Db, Keys) ->
{_, FoldAcc2} = FoldlFun(Doc, 0, FoldAcc),
FoldAcc2
end, FoldAccInit, Keys),
- couch_httpd_view:finish_view_fold(Req, TotalRowCount, 0, FoldResult)
+ couch_httpd_view:finish_view_fold(Req, TotalRowCount, 0, FoldResult, JsonParams)
end
end).
@@ -16,7 +16,7 @@
-export([handle_view_req/3,handle_temp_view_req/2]).
-export([parse_view_params/3]).
--export([make_view_fold_fun/7, finish_view_fold/4, view_row_obj/3]).
+-export([make_view_fold_fun/7, finish_view_fold/4, finish_view_fold/5, view_row_obj/3]).
-export([view_group_etag/2, view_group_etag/3, make_reduce_fold_funs/6]).
-export([design_doc_view/5, parse_bool_param/1, doc_member/2]).
-export([make_key_options/1, load_view/4]).

0 comments on commit 6153cda

Please sign in to comment.