[tarantool-patches] Re: [PATCH 6/9] sql: make comparison predicate return boolean

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Tue Apr 16 17:12:55 MSK 2019


Thanks for the patch! See 3 comments below.

On 14/04/2019 18:04, Nikita Pettik wrote:
> According to ANSI SQL result of comparison predicates must be BOOLEAN.
> Before introduction of BOOLEAN type they returned 0 and 1. Now we can
> change those values to false and true respectively.
> 
> Part of #3723
> ---
>  src/box/sql/expr.c                    |  1 +
>  src/box/sql/vdbe.c                    |  4 ++--
>  test/sql-tap/aggnested.test.lua       | 10 +++++-----
>  test/sql-tap/identifier_case.test.lua | 10 +++++-----
>  test/sql-tap/tkt3346.test.lua         |  2 +-
>  test/sql/types.result                 | 20 ++++++++++----------
>  6 files changed, 24 insertions(+), 23 deletions(-)
> 
> diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
> index 10794b18e..43d4262e5 100644
> --- a/src/box/sql/vdbe.c
> +++ b/src/box/sql/vdbe.c
> @@ -2273,8 +2273,8 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
>  			if ((pOp->opcode==OP_Eq)==res2) break;
>  		}
>  		memAboutToChange(p, pOut);
> -		MemSetTypeFlag(pOut, MEM_Int);
> -		pOut->u.i = res2;
> +		MemSetTypeFlag(pOut, MEM_Bool);
> +		pOut->u.b = res2;

1. Please, update the comments about SQL_STOREP2 and SQL_KEEPNULL.
They still say the result is stored as int 1/0.

>  		REGISTER_TRACE(pOp->p2, pOut);
>  	} else {
>  		VdbeBranchTaken(res!=0, (pOp->p5 & SQL_NULLEQ)?2:3);
> diff --git a/test/sql-tap/aggnested.test.lua b/test/sql-tap/aggnested.test.lua
> index 656576b70..67a9ba891 100755
> --- a/test/sql-tap/aggnested.test.lua
> +++ b/test/sql-tap/aggnested.test.lua
> @@ -215,7 +215,7 @@ test:do_execsql_test("aggnested-3.2-2",
>      ]],
>      {
>          -- <aggnested-3.2>
> -        0
> +        ""

2. Why? There 'sum' was selected. It can not return text.

>          -- </aggnested-3.2>
>      })
>  
> @@ -227,13 +227,13 @@ test:do_execsql_test("aggnested-3.3",
>          INSERT INTO t1 VALUES(4469,2),(4469,1);
>          CREATE TABLE t2 (value2 INT PRIMARY KEY);
>          INSERT INTO t2 VALUES(1);
> -        SELECT (SELECT sum(value2=value1) FROM t2), max(value1)
> +        SELECT (SELECT sum(value1) FROM t2 where value1=value2), max(value1)
>            FROM t1
>           GROUP BY id1;
>      ]],
>      {
>          -- <aggnested-3.3>
> -        0, 2
> +        "", 2

3. The same.

>          -- </aggnested-3.3>
>      })
>  




More information about the Tarantool-patches mailing list