Tarantool development patches archive
 help / color / mirror / Atom feed
From: "n.pettik" <korablev@tarantool.org>
To: tarantool-patches@freelists.org
Cc: "N. Tatunov" <hollow653@gmail.com>
Subject: [tarantool-patches] Re: [PATCH] sql: assertion fail on nested select
Date: Wed, 18 Jul 2018 23:36:38 +0300	[thread overview]
Message-ID: <A93655E5-CB38-41D9-AA7A-872CD8D9F77E@tarantool.org> (raw)
In-Reply-To: <1530533500-9666-1-git-send-email-hollow653@gmail.com>


> diff --git a/src/box/sql/select.c b/src/box/sql/select.c
> index 54f78a9..c035691 100644
> --- a/src/box/sql/select.c
> +++ b/src/box/sql/select.c
> @@ -3893,14 +3893,14 @@ flattenSubquery(Parse * pParse,		/* Parsing context */
> 	 * queries.
> 	 */
> 	if (pSub->pPrior) {
> -		if (pSub->pOrderBy) {
> -			return 0;	/* Restriction 20 */
> -		}
> 		if (isAgg || (p->selFlags & SF_Distinct) != 0
> 		    || pSrc->nSrc != 1) {
> 			return 0;
> 		}
> 		for (pSub1 = pSub; pSub1; pSub1 = pSub1->pPrior) {
> +			if (pSub1->pOrderBy) {
> +				return 0;	/* Restriction 20 */
> +			}

According to our code style:
- use explicit != NULL comparison;
- don’t put bracers around one-line if statement;
- put comment above the code to be commented;

>diff --git a/test/sql-tap/subquery.test.lua b/test/sql-tap/subquery.test.lua
>--- a/test/sql-tap/subquery.test.lua
>+++ b/test/sql-tap/subquery.test.lua
>+test:do_execsql_test(
>+       "subquery-9.2",
>+       [[
>+               SELECT 'abc' FROM (SELECT * FROM table1 UNION ALL
>+                                   SELECT * FROM table1 UNION ALL
>+                                  SELECT * FROM table1 ORDER BY 1);
>+       ]], {
>+               -- <subquery-9.2>
>+               'abc','abc','abc','abc','abc','abc'
>+               -- <subquery-9.2>
>+       })

Why did you use here SELECT ‘abc’ and in other tests - SELECT *?
It is nitpicking, but just tests look a little weird..

  parent reply	other threads:[~2018-07-18 20:36 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-02 12:11 [tarantool-patches] " N.Tatunov
2018-07-17 13:59 ` [tarantool-patches] " Alexander Turenko
2018-07-18 12:34   ` Nikita Tatunov
2018-07-18 13:41     ` Nikita Tatunov
     [not found]       ` <07E4F387-E976-432B-A80B-E01B40BCF126@corp.mail.ru>
2018-07-18 15:37         ` Nikita Tatunov
2018-07-18 16:51           ` Alexander Turenko
2018-07-18 20:36 ` n.pettik [this message]
2018-07-19 12:47   ` Nikita Tatunov
2018-07-19 13:09     ` n.pettik
2018-07-19 15:22       ` Vladislav Shpilevoy
2018-07-20 13:21 ` Kirill Yukhin

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=A93655E5-CB38-41D9-AA7A-872CD8D9F77E@tarantool.org \
    --to=korablev@tarantool.org \
    --cc=hollow653@gmail.com \
    --cc=tarantool-patches@freelists.org \
    --subject='[tarantool-patches] Re: [PATCH] sql: assertion fail on nested select' \
    /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