Skip to content

Commit 963cf6b

Browse files
alexandra-maraalexandra-mara
authored
Merge pull request #2235 from tarantool/pgulutzan-gh-2151
Fixes gh-2151 UUID is now part of SCALAR
2 parents c6105d1 + 79a84c7 commit 963cf6b

File tree

6 files changed

+42
-149
lines changed

6 files changed

+42
-149
lines changed

‎doc/book/box/data_model.rst‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,14 +325,14 @@ see :ref:`box.tuple <box_tuple>`.
325325

326326
.. _index-box_scalar:
327327

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

332332
.. _index-box_any:
333333

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

338338
Examples of insert requests with different field types:
@@ -423,14 +423,16 @@ Full information is in section
423423
| | :ref:`unsigned <index-box_unsigned>`, | |
424424
| | :ref:`number <index-box_number>`, | |
425425
| | :ref:`decimal <index-box_decimal>`, | |
426-
| | :ref:`string <index-box_string>`, or | |
427-
| | :ref:`varbinary <index-box_bin>` | |
426+
| | :ref:`string <index-box_string>`, | |
427+
| | :ref:`varbinary <index-box_bin>`, |
428+
| | or :ref:`uuid <index-box_uuid>` | ||
428429
| | values | |
429430
| | | |
430431
| | When a scalar field contains values of | |
431432
| | different underlying types, the key order | |
432433
| | is: nils, then booleans, then numbers, | |
433-
| | then strings, then varbinaries. | |
434+
| | then strings, then varbinaries, then | |
435+
| | uuids. | |
434436
+--------------------------------+-------------------------------------------+--------------------------------------+
435437

436438
.. _index-collation:

‎doc/reference/reference_lua/box_space/create_index.rst‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,14 @@ and what index types are allowed.
296296
booleans (true or false), or
297297
integers between -9223372036854775808 and 18446744073709551615, or
298298
single-precision floating point numbers, or
299-
double-precision floating-point numbers, or
299+
double-precision floating point numbers, or
300300
exact numbers, or
301301
strings, or
302-
(varbinary) byte arrays.
302+
(varbinary) byte arrays, or
303+
uuids.
303304
When there is a mix of types, the key order is: null,
304-
then booleans, then numbers, then strings, then byte arrays
305+
then booleans, then numbers, then strings, then byte arrays,
306+
then uuids.
305307
- memtx TREE or HASH indexes;
306308

307309
vinyl TREE indexes

‎doc/reference/reference_sql/sql_statements_and_clauses.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2227,7 +2227,7 @@ and returns a table with rows in order.
22272227
Sorting order:
22282228

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

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

Lines changed: 12 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -577,21 +577,21 @@ msgstr ""
577577

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

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

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

661-
msgid "Field type name string"
662-
msgstr "Имя типа поля"
663-
664-
msgid "Field type |br|"
665-
msgstr "Тип поля |br|"
666-
667-
msgid "Index type"
668-
msgstr "Тип индекса"
669-
670-
msgid "``'boolean'``"
671-
msgstr "``'boolean'``"
672-
673-
msgid ":ref:`boolean <index-box_boolean>`"
674-
msgstr ":ref:`boolean <index-box_boolean>`"
675-
676-
msgid ":ref:`TREE or HASH <box_index-type>`"
677-
msgstr ":ref:`TREE или HASH <box_index-type>`"
678-
679-
msgid "``'integer'`` (may also be called ‘int’)"
680-
msgstr "``'integer'`` (также может называться ‘int’)"
681-
682-
msgid ":ref:`integer <index-box_integer>`, which may include unsigned values"
683-
msgstr ""
684-
":ref:`integer <index-box_integer>`, может включать в себя значения unsigned "
685-
"(без знака)"
686-
687-
msgid "TREE or HASH"
688-
msgstr "TREE или HASH"
689-
690-
msgid ""
691-
"``'unsigned'`` (may also be called ``'uint'`` or ``'num'``, but ``'num'`` is"
692-
" deprecated)"
693-
msgstr ""
694-
"``'unsigned'`` (без знака, также может называться ``'uint'`` или ``'num'``, "
695-
"но ``'num'`` объявлен устаревшим)"
696-
697-
msgid ":ref:`unsigned <index-box_unsigned>`"
698-
msgstr ":ref:`unsigned <index-box_unsigned>`"
699-
700-
msgid "TREE, BITSET, or HASH"
701-
msgstr "TREE, BITSET или HASH"
702-
703-
msgid "``'double'``"
704-
msgstr "``'double'``"
705-
706-
msgid ":ref:`double <index-box_double>`"
707-
msgstr ":ref:`double <index-box_double>`"
708-
709-
msgid "``'number'``"
710-
msgstr "``'number'``"
711-
712-
msgid ""
713-
":ref:`number <index-box_number>`, which may include :ref:`integer <index-"
714-
"box_integer>` or :ref:`double <index-box_double>` values"
715-
msgstr ""
716-
":ref:`number <index-box_number>`, может включать в себя значения типа "
717-
":ref:`integer <index-box_integer>` или :ref:`double <index-box_double>`"
718-
719-
msgid "``'decimal'``"
720-
msgstr "``'decimal'``"
721-
722-
msgid ":ref:`decimal <index-box_decimal>`"
723-
msgstr ":ref:`decimal <index-box_decimal>`"
724-
725-
msgid "``'string'`` (may also be called ``'str'``)"
726-
msgstr "``'string'`` (строка, также может называться ``'str'``)"
727-
728-
msgid ":ref:`string <index-box_string>`"
729-
msgstr ":ref:`string <index-box_string>`"
730-
731-
msgid "``'varbinary'``"
732-
msgstr "``'varbinary'``"
733-
734-
msgid ":ref:`varbinary <index-box_bin>`"
735-
msgstr ":ref:`varbinary <index-box_bin>`"
736-
737-
msgid "TREE, HASH, or BITSET (since version 2.7)"
738-
msgstr "TREE, HASH или BITSET (с версии 2.7)"
739-
740-
msgid "``'uuid'``"
741-
msgstr "``'uuid'``"
742-
743-
msgid ":ref:`uuid <index-box_uuid>`"
744-
msgstr ":ref:`uuid <index-box_uuid>`"
745-
746-
msgid "``'array'``"
747-
msgstr "``'array'``"
748-
749-
msgid ":ref:`array <index-box_array>`"
750-
msgstr ":ref:`array <index-box_array>`"
751-
752-
msgid ":ref:`RTREE <box_index-rtree>`"
753-
msgstr ":ref:`RTREE <box_index-rtree>`"
754-
755-
msgid "``'scalar'``"
756-
msgstr "``'scalar'``"
757-
758-
msgid ""
759-
"may include :ref:`nil <index-box_nil>`, :ref:`boolean <index-box_boolean>`, "
760-
":ref:`integer <index-box_integer>`, :ref:`unsigned <index-box_unsigned>`, "
761-
":ref:`number <index-box_number>`, :ref:`decimal <index-box_decimal>`, "
762-
":ref:`string <index-box_string>`, or :ref:`varbinary <index-box_bin>` values"
763-
msgstr ""
764-
"может содержать значения :ref:`nil <index-box_nil>`, :ref:`boolean <index-"
765-
"box_boolean>`, :ref:`integer <index-box_integer>`, :ref:`unsigned <index-"
766-
"box_unsigned>`, :ref:`number <index-box_number>`, :ref:`decimal <index-"
767-
"box_decimal>`, :ref:`string <index-box_string>` или :ref:`varbinary <index-"
768-
"box_bin>`"
769-
770-
msgid ""
771-
"When a scalar field contains values of different underlying types, the key "
772-
"order is: nils, then booleans, then numbers, then strings, then varbinaries."
773-
msgstr ""
774-
"Когда поле типа scalar содержит значения различных базовых типов, то порядок"
775-
" ключей следующий: nil, затем boolean, затем number, затем string, затем "
776-
"varbinary."
777-
778661
msgid "Collations"
779662
msgstr "Сортировка"
780663

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

