From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp55.i.mail.ru (smtp55.i.mail.ru [217.69.128.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 3E8D2469719 for ; Tue, 10 Nov 2020 19:12:46 +0300 (MSK) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) From: Roman Khabibov In-Reply-To: <20201103203157.GA92725@tarantool.org> Date: Tue, 10 Nov 2020 19:12:43 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: <37F3964C-0B23-4111-8EEB-B93A271210D2@tarantool.org> References: <20200708114718.38910-1-roman.habibov@tarantool.org> <20200708114718.38910-2-roman.habibov@tarantool.org> <20200714160705.GB250285@tarantool.org> <33A8F638-21FC-43DA-9983-E9086045849A@tarantool.org> <20201103203157.GA92725@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 1/2] sql: fix _session_settings name in error messages List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kirill Yukhin Cc: tarantool-patches@dev.tarantool.org Thanks. Kirill, can you push? @ChangeLog: * Rename Session_settings to _session_settings in error messages = (gh-4732). > On Nov 3, 2020, at 23:31, Mergen Imeev wrote: >=20 > Hi! Thank you for the patch. I see no test here, but since it is not a = bug, this > should be fine. LGTM >=20 > On Thu, Oct 08, 2020 at 07:17:11PM +0300, Roman Khabibov wrote: >> Hi! Thanks for the review. The second patch was dropped. >>=20 >>> On Jul 14, 2020, at 19:07, Mergen Imeev = wrote: >>>=20 >>> See 1 comment below. >>>=20 >>> On Wed, Jul 08, 2020 at 02:47:17PM +0300, Roman Khabibov wrote: >>>> Print the true name of _session_settings space in error messages. >>>>=20 >>>> Follow up #4511 >>> 1. Please write the actual issue number here. >>>=20 >>>> --- >>>> src/box/session_settings.c | 8 ++++---- >>>> test/box/session_settings.result | 8 ++++---- >>>> 2 files changed, 8 insertions(+), 8 deletions(-) >>>>=20 >>>> diff --git a/src/box/session_settings.c = b/src/box/session_settings.c >>>> index dbbbf2461..2f4b8c2f0 100644 >>>> --- a/src/box/session_settings.c >>>> +++ b/src/box/session_settings.c >>>> @@ -301,7 +301,7 @@ session_settings_space_execute_replace(struct = space *space, struct txn *txn, >>>> (void)txn; >>>> (void)request; >>>> (void)result; >>>> - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", >>>> + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", >>>> "replace()"); >>>> return -1; >>>> } >>>> @@ -315,7 +315,7 @@ session_settings_space_execute_delete(struct = space *space, struct txn *txn, >>>> (void)txn; >>>> (void)request; >>>> (void)result; >>>> - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", >>>> + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", >>>> "delete()"); >>>> return -1; >>>> } >>>> @@ -388,7 +388,7 @@ session_settings_space_execute_upsert(struct = space *space, struct txn *txn, >>>> (void)space; >>>> (void)txn; >>>> (void)request; >>>> - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", >>>> + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", >>>> "upsert()"); >>>> return -1; >>>> } >>>> @@ -398,7 +398,7 @@ session_settings_space_create_index(struct = space *space, struct index_def *def) >>>> { >>>> assert(space->def->id =3D=3D BOX_SESSION_SETTINGS_ID); >>>> if (def->iid !=3D 0) { >>>> - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings = space", >>>> + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings = space", >>>> "create_index()"); >>>> return NULL; >>>> } >>>> diff --git a/test/box/session_settings.result = b/test/box/session_settings.result >>>> index 149cc4bd5..d38707ef8 100644 >>>> --- a/test/box/session_settings.result >>>> +++ b/test/box/session_settings.result >>>> @@ -30,19 +30,19 @@ s:drop() >>>> -- >>>> s:create_index('a') >>>> | --- >>>> - | - error: Session_settings space does not support create_index() >>>> + | - error: _session_settings space does not support = create_index() >>>> | ... >>>> s:insert({'a', 1}) >>>> | --- >>>> - | - error: Session_settings space does not support replace() >>>> + | - error: _session_settings space does not support replace() >>>> | ... >>>> s:delete({'b'}) >>>> | --- >>>> - | - error: Session_settings space does not support delete() >>>> + | - error: _session_settings space does not support delete() >>>> | ... >>>> s:replace({'sql_defer_foreign_keys', true}) >>>> | --- >>>> - | - error: Session_settings space does not support replace() >>>> + | - error: _session_settings space does not support replace() >>>> | ... >>>>=20 >>>> -- >>>> --=20 >>>> 2.21.0 (Apple Git-122) >>>>=20 >>=20 >> commit 340007d7fbc1329f57dc1c3ac9f8ab60b75e6b30 >> Author: Roman Khabibov >> Date: Tue Jul 7 18:15:02 2020 +0300 >>=20 >> sql: fix _session_settings name in error messages >>=20 >> Print the true name of _session_settings space in error messages. >>=20 >> Closes #4732 >>=20 >> diff --git a/src/box/session_settings.c b/src/box/session_settings.c >> index dbbbf2461..2f4b8c2f0 100644 >> --- a/src/box/session_settings.c >> +++ b/src/box/session_settings.c >> @@ -301,7 +301,7 @@ session_settings_space_execute_replace(struct = space *space, struct txn *txn, >> (void)txn; >> (void)request; >> (void)result; >> - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", >> + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", >> "replace()"); >> return -1; >> } >> @@ -315,7 +315,7 @@ session_settings_space_execute_delete(struct = space *space, struct txn *txn, >> (void)txn; >> (void)request; >> (void)result; >> - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", >> + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", >> "delete()"); >> return -1; >> } >> @@ -388,7 +388,7 @@ session_settings_space_execute_upsert(struct = space *space, struct txn *txn, >> (void)space; >> (void)txn; >> (void)request; >> - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", >> + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", >> "upsert()"); >> return -1; >> } >> @@ -398,7 +398,7 @@ session_settings_space_create_index(struct space = *space, struct index_def *def) >> { >> assert(space->def->id =3D=3D BOX_SESSION_SETTINGS_ID); >> if (def->iid !=3D 0) { >> - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings = space", >> + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings = space", >> "create_index()"); >> return NULL; >> } >> diff --git a/test/box/session_settings.result = b/test/box/session_settings.result >> index 149cc4bd5..d38707ef8 100644 >> --- a/test/box/session_settings.result >> +++ b/test/box/session_settings.result >> @@ -30,19 +30,19 @@ s:drop() >> -- >> s:create_index('a') >> | --- >> - | - error: Session_settings space does not support create_index() >> + | - error: _session_settings space does not support create_index() >> | ... >> s:insert({'a', 1}) >> | --- >> - | - error: Session_settings space does not support replace() >> + | - error: _session_settings space does not support replace() >> | ... >> s:delete({'b'}) >> | --- >> - | - error: Session_settings space does not support delete() >> + | - error: _session_settings space does not support delete() >> | ... >> s:replace({'sql_defer_foreign_keys', true}) >> | --- >> - | - error: Session_settings space does not support replace() >> + | - error: _session_settings space does not support replace() >> | ... >>=20 >> -- >>=20