[Tarantool-patches] [PATCH v1 1/1] temporary: locate missing diag in VDBE

[Tarantool-patches] [PATCH v1 1/1] temporary: locate missing diag in VDBE

[imeevma]

---
 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

Re: [Tarantool-patches] [PATCH v1 1/1] temporary: locate missing diag in VDBE

[Kirill Yukhin]

Hello,

What does temporary mean? Do you intend to see the patch in 2.x?

On 27 Nov 14:08, Mergen Imeev via Tarantool-patches wrote:
> ---
>  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;

I see declaration and set of new field. But I don't see use...

--
Regards, Kirill Yukhin

Re: [Tarantool-patches] [PATCH v1 1/1] temporary: locate missing diag in VDBE

[Mergen Imeev]

Hi! This patch was used to find what is wrong in issue #5537. The new field
were used to save information about the last executed opcode in coredump.
I do not plan to include these changes in master or any other release branch.

On Tue, Dec 01, 2020 at 01:40:58PM +0000, Kirill Yukhin wrote:
> Hello,
> 
> What does temporary mean? Do you intend to see the patch in 2.x?
> 
> On 27 Nov 14:08, Mergen Imeev via Tarantool-patches wrote:
> > ---
> >  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;
> 
> I see declaration and set of new field. But I don't see use...
> 
> --
> Regards, Kirill Yukhin

[Tarantool-patches] [PATCH v1 1/1] temporary: locate missing diag in VDBE

[imeevma]

---
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