Skip to content

Fixes gh-2151 UUID is now part of SCALAR #2235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 12, 2021
Merged

Fixes gh-2151 UUID is now part of SCALAR #2235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c8debe
Fixes gh-2151 UUID is now part of SCALAR
pgulutzan Jul 8, 2021
9815782
Update translations
patiencedaur Jul 20, 2021
14549fe
Fixed typo in data_model.rst
alexandra-mara Jul 27, 2021
4f63cbe
Update translations
alexandra-mara Jul 27, 2021
96968bf
Fixed typo in create_index.rst
alexandra-mara Jul 27, 2021
79a84c7
Update translations
alexandra-mara Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions doc/book/box/data_model.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,14 +325,14 @@ see :ref:`box.tuple <box_tuple>`.

.. _index-box_scalar:

**scalar**. Values in a scalar field can be boolean, integer, unsigned, double
or number, decimal, string, uuid, or varbinary; but not array, map, or tuple.
**scalar**. Values in a scalar field can be boolean, integer, unsigned, double,
number, decimal, string, uuid, or varbinary; but not array, map, or tuple.
Examples: ``true``, ``1``, ``'xxx'``.

.. _index-box_any:

**any**. Values in a field of this type can be boolean, integer, unsigned, double
or number, decimal, string, uuid, varbinary, array, map, or tuple.
**any**. Values in a field of this type can be boolean, integer, unsigned, double,
number, decimal, string, uuid, varbinary, array, map, or tuple.
Examples: ``true``, ``1``, ``'xxx'``, ``{box.NULL, 0}``.

Examples of insert requests with different field types:
Expand Down Expand Up @@ -423,14 +423,16 @@ Full information is in section
| | :ref:`unsigned <index-box_unsigned>`, | |
| | :ref:`number <index-box_number>`, | |
| | :ref:`decimal <index-box_decimal>`, | |
| | :ref:`string <index-box_string>`, or | |
| | :ref:`varbinary <index-box_bin>` | |
| | :ref:`string <index-box_string>`, | |
| | :ref:`varbinary <index-box_bin>`, |
| | or :ref:`uuid <index-box_uuid>` | ||
| | values | |
| | | |
| | When a scalar field contains values of | |
| | different underlying types, the key order | |
| | is: nils, then booleans, then numbers, | |
| | then strings, then varbinaries. | |
| | then strings, then varbinaries, then | |
| | uuids. | |
+--------------------------------+-------------------------------------------+--------------------------------------+

.. _index-collation:
Expand Down
8 changes: 5 additions & 3 deletions doc/reference/reference_lua/box_space/create_index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,14 @@ and what index types are allowed.
booleans (true or false), or
integers between -9223372036854775808 and 18446744073709551615, or
single-precision floating point numbers, or
double-precision floating-point numbers, or
double-precision floating point numbers, or
exact numbers, or
strings, or
(varbinary) byte arrays.
(varbinary) byte arrays, or
uuids.
When there is a mix of types, the key order is: null,
then booleans, then numbers, then strings, then byte arrays
then booleans, then numbers, then strings, then byte arrays,
then uuids.
- memtx TREE or HASH indexes;

vinyl TREE indexes
Expand Down
2 changes: 1 addition & 1 deletion doc/reference/reference_sql/sql_statements_and_clauses.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ and returns a table with rows in order.
Sorting order:

* The default order is ASC (ascending), the optional order is DESC (descending).
* NULLs come first, then BOOLEANs, then numbers, then STRINGs, then VARBINARYs.
* NULLs come first, then BOOLEANs, then numbers, then STRINGs, then VARBINARYs, then UUIDs.
* Within STRINGs, ordering is according to collation.
* Collation may be specified with a :ref:`COLLATE clause <sql_collate_clause>` within the ORDER BY column-list, or may be default.

Expand Down
138 changes: 12 additions & 126 deletions locale/ru/LC_MESSAGES/book/box/data_model.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,21 +577,21 @@ msgstr ""

msgid ""
"**scalar**. Values in a scalar field can be boolean, integer, unsigned, "
"double or number, decimal, string, uuid, or varbinary; but not array, map, "
"or tuple. Examples: ``true``, ``1``, ``'xxx'``."
"double, number, decimal, string, uuid, or varbinary; but not array, map, or "
"tuple. Examples: ``true``, ``1``, ``'xxx'``."
msgstr ""
"**scalar**. Значения в поле scalar могут быть типа boolean, integer, "
"unsigned, double, number, decimal, string, uuid или varbinary, но не могут "
"быть типа array, map или tuple. Примеры: ``true``, ``1``, ``'xxx'``."
"**scalar**. Значения в поле типа scalar могут быть следующих типов: boolean,"
" integer, unsigned, double, number, decimal, string, uuid, varbinary. Они не"
" могут иметь тип array, map или tuple. Примеры: ``true``, ``1``, ``'xxx'``."

