From: imeevma@tarantool.org To: korablev@tarantool.org Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v1 19/21] sql: remove field errMask from struct sql Date: Sat, 25 May 2019 13:45:03 +0300 [thread overview] Message-ID: <e6736a98289818842c318a4fc2122d1029e8fccf.1558780708.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1558780708.git.imeevma@gmail.com> This field has become unused and should be removed. --- src/box/sql/legacy.c | 1 - src/box/sql/main.c | 1 - src/box/sql/malloc.c | 2 +- src/box/sql/prepare.c | 2 -- src/box/sql/sqlInt.h | 1 - src/box/sql/vdbeapi.c | 3 +-- src/box/sql/vdbeaux.c | 9 ++------- 7 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/box/sql/legacy.c b/src/box/sql/legacy.c index e9c9961..0769d3a 100644 --- a/src/box/sql/legacy.c +++ b/src/box/sql/legacy.c @@ -167,6 +167,5 @@ sql_exec(sql * db, /* The database on which the SQL executes */ sqlDbFree(db, azCols); assert(rc == 0); - assert((rc & db->errMask) == rc); return rc; } diff --git a/src/box/sql/main.c b/src/box/sql/main.c index 76d464f..145964f 100644 --- a/src/box/sql/main.c +++ b/src/box/sql/main.c @@ -535,7 +535,6 @@ sql_init_db(sql **out_db) *out_db = NULL; return -1; } - db->errMask = 0xff; db->magic = SQL_MAGIC_BUSY; db->pVfs = sql_vfs_find(0); diff --git a/src/box/sql/malloc.c b/src/box/sql/malloc.c index 3c25458..a4911c2 100644 --- a/src/box/sql/malloc.c +++ b/src/box/sql/malloc.c @@ -809,5 +809,5 @@ sqlApiExit(sql * db, int rc) if (db->mallocFailed) { return apiOomError(db); } - return rc & db->errMask; + return rc; } diff --git a/src/box/sql/prepare.c b/src/box/sql/prepare.c index 61f6493..e1da179 100644 --- a/src/box/sql/prepare.c +++ b/src/box/sql/prepare.c @@ -176,8 +176,6 @@ sqlPrepare(sql * db, /* Database handle. */ end_prepare: sql_parser_destroy(&sParse); - rc = sqlApiExit(db, rc); - assert((rc & db->errMask) == rc); return rc; } diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 50a577b..0db13ed 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -1332,7 +1332,6 @@ struct sql { struct Vdbe *pVdbe; /* List of active virtual machines */ struct coll *pDfltColl; /* The default collating sequence (BINARY) */ i64 szMmap; /* Default mmap_size setting */ - int errMask; /* & result codes with this before returning */ u16 dbOptFlags; /* Flags to enable/disable optimizations */ u8 enc; /* Text encoding */ u8 temp_store; /* 1: file 2: memory 0: default */ diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index f1897e2..1842e26 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -116,7 +116,6 @@ sql_reset(sql_stmt * pStmt) checkProfileCallback(db, v); rc = sqlVdbeReset(v); sqlVdbeRewind(v); - assert((rc & (db->errMask)) == rc); rc = sqlApiExit(db, rc); } return rc; @@ -475,7 +474,7 @@ sqlStep(Vdbe * p) */ rc = p->rc; } - return (rc & db->errMask); + return rc; } /* diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index d4ba3a3..28b423d 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -2315,9 +2315,6 @@ sqlVdbeResetStepResult(Vdbe * p) int sqlVdbeReset(Vdbe * p) { - sql *db; - db = p->db; - /* If the VM did not run to completion or if it encountered an * error, then it might not have been halted properly. So halt * it now. @@ -2389,7 +2386,7 @@ sqlVdbeReset(Vdbe * p) #endif p->iCurrentTime = 0; p->magic = VDBE_MAGIC_RESET; - return p->rc & db->errMask; + return p->rc; } /* @@ -2400,10 +2397,8 @@ int sqlVdbeFinalize(Vdbe * p) { int rc = 0; - if (p->magic == VDBE_MAGIC_RUN || p->magic == VDBE_MAGIC_HALT) { + if (p->magic == VDBE_MAGIC_RUN || p->magic == VDBE_MAGIC_HALT) rc = sqlVdbeReset(p); - assert((rc & p->db->errMask) == rc); - } sqlVdbeDelete(p); return rc; } -- 2.7.4
next prev parent reply other threads:[~2019-05-25 10:45 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 ` [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 ` imeevma [this message] 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=e6736a98289818842c318a4fc2122d1029e8fccf.1558780708.git.imeevma@gmail.com \ --to=imeevma@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v1 19/21] sql: remove field errMask from struct sql' \ /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