From: Roman Khabibov <roman.habibov@tarantool.org>
To: Mergen Imeev <imeevma@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH 1/2] sql: fix _session_settings name in error messages
Date: Thu, 8 Oct 2020 19:17:11 +0300 [thread overview]
Message-ID: <33A8F638-21FC-43DA-9983-E9086045849A@tarantool.org> (raw)
In-Reply-To: <20200714160705.GB250285@tarantool.org>
Hi! Thanks for the review. The second patch was dropped.
> On Jul 14, 2020, at 19:07, Mergen Imeev <imeevma@tarantool.org> wrote:
>
> See 1 comment below.
>
> On Wed, Jul 08, 2020 at 02:47:17PM +0300, Roman Khabibov wrote:
>> Print the true name of _session_settings space in error messages.
>>
>> Follow up #4511
> 1. Please write the actual issue number here.
>
>> ---
>> src/box/session_settings.c | 8 ++++----
>> test/box/session_settings.result | 8 ++++----
>> 2 files changed, 8 insertions(+), 8 deletions(-)
>>
>> 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 == BOX_SESSION_SETTINGS_ID);
>> if (def->iid != 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()
>> | ...
>>
>> --
>> --
>> 2.21.0 (Apple Git-122)
>>
commit 340007d7fbc1329f57dc1c3ac9f8ab60b75e6b30
Author: Roman Khabibov <roman.habibov@tarantool.org>
Date: Tue Jul 7 18:15:02 2020 +0300
sql: fix _session_settings name in error messages
Print the true name of _session_settings space in error messages.
Closes #4732
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 == BOX_SESSION_SETTINGS_ID);
if (def->iid != 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()
| ...
--
next prev parent reply other threads:[~2020-10-08 16:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 11:47 [Tarantool-patches] [PATCH 0/2] Follow-up for "_session_settings" space Roman Khabibov
2020-07-08 11:47 ` [Tarantool-patches] [PATCH 1/2] sql: fix _session_settings name in error messages Roman Khabibov
2020-07-14 16:07 ` Mergen Imeev
2020-10-08 16:17 ` Roman Khabibov [this message]
2020-11-03 20:31 ` Mergen Imeev
2020-11-10 16:12 ` Roman Khabibov
2020-07-08 11:47 ` [Tarantool-patches] [PATCH 2/2] sql: clarify "sql_defer_foreign_keys" setting name Roman Khabibov
2020-07-12 15:31 ` Vladislav Shpilevoy
2020-07-12 22:11 ` Nikita Pettik
2020-07-14 16:22 ` Mergen Imeev
2020-07-14 16:01 ` [Tarantool-patches] [PATCH 0/2] Follow-up for "_session_settings" space Mergen Imeev
2020-11-26 9:51 ` Kirill Yukhin
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=33A8F638-21FC-43DA-9983-E9086045849A@tarantool.org \
--to=roman.habibov@tarantool.org \
--cc=imeevma@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 1/2] sql: fix _session_settings name in error messages' \
/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