From: "n.pettik" <korablev@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Imeev Mergen <imeevma@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH v1 06/21] sql: remove SQL_NOTFOUND error/status code
Date: Sat, 25 May 2019 17:58:19 +0300 [thread overview]
Message-ID: <4E2824A4-6F08-4539-9954-EF9783217D54@tarantool.org> (raw)
In-Reply-To: <ee77d7143a874c0716947e25ece2a9e8286889eb.1558780708.git.imeevma@gmail.com>
> On 25 May 2019, at 13:44, imeevma@tarantool.org wrote:
>
> Removing this error/status code is part of getting rid of the SQL
> error system.
> ---
> src/box/sql/os_unix.c | 2 +-
> src/box/sql/sqlInt.h | 2 --
> src/box/sql/where.c | 13 ++-----------
> 3 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/src/box/sql/where.c b/src/box/sql/where.c
> index 0b1ccd9..060dfee 100644
> --- a/src/box/sql/where.c
> +++ b/src/box/sql/where.c
> @@ -1528,21 +1528,14 @@ whereEqualScanEst(Parse * pParse, /* Parsing & code generating context */
> assert(nEq >= 1);
> assert(nEq <= (int) p->key_def->part_count);
> assert(pBuilder->nRecValid < nEq);
> -
> - /* If values are not available for all fields of the index to the left
> - * of this one, no estimate can be made. Return SQL_NOTFOUND.
> - */
> - if (pBuilder->nRecValid < (nEq - 1)) {
> - return SQL_NOTFOUND;
> - }
> + assert(pBuilder->nRecValid >= (nEq - 1));
Taking into consideration assert above, it could
be replaced with assert(pBuilder->nRecValid == nEq - 1);
Btw, this function doesn’t seem to be called at all:
unreachable() assert doesn’t fire. I can assume that it is
connected with stat tables.
next prev parent reply other threads:[~2019-05-25 14:58 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-25 10:44 [tarantool-patches] [PATCH v1 00/21] sql: remove SQL error system imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 01/21] sql: remove unused functions of " imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 02/21] sql: disable lookaside system imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 03/21] sql: remove SQL_OK error/status code imeevma
2019-05-25 14:45 ` [tarantool-patches] " n.pettik
2019-05-26 9:39 ` Mergen Imeev
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 04/21] sql: remove SQL_PERM, SQL_WARNING, SQL_ABORT errcodes imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 05/21] sql: remove SQL_CANTOPEN errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 06/21] sql: remove SQL_NOTFOUND error/status code imeevma
2019-05-25 14:58 ` n.pettik [this message]
2019-05-25 20:26 ` [tarantool-patches] " Konstantin Osipov
2019-05-26 16:07 ` n.pettik
2019-05-26 9:45 ` Mergen Imeev
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 07/21] sql: remove SQL_LOCKED errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 08/21] sql: remove SQL_FULL errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 09/21] sql: remove SQL_MISUSE errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 10/21] sql: remove SQL_RANGE errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 11/21] sql: remove SQL_SCHEMA errcode imeevma
2019-05-25 16:18 ` [tarantool-patches] " n.pettik
2019-05-26 9:46 ` Mergen Imeev
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 12/21] sql: remove SQL_TOOBIG errcode imeevma
2019-05-25 16:11 ` [tarantool-patches] " n.pettik
2019-05-26 12:12 ` Mergen Imeev
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 13/21] sql: remove SQL_BUSY errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 14/21] sql: remove SQL_CONSTRAINT errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 15/21] sql: remove SQL_ERROR errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 16/21] sql: remove SQL_NOMEM errcode imeevma
2019-05-25 10:44 ` [tarantool-patches] [PATCH v1 17/21] sql: remove SQL_IOERR errcode imeevma
2019-05-25 10:45 ` [tarantool-patches] [PATCH v1 18/21] sql: remove SQL_TARANTOOL_ERROR errcode imeevma
2019-05-25 10:45 ` [tarantool-patches] [PATCH v1 19/21] sql: remove field errMask from struct sql imeevma
2019-05-25 10:45 ` [tarantool-patches] [PATCH v1 20/21] sql: replace rc by is_aborted in struct Parse imeevma
2019-05-25 15:46 ` [tarantool-patches] " n.pettik
2019-05-26 9:49 ` Mergen Imeev
2019-05-25 10:45 ` [tarantool-patches] [PATCH v1 21/21] sql: remove sql_log() imeevma
2019-05-25 16:36 ` [tarantool-patches] Re: [PATCH v1 00/21] sql: remove SQL error system n.pettik
2019-05-28 11:12 ` 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=4E2824A4-6F08-4539-9954-EF9783217D54@tarantool.org \
--to=korablev@tarantool.org \
--cc=imeevma@tarantool.org \
--cc=tarantool-patches@freelists.org \
--subject='[tarantool-patches] Re: [PATCH v1 06/21] sql: remove SQL_NOTFOUND error/status code' \
/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