msgid ""
"**any**. Values in a field of this type can be boolean, integer, unsigned, "
"double or number, decimal, string, uuid, varbinary, array, map, or tuple. "
"double, number, decimal, string, uuid, varbinary, array, map, or tuple. "
"Examples: ``true``, ``1``, ``'xxx'``, ``{box.NULL, 0}``."
msgstr ""
"**any**. Значения в поле any могут быть типа boolean, integer, unsigned, "
"double, number, decimal, string, uuid, varbinary, array, map или tuple. "
"Примеры: ``true``, ``1``, ``'xxx'``, ``{box.NULL, 0}``."
"**any**. Значения в поле типа any могут быть следующих типов: boolean, "
"integer, unsigned, double, number, decimal, string, uuid, varbinary, array, "
"map, tuple. Примеры: ``true``, ``1``, ``'xxx'``, ``{box.NULL, 0}``."

msgid "Examples of insert requests with different field types:"
msgstr "Примеры запросов вставки с разными типами полей:"
Expand Down Expand Up @@ -658,123 +658,6 @@ msgstr ""
" :ref:`Описание типов индексированных полей "
"<details_about_index_field_types>`."

msgid "Field type name string"
msgstr "Имя типа поля"

msgid "Field type |br|"
msgstr "Тип поля |br|"

msgid "Index type"
msgstr "Тип индекса"

msgid "``'boolean'``"
msgstr "``'boolean'``"

msgid ":ref:`boolean <index-box_boolean>`"
msgstr ":ref:`boolean <index-box_boolean>`"

msgid ":ref:`TREE or HASH <box_index-type>`"
msgstr ":ref:`TREE или HASH <box_index-type>`"

msgid "``'integer'`` (may also be called ‘int’)"
msgstr "``'integer'`` (также может называться ‘int’)"

msgid ":ref:`integer <index-box_integer>`, which may include unsigned values"
msgstr ""
":ref:`integer <index-box_integer>`, может включать в себя значения unsigned "
"(без знака)"

msgid "TREE or HASH"
msgstr "TREE или HASH"

msgid ""
"``'unsigned'`` (may also be called ``'uint'`` or ``'num'``, but ``'num'`` is"
" deprecated)"
msgstr ""
"``'unsigned'`` (без знака, также может называться ``'uint'`` или ``'num'``, "
"но ``'num'`` объявлен устаревшим)"

msgid ":ref:`unsigned <index-box_unsigned>`"
msgstr ":ref:`unsigned <index-box_unsigned>`"

msgid "TREE, BITSET, or HASH"
msgstr "TREE, BITSET или HASH"

msgid "``'double'``"
msgstr "``'double'``"

msgid ":ref:`double <index-box_double>`"
msgstr ":ref:`double <index-box_double>`"

msgid "``'number'``"
msgstr "``'number'``"

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

msgid "``'decimal'``"
msgstr "``'decimal'``"

msgid ":ref:`decimal <index-box_decimal>`"
msgstr ":ref:`decimal <index-box_decimal>`"

msgid "``'string'`` (may also be called ``'str'``)"
msgstr "``'string'`` (строка, также может называться ``'str'``)"

msgid ":ref:`string <index-box_string>`"
msgstr ":ref:`string <index-box_string>`"

msgid "``'varbinary'``"
msgstr "``'varbinary'``"

msgid ":ref:`varbinary <index-box_bin>`"
msgstr ":ref:`varbinary <index-box_bin>`"

msgid "TREE, HASH, or BITSET (since version 2.7)"
msgstr "TREE, HASH или BITSET (с версии 2.7)"

msgid "``'uuid'``"
msgstr "``'uuid'``"

msgid ":ref:`uuid <index-box_uuid>`"
msgstr ":ref:`uuid <index-box_uuid>`"

msgid "``'array'``"
msgstr "``'array'``"

msgid ":ref:`array <index-box_array>`"
msgstr ":ref:`array <index-box_array>`"

msgid ":ref:`RTREE <box_index-rtree>`"
msgstr ":ref:`RTREE <box_index-rtree>`"

msgid "``'scalar'``"
msgstr "``'scalar'``"

msgid ""
"may include :ref:`nil <index-box_nil>`, :ref:`boolean <index-box_boolean>`, "
":ref:`integer <index-box_integer>`, :ref:`unsigned <index-box_unsigned>`, "
":ref:`number <index-box_number>`, :ref:`decimal <index-box_decimal>`, "
":ref:`string <index-box_string>`, or :ref:`varbinary <index-box_bin>` values"
msgstr ""
"может содержать значения :ref:`nil <index-box_nil>`, :ref:`boolean <index-"
"box_boolean>`, :ref:`integer <index-box_integer>`, :ref:`unsigned <index-"
"box_unsigned>`, :ref:`number <index-box_number>`, :ref:`decimal <index-"
"box_decimal>`, :ref:`string <index-box_string>` или :ref:`varbinary <index-"
"box_bin>`"

msgid ""
"When a scalar field contains values of different underlying types, the key "
"order is: nils, then booleans, then numbers, then strings, then varbinaries."
msgstr ""
"Когда поле типа scalar содержит значения различных базовых типов, то порядок"
" ключей следующий: nil, затем boolean, затем number, затем string, затем "
"varbinary."

msgid "Collations"
msgstr "Сортировка"

Expand Down Expand Up @@ -1603,6 +1486,9 @@ msgstr ""
"больше нужно оперативной памяти, но количество низкоуровневых шагов остается"
" примерно тем же."

msgid "Index type"
msgstr "Тип индекса"

msgid ""
"Typically, a HASH index is faster than a TREE index if the number of tuples "
"in the space is greater than one."
Expand Down
Loading