You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by bi...@apache.org on 2014/03/25 21:46:06 UTC

[1/2] couchdb commit: updated refs/heads/master to 1fb7cea

Repository: couchdb
Updated Branches:
  refs/heads/master 35a030378 -> 1fb7cea25


put back JSON return value in collation example

Originally removed in 0f7be287d6a9358d960beb17b16ad7b5e20bd360


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bea5c947
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bea5c947
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bea5c947

Branch: refs/heads/master
Commit: bea5c947d1c832f0054ae5d22376ebfbf37a366c
Parents: 35a0303
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Tue Mar 25 16:45:28 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Tue Mar 25 16:45:28 2014 -0400

----------------------------------------------------------------------
 share/doc/src/couchapp/views/collation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/bea5c947/share/doc/src/couchapp/views/collation.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/couchapp/views/collation.rst b/share/doc/src/couchapp/views/collation.rst
index 06c4c6d..9c2f5c7 100644
--- a/share/doc/src/couchapp/views/collation.rst
+++ b/share/doc/src/couchapp/views/collation.rst
@@ -28,7 +28,7 @@ property serves as the key, thus the result will be sorted by ``LastName``:
 
   function(doc) {
     if (doc.Type == "customer") {
-      emit(doc.LastName, null);
+      emit(doc.LastName, {FirstName: doc.FirstName, Address: doc.Address});
     }
   }

[2/2] couchdb commit: updated refs/heads/master to 1fb7cea

Posted by bi...@apache.org.
clarified what a complex key is in view collation


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1fb7cea2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1fb7cea2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1fb7cea2

Branch: refs/heads/master
Commit: 1fb7cea25b60585b16bdd786cd3e2b299fa384df
Parents: bea5c94
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Tue Mar 25 16:45:50 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Tue Mar 25 16:45:54 2014 -0400

----------------------------------------------------------------------
 share/doc/src/couchapp/views/collation.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1fb7cea2/share/doc/src/couchapp/views/collation.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/couchapp/views/collation.rst b/share/doc/src/couchapp/views/collation.rst
index 9c2f5c7..9b11b15 100644
--- a/share/doc/src/couchapp/views/collation.rst
+++ b/share/doc/src/couchapp/views/collation.rst
@@ -32,8 +32,8 @@ property serves as the key, thus the result will be sorted by ``LastName``:
     }
   }
 
-CouchDB allows arbitrary JSON structures to be used as keys. You can use complex
-keys for fine-grained control over sorting and grouping.
+CouchDB allows arbitrary JSON structures to be used as keys. You can use JSON
+arrays as keys for fine-grained control over sorting and grouping.
 
 Examples
 ========