Skip to content
This repository was archived by the owner on Oct 17, 2022. It is now read-only.

Commit 6332bfd

Browse files
authored
Merge branch 'master' into ioq-docs
2 parents 8ae145e + 53bcbd4 commit 6332bfd

File tree

5 files changed

+35
-23
lines changed

5 files changed

+35
-23
lines changed

src/api/database/find.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,9 @@ the database performs a full scan of the primary index:
756756
in production.
757757

758758
Most selector expressions work exactly as you would expect for the given
759-
operator.
759+
operator. But it is not always the case: for example, comparison of strings is
760+
done with ICU and can can give surprising results if you were expecting ASCII
761+
ordering. See :ref:`views/collation` for more details.
760762

761763
.. _find/sort:
762764

src/api/server/common.rst

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,9 @@ error.
10451045
documents and ``_active_tasks`` to get a complete state
10461046
summary
10471047

1048+
.. versionchanged:: 3.0.0 In error states the `"info"` field switched
1049+
from being a string to being an object
1050+
10481051
.. http:get:: /_scheduler/docs
10491052
:synopsis: Retrieve information about replication documents from the
10501053
``_replicator`` database.
@@ -1074,9 +1077,10 @@ error.
10741077
:>json string target: Replication target
10751078
:>json string start_time: Timestamp of when the replication was started
10761079
:>json string last_update: Timestamp of last state update
1077-
:>json object info: May contain additional information about the state.
1078-
For error states, this will be a string. For success
1079-
states this will contain a JSON object (see below).
1080+
:>json object info: Will contain additional information about the
1081+
state. For errors, this will be an object with
1082+
an `"error"` field and string value. For
1083+
success states, see below.
10801084
:>json number error_count: Consecutive errors count. Indicates how many
10811085
times in a row this replication has crashed.
10821086
Replication will be retried with an exponential
@@ -1210,9 +1214,10 @@ error.
12101214
:>json string target: Replication target
12111215
:>json string start_time: Timestamp of when the replication was started
12121216
:>json string last_update: Timestamp of last state update
1213-
:>json object info: May contain additional information about the state.
1214-
For error states, this will be a string. For success
1215-
states this will contain a JSON object (see below).
1217+
:>json object info: Will contain additional information about the
1218+
state. For errors, this will be an object with
1219+
an `"error"` field and string value. For
1220+
success states, see below.
12161221
:>json number error_count: Consecutive errors count. Indicates how many
12171222
times in a row this replication has crashed.
12181223
Replication will be retried with an exponential
@@ -1311,9 +1316,10 @@ error.
13111316
:>json string target: Replication target
13121317
:>json string start_time: Timestamp of when the replication was started
13131318
:>json string last_update: Timestamp of last state update
1314-
:>json object info: May contain additional information about the state.
1315-
For error states, this will be a string. For success
1316-
states this will contain a JSON object (see below).
1319+
:>json object info: Will contain additional information about the
1320+
state. For errors, this will be an object with
1321+
an `"error"` field and string value. For
1322+
success states, see below.
13171323
:>json number error_count: Consecutive errors count. Indicates how many
13181324
times in a row this replication has crashed.
13191325
Replication will be retried with an exponential

src/replication/index.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
Replication
1717
===========
1818

19-
The replication is an incremental one way process involving two databases
19+
Replication is an incremental one way process involving two databases
2020
(a source and a destination).
2121

22-
The aim of the replication is that at the end of the process, all active
23-
documents on the source database are also in the destination database and all
24-
documents that were deleted in the source databases are also deleted (if exists)
25-
on the destination database.
22+
The aim of replication is that at the end of the process, all active
23+
documents in the source database are also in the destination database
24+
and all documents that were deleted in the source database are also
25+
deleted in the destination database (if they even existed).
2626

2727
The replication process only copies the last revision of a document, so all
28-
previous revisions that were only on the source database are not copied to the
28+
previous revisions that were only in the source database are not copied to the
2929
destination database.
3030

3131
.. toctree::

src/replication/intro.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ database. This enables users to distribute data across several nodes or
2121
data centers, but also to move data more closely to clients.
2222

2323
Replication involves a source and a destination database, which can be on the
24-
same or on different CouchDB instances. The aim of the replication is that at
25-
the end of the process, all active documents on the source database are also in
24+
same or on different CouchDB instances. The aim of replication is that at
25+
the end of the process, all active documents in the source database are also in
2626
the destination database and all documents that were deleted in the source
27-
databases are also deleted on the destination database (if they even existed).
27+
database are also deleted in the destination database (if they even existed).
2828

29-
Transient and Persistant Replication
29+
Transient and Persistent Replication
3030
====================================
3131

3232
There are two different ways to set up a replication. The first one that was
33-
introduced into CouchDB leads do a replication that could be called `transient`.
33+
introduced into CouchDB leads to a replication that could be called `transient`.
3434
Transient means that there are no documents backing up the replication. So after a
3535
restart of the CouchDB server the replication will disapear. Later, the
3636
:ref:`_replicator <replicator>` database was introduced, which keeps documents

src/replication/replicator.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@ crashes with an increasingly larger interval. The ``history`` list from
207207
"doc_id": "my_rep_crashing",
208208
"error_count": 6,
209209
"id": "cb78391640ed34e9578e638d9bb00e44+create_target",
210-
"info": "db_not_found: could not open http://adm:*****@localhost:5984/missing/",
210+
"info": {
211+
"error": "db_not_found: could not open http://adm:*****@localhost:5984/missing/"
212+
},
211213
"last_updated": "2017-04-05T20:55:10Z",
212214
"node": "node1@127.0.0.1",
213215
"source_proxy": null,
@@ -263,7 +265,9 @@ exactly why it failed:
263265
"doc_id": "my_rep_dup",
264266
"error_count": 1,
265267
"id": null,
266-
"info": "Replication `a81a78e822837e66df423d54279c15fe+continuous+create_target` specified by document `my_rep_dup` already started, triggered by document `my_rep` from db `_replicator`",
268+
"info": {
269+
"error": "Replication `a81a78e822837e66df423d54279c15fe+continuous+create_target` specified by document `my_rep_dup` already started, triggered by document `my_rep` from db `_replicator`"
270+
},
267271
"last_updated": "2017-04-05T21:41:51Z",
268272
"source": "http://myserver.com/foo/",
269273
"start_time": "2017-04-05T21:41:51Z",

0 commit comments

Comments
 (0)