From commits-return-1504-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Tue Dec 16 21:19:28 2008
Return-Path: <commits-return-1504-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org>
Delivered-To: apmail-couchdb-commits-archive@www.apache.org
Received: (qmail 90584 invoked from network); 16 Dec 2008 21:19:25 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Dec 2008 21:19:25 -0000
Received: (qmail 23122 invoked by uid 500); 16 Dec 2008 21:19:38 -0000
Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org
Received: (qmail 23102 invoked by uid 500); 16 Dec 2008 21:19:38 -0000
Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@couchdb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@couchdb.apache.org>
List-Post: <mailto:commits@couchdb.apache.org>
List-Id: <commits.couchdb.apache.org>
Reply-To: dev@couchdb.apache.org
Delivered-To: mailing list commits@couchdb.apache.org
Received: (qmail 23093 invoked by uid 99); 16 Dec 2008 21:19:38 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2008 13:19:38 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2008 21:19:24 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 97A91238889B; Tue, 16 Dec 2008 13:19:04 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r727156 - in /couchdb/trunk: THANKS
 share/www/script/couch_tests.js src/couchdb/couch_httpd_view.erl
Date: Tue, 16 Dec 2008 21:19:04 -0000
To: commits@couchdb.apache.org
From: jchris@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081216211904.97A91238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jchris
Date: Tue Dec 16 13:19:03 2008
New Revision: 727156

URL: http://svn.apache.org/viewvc?rev=727156&view=rev
Log:
fix COUCHDB-177. thanks Paul Carey and Paul Davis

Modified:
    couchdb/trunk/THANKS
    couchdb/trunk/share/www/script/couch_tests.js
    couchdb/trunk/src/couchdb/couch_httpd_view.erl

Modified: couchdb/trunk/THANKS
URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=727156&r1=727155&r2=727156&view=diff
==============================================================================
--- couchdb/trunk/THANKS (original)
+++ couchdb/trunk/THANKS Tue Dec 16 13:19:03 2008
@@ -10,6 +10,7 @@
  * William Beh <willbeh@gmail.com>
  * Antony Blakey <antony.blakey@gmail.com>
  * Yoan Blanc <yoan.blanc@gmail.com>
+ * Paul Carey <paul.p.carey@gmail.com>
  * Benoit Chesneau <bchesneau@gmail.com>
  * Paul Joseph Davis <paul.joseph.davis@gmail.com>
  * Michael Gottesman <gottesmm@reed.edu>

Modified: couchdb/trunk/share/www/script/couch_tests.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=727156&r1=727155&r2=727156&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Tue Dec 16 13:19:03 2008
@@ -1344,6 +1344,15 @@
     }
     T(db.save(designDoc).ok);
 
+    // Test that missing keys work too
+    var keys = [101,30,15,37,50]
+    var reduce = db.view("test/summate",{group:true},keys).rows;
+    T(reduce.length == keys.length-1); // 101 is missing
+    for(var i=0; i<reduce.length; i++) {
+      T(keys.indexOf(reduce[i].key) != -1);
+      T(reduce[i].key == reduce[i].value);
+    }
+
     // First, the goods:
     var keys = [10,15,30,37,50];
     var rows = db.view("test/all_docs",{},keys).rows;
@@ -1356,7 +1365,7 @@
     T(reduce.length == keys.length);
     for(var i=0; i<reduce.length; i++) {
       T(keys.indexOf(reduce[i].key) != -1);
-      T(rows[i].key == rows[i].value);
+      T(reduce[i].key == reduce[i].value);
     }
 
     // Test that invalid parameter combinations get rejected

Modified: couchdb/trunk/src/couchdb/couch_httpd_view.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_view.erl?rev=727156&r1=727155&r2=727156&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd_view.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_view.erl Tue Dec 16 13:19:03 2008
@@ -153,10 +153,10 @@
     send_chunk(Resp, "{\"rows\":["),
     lists:foldl(
         fun(Key, AccSeparator) ->
-            {ok, _} = couch_view:fold_reduce(View, Dir, {Key, StartDocId}, 
+            {ok, {NewAcc, _, _}} = couch_view:fold_reduce(View, Dir, {Key, StartDocId}, 
                 {Key, EndDocId}, GroupRowsFun, RespFun, 
                 {AccSeparator, Skip, Count}),
-            "," % Switch to comma
+            NewAcc % Switch to comma
         end,
     "", Keys), % Start with no comma
     send_chunk(Resp, "]}"),
@@ -456,4 +456,4 @@
         end_json_response(Resp);
     Error ->
         throw(Error)
-    end.
\ No newline at end of file
+    end.