couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r772321 - in /couchdb/branches: 0.9.x/ 0.9.x/etc/default/ 0.9.x/share/www/script/test/ 0.9.x/src/couchdb/ form/etc/default/ replicationnotification/etc/default/ use-osx-bundled-icu/etc/default/
Date Wed, 06 May 2009 15:48:55 GMT
Author: davisp
Date: Wed May  6 15:48:55 2009
New Revision: 772321

URL: http://svn.apache.org/viewvc?rev=772321&view=rev
Log:
Un-backporting 766347.

Modified:
    couchdb/branches/0.9.x/   (props changed)
    couchdb/branches/0.9.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.9.x/share/www/script/test/view_errors.js
    couchdb/branches/0.9.x/src/couchdb/couch_db.hrl
    couchdb/branches/0.9.x/src/couchdb/couch_httpd_view.erl
    couchdb/branches/form/etc/default/couchdb   (props changed)
    couchdb/branches/replicationnotification/etc/default/couchdb   (props changed)
    couchdb/branches/use-osx-bundled-icu/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  6 15:48:55 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767543,768573,769109,771472
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766353,766358,766373,766505,767543,768573,769109,771472

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  6 15:48:55 2009
@@ -1,4 +1,4 @@
 /couchdb/branches/design_resources/etc/default/couchdb:751716-751803
 /couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767543,768573,769109,771472
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766353,766358,766373,766505,767543,768573,769109,771472
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.9.x/share/www/script/test/view_errors.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/share/www/script/test/view_errors.js?rev=772321&r1=772320&r2=772321&view=diff
==============================================================================
--- couchdb/branches/0.9.x/share/www/script/test/view_errors.js (original)
+++ couchdb/branches/0.9.x/share/www/script/test/view_errors.js Wed May  6 15:48:55 2009
@@ -81,14 +81,6 @@
   }
   
   try {
-    db.view("test/no_reduce", {reduce: true});
-    T(0 == 1);
-  } catch(e) {
-    T(db.last_req.status == 400);
-    T(e.error == "query_parse_error");
-  }
-
-  try {
       db.view("test/with_reduce", {group: true, reduce: false});
       T(0 == 1);
   } catch(e) {

Modified: couchdb/branches/0.9.x/src/couchdb/couch_db.hrl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_db.hrl?rev=772321&r1=772320&r2=772321&view=diff
==============================================================================
--- couchdb/branches/0.9.x/src/couchdb/couch_db.hrl (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_db.hrl Wed May  6 15:48:55 2009
@@ -155,7 +155,6 @@
     skip = 0,
     group_level = 0,
     reduce = true,
-    req_reduce = false,
     inclusive_end=true, % aka a closed-interval
     include_docs = false
 }).

Modified: couchdb/branches/0.9.x/src/couchdb/couch_httpd_view.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_httpd_view.erl?rev=772321&r1=772320&r2=772321&view=diff
==============================================================================
--- couchdb/branches/0.9.x/src/couchdb/couch_httpd_view.erl (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_httpd_view.erl Wed May  6 15:48:55 2009
@@ -375,15 +375,9 @@
         {"inclusive_end", "false"} ->
             Args#view_query_args{inclusive_end=false};
         {"reduce", "true"} ->
-            Args#view_query_args{
-                reduce=true,
-                req_reduce=true
-            };
+            Args#view_query_args{reduce=true};
         {"reduce", "false"} ->
-            Args#view_query_args{
-                reduce=false,
-                req_reduce=true
-            };
+            Args#view_query_args{reduce=false};
         {"include_docs", Value} ->
             case Value of
             "true" ->
@@ -418,18 +412,7 @@
             ok
         end;
     _ ->
-        case QueryArgs#view_query_args.req_reduce of
-        true ->
-            case QueryArgs#view_query_args.reduce of
-            true ->
-                ErrMsg = <<"Bad URL parameter: reduce=true">>,
-                throw({query_parse_error, ErrMsg});
-            _ ->
-                ok
-            end;
-        _ ->
-            ok
-        end
+        ok
     end,
     case Keys of
     nil ->

Propchange: couchdb/branches/form/etc/default/couchdb
            ('svn:mergeinfo' removed)

Propchange: couchdb/branches/replicationnotification/etc/default/couchdb
            ('svn:mergeinfo' removed)

Propchange: couchdb/branches/use-osx-bundled-icu/etc/default/couchdb
            ('svn:mergeinfo' removed)



Mime
View raw message