1489+
msgid "Index type"
1490+
msgstr "Тип индекса"
1491+
16061492
msgid ""
16071493
"Typically, a HASH index is faster than a TREE index if the number of tuples "
16081494
"in the space is greater than one."

‎locale/ru/LC_MESSAGES/reference/reference_lua/box_space/create_index.po‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -579,17 +579,18 @@ msgid ""
579579
"null (input with ``msgpack.NULL`` or ``yaml.NULL`` or ``json.NULL``), "
580580
"booleans (true or false), or integers between -9223372036854775808 and "
581581
"18446744073709551615, or single-precision floating point numbers, or double-"
582-
"precision floating-point numbers, or exact numbers, or strings, or "
583-
"(varbinary) byte arrays. When there is a mix of types, the key order is: "
584-
"null, then booleans, then numbers, then strings, then byte arrays"
585-
msgstr ""
586-
"null (вводится с помощью ``msgpack.NULL``, ``yaml.NULL`` или ``json.NULL``),"
587-
" логические значения (true или false), целые числа от -9 223 372 036 854 775"
588-
" 808 до 18 446 744 073 709 551 615, числа одинарной точности с плавающей "
589-
"запятой, числа двойной точности с плавающей запятой, точные числа, строки "
590-
"или байтовые массивы (varbinary). При использовании нескольких типов, "
591-
"порядок ключей должен быть следующим: null, логические значения, затем "
592-
"числа, затем строки, затем байтовые массивы"
582+
"precision floating point numbers, or exact numbers, or strings, or "
583+
"(varbinary) byte arrays, or uuids. When there is a mix of types, the key "
584+
"order is: null, then booleans, then numbers, then strings, then byte arrays,"
585+
" then uuids."
586+
msgstr ""
587+
"null (вводится через ``msgpack.NULL``, ``yaml.NULL`` или ``json.NULL``), "
588+
"логические значения (``true`` или ``false``), целые числа от −9 223 372 036 "
589+
"854 775 808 до 18 446 744 073 709 551 615, числа одинарной и двойной "
590+
"точности с плавающей запятой, точные числа, строки, байтовые массивы "
591+
"(varbinary) или идентификаторы UUID. Если используется несколько типов, "
592+
"порядок ключей следующий: null, логические значения, числа, строки, байтовые"
593+
" массивы, идентификаторы UUID."
593594

594595
msgid "null"
595596
msgstr "null"

‎locale/ru/LC_MESSAGES/reference/reference_sql/sql_statements_and_clauses.po‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2430,8 +2430,10 @@ msgstr ""
24302430

24312431
msgid ""
24322432
"NULLs come first, then BOOLEANs, then numbers, then STRINGs, then "
2433-
"VARBINARYs."
2433+
"VARBINARYs, then UUIDs."
24342434
msgstr ""
2435+
"Первыми идут значения типа NULL, затем BOOLEAN, числовые значения, STRING, "
2436+
"VARBINARY и, наконец, UUID."
24352437

24362438
msgid "Within STRINGs, ordering is according to collation."
24372439
msgstr ""

0 commit comments

Comments
 (0)