couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r656594 - in /incubator/couchdb/branches/runtimeconfig: ./ share/www/script/couch_tests.js src/couchdb/couch_httpd.erl
Date Thu, 15 May 2008 11:49:10 GMT
Author: jan
Date: Thu May 15 04:49:10 2008
New Revision: 656594

URL: http://svn.apache.org/viewvc?rev=656594&view=rev
Log:
Merged revisions 656123,656589 via svnmerge from 
https://jan@svn.apache.org/repos/asf/incubator/couchdb/trunk


Modified:
    incubator/couchdb/branches/runtimeconfig/   (props changed)
    incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js
    incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl

Propchange: incubator/couchdb/branches/runtimeconfig/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 15 04:49:10 2008
@@ -1 +1 @@
-/incubator/couchdb/trunk:1-655808
+/incubator/couchdb/trunk:1-656589

Modified: incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js?rev=656594&r1=656593&r2=656594&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js [utf-8] (original)
+++ incubator/couchdb/branches/runtimeconfig/share/www/script/couch_tests.js [utf-8] Thu May
15 04:49:10 2008
@@ -423,6 +423,9 @@
     restartServer();
     T(db.open(designDoc._id) == null);
     T(db.view("test/no_docs") == null);
+    
+    
+    
   },
 
   view_collation: function(debug) {
@@ -602,6 +605,19 @@
         T(queryResults.rows[j].key == i + 9 - j);
       }
     }
+    
+    // ignore decending=false. CouchDB should just ignore that.
+    for (i = 0; i < docs.length; i += 10) {
+      var queryResults = db.query(queryFun, {startkey:i, startkey_docid:i, 
+                                             descending:false, count:10});
+      T(queryResults.rows.length == 10)
+      T(queryResults.total_rows == docs.length)
+      T(queryResults.offset == i)
+      var j;
+      for (j = 0; j < 10;j++) {
+        T(queryResults.rows[j].key == i + j);
+      }
+    }
   },
 
   view_sandboxing: function(debug) {

Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl?rev=656594&r1=656593&r2=656594&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl Thu May 15 04:49:10
2008
@@ -652,6 +652,9 @@
             _ ->
                 Args %already reversed
             end;
+        {"descending", "false"} ->
+          % ignore
+          Args;
         {"skip", Value} ->
             case (catch list_to_integer(Value)) of
             Count when is_integer(Count) ->



Mime
View raw message