From: imeevma@tarantool.org To: v.shpilevoy@tarantool.org Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v1 23/28] sql: remove field errMask from struct sql Date: Mon, 10 Jun 2019 16:57:03 +0300 [thread overview] Message-ID: <d3761cd2884cbcbbe4f2471038775690217292c0.1560174553.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1560174553.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 df40032..2f69007 100644 --- a/src/box/sql/legacy.c +++ b/src/box/sql/legacy.c @@ -163,6 +163,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 64873f2..f5612bf 100644 --- a/src/box/sql/malloc.c +++ b/src/box/sql/malloc.c @@ -783,5 +783,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 0aa744f..f840d2f 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 d5a1a9a..fbf5f72 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -1355,7 +1355,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 268aff6..9380155 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -108,7 +108,6 @@ sql_reset(sql_stmt * pStmt) checkProfileCallback(db, v); int rc = sqlVdbeReset(v); sqlVdbeRewind(v); - assert((rc & (db->errMask)) == rc); return sqlApiExit(db, rc); } @@ -465,7 +464,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-06-10 13:57 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-10 13:56 [tarantool-patches] [PATCH v1 00/28] sql: Remove SQL error system imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 01/28] sql: remove field zErrMsg from struct Vdbe imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 02/28] sql: remove field pErr from struct sql imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 03/28] sql: remove field errCode " imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 04/28] sql: remove sqlError() and remove sqlErrorWithMsg() imeevma 2019-06-13 22:25 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:45 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 05/28] sql: remove unused functions of SQL error system imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 06/28] sql: disable lookaside system imeevma 2019-06-13 22:25 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:47 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 07/28] sql: remove SQL_OK error/status code imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:52 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 08/28] sql: remove SQL_PERM, SQL_WARNING, SQL_ABORT errcodes imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 09/28] sql: remove SQL_CANTOPEN errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 10/28] sql: remove SQL_NOTFOUND error/status code imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 11/28] sql: remove SQL_LOCKED errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 12/28] sql: remove SQL_FULL errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 13/28] sql: remove SQL_MISUSE errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 14/28] sql: remove SQL_RANGE errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 15/28] sql: remove SQL_SCHEMA errcode imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:55 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 16/28] sql: remove SQL_TOOBIG errcode imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:57 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 17/28] sql: remove SQL_BUSY errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 18/28] sql: remove SQL_CONSTRAINT errcode imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 10:00 ` Mergen Imeev 2019-06-18 20:40 ` Vladislav Shpilevoy 2019-06-19 8:02 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 19/28] sql: remove SQL_ERROR errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 20/28] sql: remove SQL_NOMEM errcode imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 10:01 ` Mergen Imeev 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 21/28] sql: remove SQL_IOERR errcode imeevma 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 22/28] sql: remove SQL_TARANTOOL_ERROR errcode imeevma 2019-06-10 13:57 ` imeevma [this message] 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 24/28] sql: replace rc by is_aborted in struct VDBE imeevma 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 25/28] sql: remove sql_log() imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 10:02 ` Mergen Imeev 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 26/28] sql: cleanup of legacy memory management system imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 10:04 ` Mergen Imeev 2019-06-18 20:40 ` Vladislav Shpilevoy 2019-06-19 8:04 ` Mergen Imeev 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 27/28] sql: make function return void instead of int imeevma 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 28/28] sql: remove function sqlApiExit() imeevma 2019-06-11 10:00 ` [tarantool-patches] Re: [PATCH v1 00/28] sql: Remove SQL error system Imeev Mergen 2019-06-13 22:24 ` Vladislav Shpilevoy 2019-06-15 10:08 ` Mergen Imeev 2019-06-19 19:11 ` Vladislav Shpilevoy 2019-06-20 16:08 ` 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=d3761cd2884cbcbbe4f2471038775690217292c0.1560174553.git.imeevma@gmail.com \ --to=imeevma@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [tarantool-patches] [PATCH v1 23/28] 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