Skip to content

Commit 0f3b9e4

Browse files
patiencedaurp7nov
authored andcommitted
Clarify link between number and cdata (#3050)
* Clarify the connection between number and cdata * Adjust table widths * Mention decimal among number field index types Resolves #3049 Resolves #3040
1 parent a7cf740 commit 0f3b9e4

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

doc/book/box/data_model.rst

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Lua versus MsgPack
127127
.. container:: table
128128

129129
.. list-table::
130-
:widths: 15 20 30 35
130+
:widths: 15 30 15 40
131131
:header-rows: 1
132132

133133
* - Scalar / compound
@@ -150,6 +150,10 @@ Lua versus MsgPack
150150
- integer
151151
- `number`_
152152
- ``12345``
153+
* - scalar
154+
- integer
155+
- `cdata`_
156+
- ``12345``
153157
* - scalar
154158
- float64 (double)
155159
- `number`_
@@ -291,6 +295,9 @@ Here are examples of numbers using regular notation, exponential notation,
291295
the ULL suffix and the ``tonumber64`` function:
292296
``-55``, ``-2.7e+20``, ``100000000000000ULL``, ``tonumber64('18446744073709551615')``.
293297

298+
You can also use the ``ffi`` module to specify a C type to cast the number to.
299+
In this case, the number will be stored as `cdata`_.
300+
294301
.. _index-box_decimal:
295302

296303
**decimal**. The Tarantool decimal type is stored as a MsgPack ext (Extension).
@@ -437,7 +444,8 @@ Full information is in section
437444
- TREE or HASH
438445
* - ``'number'``
439446
- :ref:`number <index-box_number>`, which may include
440-
:ref:`integer <index-box_integer>` or :ref:`double <index-box_double>` values
447+
:ref:`integer <index-box_integer>`, :ref:`double <index-box_double>`,
448+
or :ref:`decimal <index-box_decimal>` values
441449
- TREE or HASH
442450
* - ``'decimal'``
443451
- :ref:`decimal <index-box_decimal>`

locale/ru/LC_MESSAGES/book/box/data_model.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,10 +711,10 @@ msgstr "``'number'``"
711711

712712
msgid ""
713713
":ref:`number <index-box_number>`, which may include :ref:`integer <index-"
714-
"box_integer>` or :ref:`double <index-box_double>` values"
714+
"box_integer>`, :ref:`double <index-box_double>`, or :ref:`decimal <index-box_decimal>` values"
715715
msgstr ""
716716
":ref:`number <index-box_number>`, может включать в себя значения типа "
717-
":ref:`integer <index-box_integer>` или :ref:`double <index-box_double>`"
717+
":ref:`integer <index-box_integer>`, :ref:`double <index-box_double>` или :ref:`decimal <index-box_decimal>`"
718718

719719
msgid "``'decimal'``"
720720
msgstr "``'decimal'``"

0 commit comments

Comments
 (0)