From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: v.shpilevoy@tarantool.org, tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH 1/1] box: make UUID part of SCALAR
Date: Wed, 19 May 2021 13:48:43 +0300 [thread overview]
Message-ID: <20210519104843.GA214487@tarantool.org> (raw)
In-Reply-To: <7db92f114edfe61c8c3ca6d00e082ac0e6063be9.1621157404.git.imeevma@gmail.com>
Hi! I found a bug in my patch. in some cases, comparisons between UUIDs in
SCALAR field may result in a segmentation fault. For example, if we insert
"11111111-1111-1111-1111-111111111111" in a space, and then try to insert
"11111111-1111-1111-1111-111111111112", we get a segmentation fault. However, if
we try to insert "11111111-1111-2222-1111-111111111111" as the second value, we
will not get an error. I fixed this and changed the test accordingly. Diff and
new patch below.
https://github.com/tarantool/tarantool/issues/6042
https://github.com/tarantool/tarantool/tree/imeevma/gh-6042-make-uuid-part-of-scalar
Diff:
diff --git a/src/box/tuple_compare.cc b/src/box/tuple_compare.cc
index 3ae1dcc8f..98938fb39 100644
--- a/src/box/tuple_compare.cc
+++ b/src/box/tuple_compare.cc
@@ -397,7 +397,7 @@ static mp_compare_f mp_class_comparators[] = {
/* .MP_CLASS_NUMBER = */ mp_compare_number,
/* .MP_CLASS_STR = */ mp_compare_str,
/* .MP_CLASS_BIN = */ mp_compare_bin,
- /* .MP_CLASS_UUID = */ NULL,
+ /* .MP_CLASS_UUID = */ mp_compare_uuid,
/* .MP_CLASS_ARRAY = */ NULL,
/* .MP_CLASS_MAP = */ NULL,
};
diff --git a/test/app/uuid.result b/test/app/uuid.result
index c085f9b6d..47d855d53 100644
--- a/test/app/uuid.result
+++ b/test/app/uuid.result
@@ -452,6 +452,14 @@ s = box.schema.space.create('s', {format={{'s', 'scalar'}}})
_ = s:create_index('i')
---
...
+s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111111')})
+---
+- [11111111-1111-1111-1111-111111111111]
+...
+s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111112')})
+---
+- [11111111-1111-1111-1111-111111111112]
+...
s:insert({1})
---
- [1]
@@ -468,14 +476,6 @@ box.execute([[INSERT INTO "s" VALUES (x'303030')]])
---
- row_count: 1
...
-s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111111')})
----
-- [11111111-1111-1111-1111-111111111111]
-...
-s:insert({uuid.fromstr('11111111-1111-2222-1111-111111111111')})
----
-- [11111111-1111-2222-1111-111111111111]
-...
--
-- Make sure that comparison in right. Comparison in SCALAR field:
-- bool < number < string < varbinary < uuid.
@@ -487,11 +487,11 @@ s:select()
- ['1']
- ['000']
- [11111111-1111-1111-1111-111111111111]
- - [11111111-1111-2222-1111-111111111111]
+ - [11111111-1111-1111-1111-111111111112]
...
s:select({}, {iterator='LE'})
---
-- - [11111111-1111-2222-1111-111111111111]
+- - [11111111-1111-1111-1111-111111111112]
- [11111111-1111-1111-1111-111111111111]
- ['000']
- ['1']
diff --git a/test/app/uuid.test.lua b/test/app/uuid.test.lua
index d2c34fadd..5c9f4dd02 100644
--- a/test/app/uuid.test.lua
+++ b/test/app/uuid.test.lua
@@ -169,12 +169,12 @@ u2_str = nil
--
s = box.schema.space.create('s', {format={{'s', 'scalar'}}})
_ = s:create_index('i')
+s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111111')})
+s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111112')})
s:insert({1})
s:insert({'1'})
s:insert({true})
box.execute([[INSERT INTO "s" VALUES (x'303030')]])
-s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111111')})
-s:insert({uuid.fromstr('11111111-1111-2222-1111-111111111111')})
--
-- Make sure that comparison in right. Comparison in SCALAR field:
New patch:
commit 7fdd8c271fc0438ba372a46e0b3954d4a3f70544
Author: Mergen Imeev <imeevma@gmail.com>
Date: Thu Apr 22 18:00:32 2021 +0300
box: make UUID part of SCALAR
Prior to this patch, UUID was not part of SCALAR. However, this should
be changed to comply with the RFC "Consistent Lua/SQL types".
Closes #6042
@TarantoolBot document
Title: UUID is now part of SCALAR
The UUID field type is now part of the SCALAR field type. This means
that now values of type UUID can be inserted into the SCALAR field, and
these values can participate in the sorting of the SCALAR fields. The
order is as follows: boolean < number < string < varbinary < uuid.
diff --git a/changelogs/unreleased/make-uuid-part-of-scalar.md b/changelogs/unreleased/make-uuid-part-of-scalar.md
new file mode 100644
index 000000000..eeead4ffb
--- /dev/null
+++ b/changelogs/unreleased/make-uuid-part-of-scalar.md
@@ -0,0 +1,3 @@
+## feature/core
+
+ * Field type UUID is now part of field type SCALAR (gh-6042).
diff --git a/src/box/field_def.c b/src/box/field_def.c
index 213e91699..51acb8025 100644
--- a/src/box/field_def.c
+++ b/src/box/field_def.c
@@ -83,7 +83,7 @@ const uint32_t field_ext_type[] = {
/* [FIELD_TYPE_INTEGER] = */ 0,
/* [FIELD_TYPE_BOOLEAN] = */ 0,
/* [FIELD_TYPE_VARBINARY] = */ 0,
- /* [FIELD_TYPE_SCALAR] = */ 1U << MP_DECIMAL,
+ /* [FIELD_TYPE_SCALAR] = */ (1U << MP_DECIMAL) | (1U << MP_UUID),
/* [FIELD_TYPE_DECIMAL] = */ 1U << MP_DECIMAL,
/* [FIELD_TYPE_UUID] = */ 1U << MP_UUID,
/* [FIELD_TYPE_ARRAY] = */ 0,
diff --git a/src/box/tuple_compare.cc b/src/box/tuple_compare.cc
index 0946d77f8..98938fb39 100644
--- a/src/box/tuple_compare.cc
+++ b/src/box/tuple_compare.cc
@@ -397,7 +397,7 @@ static mp_compare_f mp_class_comparators[] = {
/* .MP_CLASS_NUMBER = */ mp_compare_number,
/* .MP_CLASS_STR = */ mp_compare_str,
/* .MP_CLASS_BIN = */ mp_compare_bin,
- /* .MP_CLASS_UUID = */ NULL,
+ /* .MP_CLASS_UUID = */ mp_compare_uuid,
/* .MP_CLASS_ARRAY = */ NULL,
/* .MP_CLASS_MAP = */ NULL,
};
@@ -1790,6 +1790,8 @@ field_hint_scalar(const char *field, struct coll *coll)
decimal_t dec;
return hint_decimal(decimal_unpack(&field, len, &dec));
}
+ case MP_UUID:
+ return hint_uuid_raw(field);
default:
unreachable();
}
diff --git a/test/app/uuid.result b/test/app/uuid.result
index b4870302e..47d855d53 100644
--- a/test/app/uuid.result
+++ b/test/app/uuid.result
@@ -443,6 +443,64 @@ u1_str = nil
u2_str = nil
---
...
+--
+-- gh-6042: add UUID to SCALAR.
+--
+s = box.schema.space.create('s', {format={{'s', 'scalar'}}})
+---
+...
+_ = s:create_index('i')
+---
+...
+s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111111')})
+---
+- [11111111-1111-1111-1111-111111111111]
+...
+s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111112')})
+---
+- [11111111-1111-1111-1111-111111111112]
+...
+s:insert({1})
+---
+- [1]
+...
+s:insert({'1'})
+---
+- ['1']
+...
+s:insert({true})
+---
+- [true]
+...
+box.execute([[INSERT INTO "s" VALUES (x'303030')]])
+---
+- row_count: 1
+...
+--
+-- Make sure that comparison in right. Comparison in SCALAR field:
+-- bool < number < string < varbinary < uuid.
+--
+s:select()
+---
+- - [true]
+ - [1]
+ - ['1']
+ - ['000']
+ - [11111111-1111-1111-1111-111111111111]
+ - [11111111-1111-1111-1111-111111111112]
+...
+s:select({}, {iterator='LE'})
+---
+- - [11111111-1111-1111-1111-111111111112]
+ - [11111111-1111-1111-1111-111111111111]
+ - ['000']
+ - ['1']
+ - [1]
+ - [true]
+...
+s:drop()
+---
+...
uuid = nil
---
...
diff --git a/test/app/uuid.test.lua b/test/app/uuid.test.lua
index 867bbd832..5c9f4dd02 100644
--- a/test/app/uuid.test.lua
+++ b/test/app/uuid.test.lua
@@ -164,6 +164,26 @@ u1 = nil
u1_str = nil
u2_str = nil
+--
+-- gh-6042: add UUID to SCALAR.
+--
+s = box.schema.space.create('s', {format={{'s', 'scalar'}}})
+_ = s:create_index('i')
+s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111111')})
+s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111112')})
+s:insert({1})
+s:insert({'1'})
+s:insert({true})
+box.execute([[INSERT INTO "s" VALUES (x'303030')]])
+
+--
+-- Make sure that comparison in right. Comparison in SCALAR field:
+-- bool < number < string < varbinary < uuid.
+--
+s:select()
+s:select({}, {iterator='LE'})
+s:drop()
+
uuid = nil
test_run:cmd("clear filter")
diff --git a/test/engine/ddl.result b/test/engine/ddl.result
index 08ad1a57b..0fed1cbe4 100644
--- a/test/engine/ddl.result
+++ b/test/engine/ddl.result
@@ -1428,11 +1428,9 @@ fail_format_change(12, 'number')
- 'Tuple field 12 (field12) type does not match one required by operation: expected
number, got extension'
...
--- uuid --X--> scalar
-fail_format_change(12, 'scalar')
+-- uuid ----> scalar
+ok_format_change(12, 'scalar')
---
-- 'Tuple field 12 (field12) type does not match one required by operation: expected
- scalar, got extension'
...
-- uuid --X--> string
fail_format_change(12, 'string')
diff --git a/test/engine/ddl.test.lua b/test/engine/ddl.test.lua
index 5ba80e075..08162f253 100644
--- a/test/engine/ddl.test.lua
+++ b/test/engine/ddl.test.lua
@@ -522,8 +522,8 @@ fail_format_change(11, 'uuid')
ok_format_change(12, 'any')
-- uuid --X--> number
fail_format_change(12, 'number')
--- uuid --X--> scalar
-fail_format_change(12, 'scalar')
+-- uuid ----> scalar
+ok_format_change(12, 'scalar')
-- uuid --X--> string
fail_format_change(12, 'string')
-- uuid --X--> integer
On Sun, May 16, 2021 at 12:31:46PM +0300, Mergen Imeev via Tarantool-patches wrote:
> Prior to this patch, UUID was not part of SCALAR. However, this should
> be changed to comply with the RFC "Consistent Lua/SQL types".
>
> Closes #6042
>
> @TarantoolBot document
> Title: UUID is now part of SCALAR
>
> The UUID field type is now part of the SCALAR field type. This means
> that now values of type UUID can be inserted into the SCALAR field, and
> these values can participate in the sorting of the SCALAR fields. The
> order is as follows: boolean < number < string < varbinary < uuid.
> ---
>
> https://github.com/tarantool/tarantool/issues/6042
> https://github.com/tarantool/tarantool/tree/imeevma/gh-6042-make-uuid-part-of-scalar
>
> .../unreleased/make-uuid-part-of-scalar.md | 3 +
> src/box/field_def.c | 2 +-
> src/box/tuple_compare.cc | 2 +
> test/app/uuid.result | 58 +++++++++++++++++++
> test/app/uuid.test.lua | 20 +++++++
> test/engine/ddl.result | 6 +-
> test/engine/ddl.test.lua | 4 +-
> 7 files changed, 88 insertions(+), 7 deletions(-)
> create mode 100644 changelogs/unreleased/make-uuid-part-of-scalar.md
>
> diff --git a/changelogs/unreleased/make-uuid-part-of-scalar.md b/changelogs/unreleased/make-uuid-part-of-scalar.md
> new file mode 100644
> index 000000000..eeead4ffb
> --- /dev/null
> +++ b/changelogs/unreleased/make-uuid-part-of-scalar.md
> @@ -0,0 +1,3 @@
> +## feature/core
> +
> + * Field type UUID is now part of field type SCALAR (gh-6042).
> diff --git a/src/box/field_def.c b/src/box/field_def.c
> index 213e91699..51acb8025 100644
> --- a/src/box/field_def.c
> +++ b/src/box/field_def.c
> @@ -83,7 +83,7 @@ const uint32_t field_ext_type[] = {
> /* [FIELD_TYPE_INTEGER] = */ 0,
> /* [FIELD_TYPE_BOOLEAN] = */ 0,
> /* [FIELD_TYPE_VARBINARY] = */ 0,
> - /* [FIELD_TYPE_SCALAR] = */ 1U << MP_DECIMAL,
> + /* [FIELD_TYPE_SCALAR] = */ (1U << MP_DECIMAL) | (1U << MP_UUID),
> /* [FIELD_TYPE_DECIMAL] = */ 1U << MP_DECIMAL,
> /* [FIELD_TYPE_UUID] = */ 1U << MP_UUID,
> /* [FIELD_TYPE_ARRAY] = */ 0,
> diff --git a/src/box/tuple_compare.cc b/src/box/tuple_compare.cc
> index 0946d77f8..3ae1dcc8f 100644
> --- a/src/box/tuple_compare.cc
> +++ b/src/box/tuple_compare.cc
> @@ -1790,6 +1790,8 @@ field_hint_scalar(const char *field, struct coll *coll)
> decimal_t dec;
> return hint_decimal(decimal_unpack(&field, len, &dec));
> }
> + case MP_UUID:
> + return hint_uuid_raw(field);
> default:
> unreachable();
> }
> diff --git a/test/app/uuid.result b/test/app/uuid.result
> index b4870302e..c085f9b6d 100644
> --- a/test/app/uuid.result
> +++ b/test/app/uuid.result
> @@ -443,6 +443,64 @@ u1_str = nil
> u2_str = nil
> ---
> ...
> +--
> +-- gh-6042: add UUID to SCALAR.
> +--
> +s = box.schema.space.create('s', {format={{'s', 'scalar'}}})
> +---
> +...
> +_ = s:create_index('i')
> +---
> +...
> +s:insert({1})
> +---
> +- [1]
> +...
> +s:insert({'1'})
> +---
> +- ['1']
> +...
> +s:insert({true})
> +---
> +- [true]
> +...
> +box.execute([[INSERT INTO "s" VALUES (x'303030')]])
> +---
> +- row_count: 1
> +...
> +s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111111')})
> +---
> +- [11111111-1111-1111-1111-111111111111]
> +...
> +s:insert({uuid.fromstr('11111111-1111-2222-1111-111111111111')})
> +---
> +- [11111111-1111-2222-1111-111111111111]
> +...
> +--
> +-- Make sure that comparison in right. Comparison in SCALAR field:
> +-- bool < number < string < varbinary < uuid.
> +--
> +s:select()
> +---
> +- - [true]
> + - [1]
> + - ['1']
> + - ['000']
> + - [11111111-1111-1111-1111-111111111111]
> + - [11111111-1111-2222-1111-111111111111]
> +...
> +s:select({}, {iterator='LE'})
> +---
> +- - [11111111-1111-2222-1111-111111111111]
> + - [11111111-1111-1111-1111-111111111111]
> + - ['000']
> + - ['1']
> + - [1]
> + - [true]
> +...
> +s:drop()
> +---
> +...
> uuid = nil
> ---
> ...
> diff --git a/test/app/uuid.test.lua b/test/app/uuid.test.lua
> index 867bbd832..d2c34fadd 100644
> --- a/test/app/uuid.test.lua
> +++ b/test/app/uuid.test.lua
> @@ -164,6 +164,26 @@ u1 = nil
> u1_str = nil
> u2_str = nil
>
> +--
> +-- gh-6042: add UUID to SCALAR.
> +--
> +s = box.schema.space.create('s', {format={{'s', 'scalar'}}})
> +_ = s:create_index('i')
> +s:insert({1})
> +s:insert({'1'})
> +s:insert({true})
> +box.execute([[INSERT INTO "s" VALUES (x'303030')]])
> +s:insert({uuid.fromstr('11111111-1111-1111-1111-111111111111')})
> +s:insert({uuid.fromstr('11111111-1111-2222-1111-111111111111')})
> +
> +--
> +-- Make sure that comparison in right. Comparison in SCALAR field:
> +-- bool < number < string < varbinary < uuid.
> +--
> +s:select()
> +s:select({}, {iterator='LE'})
> +s:drop()
> +
> uuid = nil
>
> test_run:cmd("clear filter")
> diff --git a/test/engine/ddl.result b/test/engine/ddl.result
> index 08ad1a57b..0fed1cbe4 100644
> --- a/test/engine/ddl.result
> +++ b/test/engine/ddl.result
> @@ -1428,11 +1428,9 @@ fail_format_change(12, 'number')
> - 'Tuple field 12 (field12) type does not match one required by operation: expected
> number, got extension'
> ...
> --- uuid --X--> scalar
> -fail_format_change(12, 'scalar')
> +-- uuid ----> scalar
> +ok_format_change(12, 'scalar')
> ---
> -- 'Tuple field 12 (field12) type does not match one required by operation: expected
> - scalar, got extension'
> ...
> -- uuid --X--> string
> fail_format_change(12, 'string')
> diff --git a/test/engine/ddl.test.lua b/test/engine/ddl.test.lua
> index 5ba80e075..08162f253 100644
> --- a/test/engine/ddl.test.lua
> +++ b/test/engine/ddl.test.lua
> @@ -522,8 +522,8 @@ fail_format_change(11, 'uuid')
> ok_format_change(12, 'any')
> -- uuid --X--> number
> fail_format_change(12, 'number')
> --- uuid --X--> scalar
> -fail_format_change(12, 'scalar')
> +-- uuid ----> scalar
> +ok_format_change(12, 'scalar')
> -- uuid --X--> string
> fail_format_change(12, 'string')
> -- uuid --X--> integer
> --
> 2.25.1
>
next prev parent reply other threads:[~2021-05-19 10:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-16 9:31 Mergen Imeev via Tarantool-patches
2021-05-19 10:48 ` Mergen Imeev via Tarantool-patches [this message]
2021-05-21 19:09 ` Vladislav Shpilevoy via Tarantool-patches
2021-05-24 9:49 ` Kirill Yukhin via Tarantool-patches
-- strict thread matches above, loose matches on Subject: below --
2021-04-23 11:40 Mergen Imeev via Tarantool-patches
2021-04-25 9:07 ` Serge Petrenko via Tarantool-patches
2021-04-26 15:31 ` Mergen Imeev via Tarantool-patches
2021-04-28 14:43 ` Serge Petrenko via Tarantool-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210519104843.GA214487@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=imeevma@tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 1/1] box: make UUID part of SCALAR' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox