From: imeevma@tarantool.org To: v.shpilevoy@tarantool.org Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v1 28/28] sql: remove function sqlApiExit() Date: Mon, 10 Jun 2019 16:57:12 +0300 [thread overview] Message-ID: <bb4352a9fb8fedc6f00f0f59cfe4afdd5201fe74.1560174553.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1560174553.git.imeevma@gmail.com> This function is useless in Tarantool and should be removed. --- src/box/sql/main.c | 8 ++------ src/box/sql/malloc.c | 19 ------------------- src/box/sql/sqlInt.h | 1 - src/box/sql/vdbeapi.c | 34 +++++++++++----------------------- 4 files changed, 13 insertions(+), 49 deletions(-) diff --git a/src/box/sql/main.c b/src/box/sql/main.c index 145964f..d280d8d 100644 --- a/src/box/sql/main.c +++ b/src/box/sql/main.c @@ -320,7 +320,6 @@ sql_create_function_v2(sql * db, void (*xFinal) (sql_context *), void (*xDestroy) (void *)) { - int rc = -1; FuncDestructor *pArg = 0; if (xDestroy) { @@ -330,21 +329,18 @@ sql_create_function_v2(sql * db, (FuncDestructor)); if (!pArg) { xDestroy(p); - goto out; + return -1; } pArg->xDestroy = xDestroy; pArg->pUserData = p; } - rc = sqlCreateFunc(db, zFunc, type, nArg, flags, p, xSFunc, xStep, + int rc = sqlCreateFunc(db, zFunc, type, nArg, flags, p, xSFunc, xStep, xFinal, pArg); if (pArg && pArg->nRef == 0) { assert(rc != 0); xDestroy(p); sqlDbFree(db, pArg); } - - out: - rc = sqlApiExit(db, rc); return rc; } diff --git a/src/box/sql/malloc.c b/src/box/sql/malloc.c index c3fc50b..a31f915 100644 --- a/src/box/sql/malloc.c +++ b/src/box/sql/malloc.c @@ -526,22 +526,3 @@ sqlOomClear(sql * db) db->lookaside.bDisable--; } } - -/* - * This function must be called before exiting any API function (i.e. - * returning control to the user) that has called sql_malloc or - * sql_realloc. - * - * The returned value is normally a copy of the second argument to this - * function. - */ -int -sqlApiExit(sql * db, int rc) -{ - assert(db != 0); - if (db->mallocFailed) { - sqlOomClear(db); - return -1; - } - return rc; -} diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 27e57cc..a309290 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -4595,7 +4595,6 @@ int sqlCreateFunc(sql *, const char *, enum field_type, FuncDestructor * pDestructor); void sqlOomFault(sql *); void sqlOomClear(sql *); -int sqlApiExit(sql * db, int); void sqlStrAccumInit(StrAccum *, sql *, char *, int, int); void sqlStrAccumAppend(StrAccum *, const char *, int); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 03f5069..03f9e84 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -82,21 +82,13 @@ invokeProfileCallback(sql * db, Vdbe * p) int sql_finalize(sql_stmt * pStmt) { - int rc; - if (pStmt == 0) { - /* IMPLEMENTATION-OF: R-57228-12904 Invoking sql_finalize() on a NULL - * pointer is a harmless no-op. - */ - rc = 0; - } else { - Vdbe *v = (Vdbe *) pStmt; - sql *db = v->db; - assert(db != NULL); - checkProfileCallback(db, v); - rc = sqlVdbeFinalize(v); - rc = sqlApiExit(db, rc); - } - return rc; + if (pStmt == NULL) + return 0; + Vdbe *v = (Vdbe *) pStmt; + sql *db = v->db; + assert(db != NULL); + checkProfileCallback(db, v); + return sqlVdbeFinalize(v); } int @@ -108,7 +100,7 @@ sql_reset(sql_stmt * pStmt) checkProfileCallback(db, v); int rc = sqlVdbeReset(v); sqlVdbeRewind(v); - return sqlApiExit(db, rc); + return rc; } /* @@ -1128,18 +1120,14 @@ sql_bind_zeroblob(sql_stmt * pStmt, int i, int n) int sql_bind_zeroblob64(sql_stmt * pStmt, int i, sql_uint64 n) { - int rc; Vdbe *p = (Vdbe *) pStmt; if (n > (u64) p->db->aLimit[SQL_LIMIT_LENGTH]) { diag_set(ClientError, ER_SQL_EXECUTE, "string or blob is too "\ "big"); - rc = -1; - } else { - assert((n & 0x7FFFFFFF) == n); - rc = sql_bind_zeroblob(pStmt, i, n); + return -1; } - rc = sqlApiExit(p->db, rc); - return rc; + assert((n & 0x7FFFFFFF) == n); + return sql_bind_zeroblob(pStmt, i, n); } /* -- 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 ` [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 ` imeevma [this message] 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=bb4352a9fb8fedc6f00f0f59cfe4afdd5201fe74.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 28/28] sql: remove function sqlApiExit()' \ /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