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 14:08:35 +0300 [thread overview] Message-ID: <02c5e808b917dae58d18f471f526fb1aa36ebcf5.1606475303.git.imeevma@gmail.com> (raw) --- src/box/sql/vdbe.c | 7 +++++++ src/box/sql/vdbeInt.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 724bc188b..0c24a7bce 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. */ @@ -5364,6 +5365,12 @@ abort_due_to_error: /* This is the only way out of this procedure. */ vdbe_return: + if (p->is_aborted) { + if (diag_is_empty(&fiber()->diag)) { + assert(0); + abort(); + } + } testcase( nVmStep>0); p->aCounter[SQL_STMTSTATUS_VM_STEP] += (int)nVmStep; assert(rc == 0 || rc == -1 || rc == SQL_ROW || rc == SQL_DONE); 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 11:08 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-27 11:08 imeevma [this message] 2020-12-01 13:40 ` Kirill Yukhin 2020-12-01 14:01 ` Mergen Imeev -- strict thread matches above, loose matches on Subject: below -- 2020-11-27 10:44 imeevma
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=02c5e808b917dae58d18f471f526fb1aa36ebcf5.1606475303.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