From: Leonid Vasiliev <lvasiliev@tarantool.org> To: v.shpilevoy@tarantool.org, imeevma@tarantool.org, korablev@tarantool.org, sergos@tarantool.org, m.semkin@corp.mail.ru Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v2 2/3] sql: set an error to diag in sql_execute() on failure Date: Fri, 11 Dec 2020 17:49:11 +0300 [thread overview] Message-ID: <2bcd06c2ee8f5fcfdb8e2d0d640ab822362832f7.1607696813.git.lvasiliev@tarantool.org> (raw) In-Reply-To: <cover.1607696813.git.lvasiliev@tarantool.org> In-Reply-To: <cover.1607696813.git.lvasiliev@tarantool.org> In SQL, on failure sometimes an error sets to the diag, sometimes not. And this can dived to situation as in #5537(SEGFAULT). So, let's set an error to the diag if the result of `sql_execute()` is a failure and there is no error in the diag. Part of #5537 --- After some discussion with Sergos, I added a common diag_set when sql_execute() fails. I wanted to add such a common error by `diag_add()` if diag is not empty, but such a change would entail additional correction in tests. But this patch should be included in the next release, and I want it to be as small as possible. This patchset is about fixes a crash, not about refactoring and improvements. For this I will create separate tasks. src/box/execute.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/box/execute.c b/src/box/execute.c index e14da20..87ebb44 100644 --- a/src/box/execute.c +++ b/src/box/execute.c @@ -687,8 +687,18 @@ sql_execute(struct sql_stmt *stmt, struct port *port, struct region *region) rc = sql_step(stmt); assert(rc != SQL_ROW && rc != 0); } - if (rc != SQL_DONE) + if (rc != SQL_DONE) { + /* + * In SQL, on failure sometimes an error sets to the diag, + * sometimes not. So, let's set an error to the diag if + * the status is a failure and there is no error in the diag. + */ + if (diag_is_empty(diag_get())) { + diag_set(ClientError, ER_SQL_EXECUTE, + "something went wrong"); + } return -1; + } return 0; } -- 2.7.4
next prev parent reply other threads:[~2020-12-11 14:50 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-11 14:49 [Tarantool-patches] [PATCH v2 0/3] Fix working with temporary files in VDBE Leonid Vasiliev 2020-12-11 14:49 ` [Tarantool-patches] [PATCH v2 1/3] sql: add missing diag_set on failure when working with files inside SQL module Leonid Vasiliev 2020-12-13 18:30 ` Vladislav Shpilevoy 2020-12-14 15:49 ` Leonid Vasiliev 2020-12-15 20:29 ` Sergey Ostanevich 2020-12-15 22:12 ` Vladislav Shpilevoy 2020-12-16 23:17 ` Leonid Vasiliev 2020-12-11 14:49 ` Leonid Vasiliev [this message] 2020-12-11 15:03 ` [Tarantool-patches] [PATCH v2 2/3] sql: set an error to diag in sql_execute() on failure Nikita Pettik 2020-12-11 15:40 ` Leonid Vasiliev 2020-12-13 18:30 ` Vladislav Shpilevoy 2020-12-14 15:52 ` Leonid Vasiliev 2020-12-15 21:05 ` Sergey Ostanevich 2020-12-11 14:49 ` [Tarantool-patches] [PATCH v2 3/3] sql: update temporary file name format Leonid Vasiliev 2020-12-13 18:30 ` Vladislav Shpilevoy 2020-12-14 15:54 ` Leonid Vasiliev 2020-12-15 21:07 ` Sergey Ostanevich 2020-12-16 14:47 ` Nikita Pettik
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=2bcd06c2ee8f5fcfdb8e2d0d640ab822362832f7.1607696813.git.lvasiliev@tarantool.org \ --to=lvasiliev@tarantool.org \ --cc=imeevma@tarantool.org \ --cc=korablev@tarantool.org \ --cc=m.semkin@corp.mail.ru \ --cc=sergos@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 2/3] sql: set an error to diag in sql_execute() on failure' \ /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