You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by fl...@apache.org on 2017/11/28 17:32:24 UTC
[couchdb-documentation] branch putType updated (515c8b4 -> 6f7fe85)
This is an automated email from the ASF dual-hosted git repository.
flimzy pushed a change to branch putType
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.
omit 515c8b4 Mention the possibility of multipart/related in the PUT /{doc} description
omit 782a56b multipart/mixed should be multipart/related
new 87e196c multipart/mixed should be multipart/related
new 6f7fe85 Mention the possibility of multipart/related in the PUT /{doc} description
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (515c8b4)
\
N -- N -- N refs/heads/putType (6f7fe85)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/replication/protocol.rst | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].
[couchdb-documentation] 01/02: multipart/mixed should be
multipart/related
Posted by fl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
flimzy pushed a commit to branch putType
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git
commit 87e196c2a98f51edca67bcd37e33bfb4751f7863
Author: Jonathan Hall <fl...@flimzy.com>
AuthorDate: Tue Nov 28 18:23:48 2017 +0100
multipart/mixed should be multipart/related
---
src/api/document/common.rst | 4 ++--
src/replication/protocol.rst | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index 58c423f..3f381e0 100644
--- a/src/api/document/common.rst
+++ b/src/api/document/common.rst
@@ -72,7 +72,7 @@
:param docid: Document ID
:<header Accept: - :mimetype:`application/json`
- - :mimetype:`multipart/mixed`
+ - :mimetype:`multipart/related`
- :mimetype:`text/plain`
:<header If-None-Match: Double quoted document's revision token
@@ -105,7 +105,7 @@
document revisions. Default is ``false``
:>header Content-Type: - :mimetype:`application/json`
- - :mimetype:`multipart/mixed`
+ - :mimetype:`multipart/related`
- :mimetype:`text/plain; charset=utf-8`
:>header ETag: Double quoted document's revision token. Not available when
retrieving conflicts-related information
diff --git a/src/replication/protocol.rst b/src/replication/protocol.rst
index 2dc3041..90cde13 100644
--- a/src/replication/protocol.rst
+++ b/src/replication/protocol.rst
@@ -1150,16 +1150,16 @@ with the following query parameters:
may be changed in between this step and handling related events on the
Changes Feed
-In the response Source SHOULD return :mimetype:`multipart/mixed` or respond
+In the response Source SHOULD return :mimetype:`multipart/related` or respond
instead with :mimetype:`application/json` unless the :header:`Accept` header
-specifies a different mime type. The :mimetype:`multipart/mixed` content type
+specifies a different mime type. The :mimetype:`multipart/related` content type
allows handling the response data as a stream, since there could be multiple
documents (one per each Leaf Revision) plus several attachments. These
attachments are mostly binary and JSON has no way to handle such data except as
base64 encoded strings which are very ineffective for transfer and processing
operations.
-With a :mimetype:`multipart/mixed` response the Replicator handles multiple
+With a :mimetype:`multipart/related` response the Replicator handles multiple
Document Leaf Revisions and their attachments one by one as raw data without
any additional encoding applied. There is also one agreement to make data
processing more effective: the Document ALWAYS goes before its attachments, so
@@ -1171,7 +1171,7 @@ Documents-Attachments and may handle it as stream with lesser memory footprint.
.. code-block:: http
GET /source/SpaghettiWithMeatballs?revs=true&open_revs=[%225-00ecbbc%22,%221-917fa23%22,%223-6bcedf1%22]&latest=true HTTP/1.1
- Accept: multipart/mixed
+ Accept: multipart/related
Host: localhost:5984
User-Agent: CouchDB
@@ -1180,7 +1180,7 @@ Documents-Attachments and may handle it as stream with lesser memory footprint.
.. code-block:: http
HTTP/1.1 200 OK
- Content-Type: multipart/mixed; boundary="7b1596fc4940bc1be725ad67f11ec1c4"
+ Content-Type: multipart/related; boundary="7b1596fc4940bc1be725ad67f11ec1c4"
Date: Thu, 07 Nov 2013 15:10:16 GMT
Server: CouchDB (Erlang OTP)
Transfer-Encoding: chunked
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.
[couchdb-documentation] 02/02: Mention the possibility of
multipart/related in the PUT /{doc} description
Posted by fl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
flimzy pushed a commit to branch putType
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git
commit 6f7fe855767839f3aa5edfed836148ddc39d9d60
Author: Jonathan Hall <fl...@flimzy.com>
AuthorDate: Tue Nov 28 17:59:58 2017 +0100
Mention the possibility of multipart/related in the PUT /{doc} description
---
src/api/document/common.rst | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index 3f381e0..0494e6f 100644
--- a/src/api/document/common.rst
+++ b/src/api/document/common.rst
@@ -180,14 +180,17 @@
:param db: Database name
:param docid: Document ID
+
:<header Accept: - :mimetype:`application/json`
- :mimetype:`text/plain`
- :<header Content-Type: :mimetype:`application/json`
+ :<header Content-Type: - :mimetype:`application/json`
+ - :mimetype:`multipart/related`
:<header If-Match: Document's revision. Alternative to `rev` query
parameter or document key. *Optional*
:<header X-Couch-Full-Commit: Overrides server's
:config:option:`commit policy <couchdb/delayed_commits>`. Possible values
are: ``false`` and ``true``. *Optional*
+
:query string rev: Document's revision if updating an existing document.
Alternative to `If-Match` header or document key. *Optional*
:query string batch: Stores document in :ref:`batch mode
@@ -198,6 +201,7 @@
the document. ``new_edits=false`` is used by the replicator to insert
documents into the target database even if that leads to the creation
of conflicts. *Optional*
+
:>header Content-Type: - :mimetype:`application/json`
- :mimetype:`text/plain; charset=utf-8`
:>header ETag: Quoted document's new revision
@@ -205,6 +209,7 @@
:>json string id: Document ID
:>json boolean ok: Operation status
:>json string rev: Revision MVCC token
+
:code 201: Document created and stored on disk
:code 202: Document data accepted, but not yet stored on disk
:code 400: Invalid request body or parameters
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.