From: imeevma@tarantool.org To: v.shpilevoy@tarantool.org Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v1 01/28] sql: remove field zErrMsg from struct Vdbe Date: Mon, 10 Jun 2019 16:56:26 +0300 [thread overview] Message-ID: <bbb4fd47da5a7da8f5355a2de529b811058beb8b.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/vdbeInt.h | 1 - src/box/sql/vdbeaux.c | 29 ++++------------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/src/box/sql/vdbeInt.h b/src/box/sql/vdbeInt.h index 15eb55c..8b212e3 100644 --- a/src/box/sql/vdbeInt.h +++ b/src/box/sql/vdbeInt.h @@ -384,7 +384,6 @@ struct Vdbe { Mem **apArg; /* Arguments to currently executing user function */ Mem *aColName; /* Column names to return */ Mem *pResultSet; /* Pointer to an array of results */ - char *zErrMsg; /* Error message written here */ VdbeCursor **apCsr; /* One element of this array for each open cursor */ Mem *aVar; /* Values for the OP_Variable opcode. */ /** diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 3f573d0..ae1f38f 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -1957,7 +1957,6 @@ closeCursorsAndFree(Vdbe * p) static void Cleanup(Vdbe * p) { - sql *db = p->db; #ifdef SQL_DEBUG /* Execute assert() statements to ensure that the Vdbe.apCsr[] and @@ -1973,8 +1972,6 @@ Cleanup(Vdbe * p) } #endif - sqlDbFree(db, p->zErrMsg); - p->zErrMsg = 0; p->pResultSet = 0; } @@ -2317,8 +2314,6 @@ sqlVdbeHalt(Vdbe * p) if (p->rc == SQL_OK || (p->rc & 0xff) == SQL_CONSTRAINT) { p->rc = rc; - sqlDbFree(db, p->zErrMsg); - p->zErrMsg = 0; } closeCursorsAndFree(p); sqlRollbackAll(p); @@ -2381,24 +2376,13 @@ sqlVdbeTransferError(Vdbe * p) { sql *db = p->db; int rc = p->rc; - if (p->zErrMsg) { - db->bBenignMalloc++; - sqlBeginBenignMalloc(); - if (db->pErr == 0) - db->pErr = sqlValueNew(db); - sqlValueSetStr(db->pErr, -1, p->zErrMsg, SQL_TRANSIENT); - sqlEndBenignMalloc(); - db->bBenignMalloc--; - db->errCode = rc; - } else { - sqlError(db, rc); - } + sqlError(db, rc); return rc; } /* * Clean up a VDBE after execution but do not delete the VDBE just yet. - * Write any error messages into *pzErrMsg. Return the result code. + * Return the result code. * * After this routine is run, the VDBE should be ready to be executed * again. @@ -2426,8 +2410,6 @@ sqlVdbeReset(Vdbe * p) */ if (p->pc >= 0) { sqlVdbeTransferError(p); - sqlDbFree(db, p->zErrMsg); - p->zErrMsg = 0; if (p->runOnlyOnce) p->expired = 1; } else if (p->rc && p->expired) { @@ -2435,10 +2417,7 @@ sqlVdbeReset(Vdbe * p) * to sql_step(). For consistency (since sql_step() was * called), set the database error in this case as well. */ - sqlErrorWithMsg(db, p->rc, p->zErrMsg ? "%s" : 0, - p->zErrMsg); - sqlDbFree(db, p->zErrMsg); - p->zErrMsg = 0; + sqlErrorWithMsg(db, p->rc, NULL); } /* Reclaim all memory used by the VDBE @@ -2492,7 +2471,7 @@ sqlVdbeReset(Vdbe * p) /* * Clean up and delete a VDBE after execution. Return an integer which is - * the result code. Write any error message text into *pzErrMsg. + * the result code. */ int sqlVdbeFinalize(Vdbe * p) -- 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 ` imeevma [this message] 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 ` [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=bbb4fd47da5a7da8f5355a2de529b811058beb8b.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 01/28] sql: remove field zErrMsg from struct Vdbe' \ /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