From: imeevma@tarantool.org To: korablev@tarantool.org Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v1 14/21] sql: remove SQL_CONSTRAINT errcode Date: Sat, 25 May 2019 13:44:53 +0300 [thread overview] Message-ID: <7d31f163ff64678bd619bf305d06e1598d02026e.1558780708.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1558780708.git.imeevma@gmail.com> Removing this error code is part of getting rid of the SQL error system. --- src/box/sql/fk_constraint.c | 4 ++-- src/box/sql/sqlInt.h | 8 -------- src/box/sql/vdbe.c | 1 - src/box/sql/vdbeaux.c | 10 +++------- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/box/sql/fk_constraint.c b/src/box/sql/fk_constraint.c index 602f439..542709a 100644 --- a/src/box/sql/fk_constraint.c +++ b/src/box/sql/fk_constraint.c @@ -45,7 +45,7 @@ * * Foreign keys in sql come in two flavours: deferred and immediate. * If an immediate foreign key constraint is violated, - * SQL_CONSTRAINT_FOREIGNKEY is returned and the current + * -1 is returned and the current * statement transaction rolled back. If a * deferred foreign key constraint is violated, no action is taken * immediately. However if the application attempts to commit the @@ -111,7 +111,7 @@ * is that the counter used is stored as part of each individual statement * object (struct Vdbe). If, after the statement has run, its immediate * constraint counter is greater than zero, - * it returns SQL_CONSTRAINT_FOREIGNKEY + * it returns -1. * and the statement transaction is rolled back. An exception is an INSERT * statement that inserts a single row only (no triggers). In this case, * instead of using a counter, an exception is thrown immediately if the diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 3cf2b8d..802a367 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -363,7 +363,6 @@ enum sql_ret_code { /** Some kind of disk I/O error occurred. */ SQL_IOERR, /** Abort due to constraint violation. */ - SQL_CONSTRAINT, SQL_TARANTOOL_ERROR, /** sql_step() has another row ready. */ SQL_ROW, @@ -593,13 +592,6 @@ sql_exec(sql *, /* An open database */ #define SQL_IOERR_GETTEMPPATH (SQL_IOERR | (25<<8)) #define SQL_IOERR_CONVPATH (SQL_IOERR | (26<<8)) #define SQL_IOERR_VNODE (SQL_IOERR | (27<<8)) -#define SQL_CONSTRAINT_CHECK (SQL_CONSTRAINT | (1<<8)) -#define SQL_CONSTRAINT_FOREIGNKEY (SQL_CONSTRAINT | (3<<8)) -#define SQL_CONSTRAINT_FUNCTION (SQL_CONSTRAINT | (4<<8)) -#define SQL_CONSTRAINT_NOTNULL (SQL_CONSTRAINT | (5<<8)) -#define SQL_CONSTRAINT_PRIMARYKEY (SQL_CONSTRAINT | (6<<8)) -#define SQL_CONSTRAINT_TRIGGER (SQL_CONSTRAINT | (7<<8)) -#define SQL_CONSTRAINT_UNIQUE (SQL_CONSTRAINT | (8<<8)) /** * Subtype of a main type. Allows to do some subtype specific diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index f4859b8..9a9ca55 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -982,7 +982,6 @@ case OP_Halt: { } rc = sqlVdbeHalt(p); assert(rc == 0 || rc==SQL_ERROR); - assert(rc==0 || (p->rc&0xff)==SQL_CONSTRAINT); rc = p->rc ? SQL_TARANTOOL_ERROR : SQL_DONE; goto vdbe_return; } diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 4f06369..308373b 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -2088,8 +2088,7 @@ sqlVdbeCloseStatement(Vdbe * p, int eOp) * violations, return SQL_ERROR. Otherwise, 0. * * If there are outstanding FK violations and this function returns - * SQL_ERROR, set the result of the VM to SQL_CONSTRAINT_FOREIGNKEY - * and write an error message to it. Then return SQL_ERROR. + * SQL_TARANTOOL_ERROR and set an error. */ int sqlVdbeCheckFk(Vdbe * p, int deferred) @@ -2253,7 +2252,6 @@ sqlVdbeHalt(Vdbe * p) closeCursorsAndFree(p); return SQL_ERROR; } - rc = SQL_CONSTRAINT_FOREIGNKEY; } else { /* The auto-commit flag is true, the vdbe program was successful * or hit an 'OR FAIL' constraint and there are no deferred foreign @@ -2296,17 +2294,15 @@ sqlVdbeHalt(Vdbe * p) /* If eStatementOp is non-zero, then a statement transaction needs to * be committed or rolled back. Call sqlVdbeCloseStatement() to * do so. If this operation returns an error, and the current statement - * error code is 0 or SQL_CONSTRAINT, then promote the + * error code is 0 or -1, then promote the * current statement error code. */ if (eStatementOp) { rc = sqlVdbeCloseStatement(p, eStatementOp); if (rc) { box_txn_rollback(); - if (p->rc == 0 - || (p->rc & 0xff) == SQL_CONSTRAINT) { + if (p->rc == 0) p->rc = rc; - } closeCursorsAndFree(p); sqlRollbackAll(p); sqlCloseSavepoints(p); -- 2.7.4
next prev parent reply other threads:[~2019-05-25 10:44 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 ` [tarantool-patches] " n.pettik 2019-05-25 20:26 ` 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 ` imeevma [this message] 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=7d31f163ff64678bd619bf305d06e1598d02026e.1558780708.git.imeevma@gmail.com \ --to=imeevma@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v1 14/21] sql: remove SQL_CONSTRAINT errcode' \ /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