Skip to content

Commit 4d0933d

Browse files
v-izmalkovlenkis
authored andcommitted
Minor bug-fixes in docs version 2.2 specific (#939)
* Fix gh-893 (v.2.2 specific) feedback: Submodule box.info This is the same fix as with v. 1.10 but with added downstream.idle description. Translation needed * Update gh-893 feedback: Submodule box.info Updated the example to represent features, relevant to version 2.2 * Fix gh-899 feedback: Module key_def Added round brackets and pretify the text description. Translation needed for this page.
1 parent cfc5317 commit 4d0933d

File tree

2 files changed

+38
-25
lines changed

2 files changed

+38
-25
lines changed

doc/2.2/book/box/box_info.rst

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,16 @@ variables.
182182
Even if an instance is :ref:`removed <replication-remove_instances>`,
183183
its values will still appear here.
184184

185-
* **replication.downstream.status** ``= disconnected`` is displayed if the
186-
downstream instance disconnects from the upstream instance. Otherwise the
187-
status is not reported.
185+
* **replication.downstream.idle** is the time (in seconds) since the last
186+
time this instance sent events through the downstream replication.
187+
188+
* **replication.downstream.status** is the replication status for downstream
189+
replications:
190+
191+
* ``stopped`` means that downstream replication has stopped.
192+
* ``follow`` means that downstream replication is in progress.
193+
194+
188195

189196
.. function:: box.info()
190197

@@ -205,33 +212,37 @@ variables.
205212
206213
tarantool> box.info()
207214
---
208-
- version: 1.7.6-68-g51fcffb77
215+
- vinyl: []
216+
version: 2.2.0-482-g8c84932ad
209217
id: 2
210218
ro: true
211-
vclock: {1: 5}
212-
uptime: 917
219+
status: running
220+
vclock: {1: 9}
221+
uptime: 356
213222
lsn: 0
214-
vinyl: []
223+
memory: []
215224
cluster:
216-
uuid: 783e2285-55b1-42d4-b93c-68dcbb7a8c18
217-
pid: 35341
218-
status: running
219-
signature: 5
225+
uuid: e261a5bc-6303-4de3-9873-556f311255e0
226+
pid: 160
227+
gc: []
228+
signature: 9
220229
replication:
221230
1:
222231
id: 1
223-
uuid: 471cd36e-cb2e-4447-ac66-2d28e9dd3b67
224-
lsn: 5
232+
uuid: fce71bb3-0e99-40ec-ab7e-5159487e18d1
233+
lsn: 9
225234
upstream:
226235
status: follow
227-
idle: 124.98795700073
228-
peer: replicator@192.168.0.101:3301
229-
lag: 0
236+
idle: 0.035709699994186
237+
peer: replicator@127.0.0.1:3401
238+
lag: 0.00016164779663086
230239
downstream:
231-
vclock: {1: 5}
240+
status: follow
241+
idle: 0.59840899999836
242+
vclock: {1: 9}
232243
2:
233244
id: 2
234-
uuid: ac45d5d2-8a16-4520-ad5e-1abba6baba0a
245+
uuid: bc4629ce-ea31-4f75-b805-a4807bcacc93
235246
lsn: 0
236-
uuid: ac45d5d2-8a16-4520-ad5e-1abba6baba0a
247+
uuid: bc4629ce-ea31-4f75-b805-a4807bcacc93
237248
...

doc/2.2/reference/reference_lua/key_def.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ to extract or compare the index key values.
2323

2424
:returns: key_def-object :ref:`a key_def object <key_def-object>`
2525

26-
The parts table has components which are the same as
27-
the ``parts`` option in
26+
The parts table has components which are the same as
27+
the ``parts`` option in
2828
:ref:`Options for space_object:create_index() <box_space-create_index-options>`.
2929

3030
fieldno (integer) for example fieldno=1
@@ -197,12 +197,14 @@ to extract or compare the index key values.
197197
198198
.. _key_def-totable:
199199

200-
.. method:: totable
200+
.. method:: totable()
201201

202202
Return a table containing what is in the key_def_object.
203-
This is the reverse of ``key_def.new()`` -- ``key_def.new()`` takes
204-
a table and returns a key_def object, ``key_def_object:totable()`` takes
205-
a key_def object and returns a table.
203+
This is the reverse of ``key_def.new()``:
204+
205+
* ``key_def.new()`` takes a table and returns a key_def object,
206+
* ``key_def_object:totable()`` takes a key_def object and returns a table.
207+
206208
This is useful for input to ``_serialize`` methods.
207209

208210
:return: table

0 commit comments

Comments
 (0)