From: imeevma@tarantool.org To: korablev@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1 1/1] temporary: locate missing diag in VDBE Date: Fri, 27 Nov 2020 13:44:34 +0300 [thread overview] Message-ID: <a15c48fd8f66648bcbc124a92e0ddfa879a97954.1606473784.git.imeevma@gmail.com> (raw) --- https://github.com/tarantool/tarantool/issues/5537 https://github.com/tarantool/tarantool/tree/imeevma/gh-5537-find-missing-diag src/box/sql/vdbe.c | 3 +++ src/box/sql/vdbeInt.h | 1 + 2 files changed, 4 insertions(+) diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 724bc188b..ae3dd2028 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -862,6 +862,7 @@ int sqlVdbeExec(Vdbe *p) } #endif for(pOp=&aOp[p->pc]; 1; pOp++) { + p->pOp = pOp; /* Errors are detected by individual opcodes, with an immediate * jumps to abort_due_to_error. */ @@ -5361,6 +5362,8 @@ default: { /* This is really OP_Noop and OP_Explain */ abort_due_to_error: rc = -1; p->is_aborted = true; + if (diag_is_empty(&fiber()->diag)) + abort(); /* This is the only way out of this procedure. */ vdbe_return: diff --git a/src/box/sql/vdbeInt.h b/src/box/sql/vdbeInt.h index 2c50b6768..24915bcf5 100644 --- a/src/box/sql/vdbeInt.h +++ b/src/box/sql/vdbeInt.h @@ -411,6 +411,7 @@ struct Vdbe { */ Op *aOp; /* Space to hold the virtual machine's program */ + Op *pOp; Mem *aMem; /* The memory locations */ Mem **apArg; /* Arguments to currently executing user function */ /** SQL metadata for DML/DQL queries. */ -- 2.25.1
next reply other threads:[~2020-11-27 10:44 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-27 10:44 imeevma [this message] 2020-11-27 11:08 imeevma 2020-12-01 13:40 ` Kirill Yukhin 2020-12-01 14:01 ` Mergen Imeev
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=a15c48fd8f66648bcbc124a92e0ddfa879a97954.1606473784.git.imeevma@gmail.com \ --to=imeevma@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 1/1] temporary: locate missing diag in VDBE' \ /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