From: imeevma@tarantool.org To: v.shpilevoy@tarantool.org Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v1 03/28] sql: remove field errCode from struct sql Date: Mon, 10 Jun 2019 16:56:29 +0300 [thread overview] Message-ID: <126010ccfcfe374765b188c410206f90b26f9cec.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/main.c | 18 ------------------ src/box/sql/prepare.c | 2 -- src/box/sql/sqlInt.h | 1 - src/box/sql/util.c | 2 -- src/box/sql/vdbeapi.c | 1 - 5 files changed, 24 deletions(-) diff --git a/src/box/sql/main.c b/src/box/sql/main.c index a3c6aa1..155cbcc 100644 --- a/src/box/sql/main.c +++ b/src/box/sql/main.c @@ -568,22 +568,6 @@ sqlTempInMemory(const sql * db) } /* - * Return the most recent error code generated by an sql routine. If NULL is - * passed to this function, we assume a malloc() failed during sql_open(). - */ -int -sql_errcode(sql * db) -{ - if (db && !sqlSafetyCheckSickOrOk(db)) { - return SQL_MISUSE; - } - if (!db || db->mallocFailed) { - return SQL_NOMEM; - } - return db->errCode & db->errMask; -} - -/* * This array defines hard upper bounds on limit values. The * initializer must be kept in sync with the SQL_LIMIT_* * #defines in sql.h. @@ -734,7 +718,6 @@ sql_init_db(sql **out_db) */ sqlError(db, SQL_OK); sqlRegisterPerConnectionBuiltinFunctions(db); - rc = sql_errcode(db); if (rc) sqlError(db, rc); @@ -744,7 +727,6 @@ sql_init_db(sql **out_db) sqlGlobalConfig.nLookaside); opendb_out: - rc = sql_errcode(db); assert(db != 0 || rc == SQL_NOMEM); if (rc == SQL_NOMEM) { sql_close(db); diff --git a/src/box/sql/prepare.c b/src/box/sql/prepare.c index ad4c71c..e2f8c0b 100644 --- a/src/box/sql/prepare.c +++ b/src/box/sql/prepare.c @@ -166,8 +166,6 @@ sqlPrepare(sql * db, /* Database handle. */ *ppStmt = (sql_stmt *) sParse.pVdbe; } - db->errCode = rc; - /* Delete any TriggerPrg structures allocated while parsing this statement. */ while (sParse.pTriggerPrg) { TriggerPrg *pT = sParse.pTriggerPrg; diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index fe5e64c..bda3df1 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -1436,7 +1436,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 errCode; /* Most recent error code (sql_*) */ int errMask; /* & result codes with this before returning */ int iSysErrno; /* Errno value from last system error */ u16 dbOptFlags; /* Flags to enable/disable optimizations */ diff --git a/src/box/sql/util.c b/src/box/sql/util.c index 62c29ce..819f7fa 100644 --- a/src/box/sql/util.c +++ b/src/box/sql/util.c @@ -150,7 +150,6 @@ void sqlError(sql * db, int err_code) { assert(db != 0); - db->errCode = err_code; if (err_code) sqlErrorFinish(db, err_code); } @@ -195,7 +194,6 @@ void sqlErrorWithMsg(sql * db, int err_code, const char *zFormat, ...) { assert(db != 0); - db->errCode = err_code; sqlSystemError(db, err_code); if (zFormat == 0) sqlError(db, err_code); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 81ee36b..db1726a 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -515,7 +515,6 @@ sqlStep(Vdbe * p) checkProfileCallback(db, p); #endif - db->errCode = rc; if (SQL_NOMEM == sqlApiExit(p->db, p->rc)) { p->rc = SQL_NOMEM; } -- 2.7.4
next prev parent reply other threads:[~2019-06-10 13:56 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 ` imeevma [this message] 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 ` [tarantool-patches] [PATCH v1 23/28] sql: remove field errMask from struct sql imeevma 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=126010ccfcfe374765b188c410206f90b26f9cec.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 03/28] sql: remove field errCode 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