From: imeevma@tarantool.org To: korablev@tarantool.org Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v1 21/21] sql: remove sql_log() Date: Sat, 25 May 2019 13:45:08 +0300 [thread overview] Message-ID: <bad54a73e268cc797d110482004017ec927a40ca.1558780708.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1558780708.git.imeevma@gmail.com> This function is not used in Tarantool and should be removed. --- src/box/sql/os_unix.c | 7 +++---- src/box/sql/printf.c | 34 ---------------------------------- src/box/sql/resolve.c | 3 +-- src/box/sql/sqlInt.h | 3 --- 4 files changed, 4 insertions(+), 43 deletions(-) diff --git a/src/box/sql/os_unix.c b/src/box/sql/os_unix.c index f0cf4ac..b161580 100644 --- a/src/box/sql/os_unix.c +++ b/src/box/sql/os_unix.c @@ -1073,10 +1073,9 @@ unixUnmapfile(unixFile * pFd) * unixFile.mmapSize * unixFile.mmapSizeActual * - * If unsuccessful, an error message is logged via sql_log() and - * the three variables above are zeroed. In this case sql should - * continue accessing the database using the xRead() and xWrite() - * methods. + * If unsuccessful,the three variables above are zeroed. In this + * case sql should continue accessing the database using the + * xRead() and xWrite() methods. */ static void unixRemapfile(unixFile * pFd, /* File descriptor object */ diff --git a/src/box/sql/printf.c b/src/box/sql/printf.c index c364055..ed41ae9 100644 --- a/src/box/sql/printf.c +++ b/src/box/sql/printf.c @@ -1125,40 +1125,6 @@ sql_snprintf(int n, char *zBuf, const char *zFormat, ...) return z; } -/* - * This is the routine that actually formats the sql_log() message. - * We house it in a separate routine from sql_log() to avoid using - * stack space on small-stack systems when logging is disabled. - * - * sqlVXPrintf() might ask for *temporary* memory allocations for - * certain format characters (%q) or for very large precisions or widths. - */ -static void -renderLogMsg(int iErrCode, const char *zFormat, va_list ap) -{ - StrAccum acc; /* String accumulator */ - char zMsg[SQL_PRINT_BUF_SIZE * 3]; /* Complete log message */ - - sqlStrAccumInit(&acc, 0, zMsg, sizeof(zMsg), 0); - sqlVXPrintf(&acc, zFormat, ap); - sqlGlobalConfig.xLog(sqlGlobalConfig.pLogArg, iErrCode, - sqlStrAccumFinish(&acc)); -} - -/* - * Format and write a message to the log if logging is enabled. - */ -void -sql_log(int iErrCode, const char *zFormat, ...) -{ - va_list ap; /* Vararg list */ - if (sqlGlobalConfig.xLog) { - va_start(ap, zFormat); - renderLogMsg(iErrCode, zFormat, ap); - va_end(ap); - } -} - #if defined(SQL_DEBUG) /* * A version of printf() that understands %lld. Used for debugging. diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c index e136312..32e8791 100644 --- a/src/box/sql/resolve.c +++ b/src/box/sql/resolve.c @@ -363,8 +363,7 @@ lookupName(Parse * pParse, /* The parsing context */ * The ability to use an output result-set column in the WHERE, GROUP BY, * or HAVING clauses, or as part of a larger expression in the ORDER BY * clause is not standard SQL. This is a (goofy) sql extension, that - * is supported for backwards compatibility only. Hence, we issue a warning - * on sql_log() whenever the capability is used. + * is supported for backwards compatibility only. */ if ((pEList = pNC->pEList) != 0 && zTab == 0 && cnt == 0) { for (j = 0; j < pEList->nExpr; j++) { diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 0db13ed..443d3cc 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -580,9 +580,6 @@ sql_row_count(struct sql_context *context, MAYBE_UNUSED int unused1, void * sql_user_data(sql_context *); -void -sql_log(int iErrCode, const char *zFormat, ...); - void * sql_aggregate_context(sql_context *, int nBytes); -- 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 ` [tarantool-patches] [PATCH v1 19/21] sql: remove field errMask from struct sql imeevma 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 ` imeevma [this message] 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=bad54a73e268cc797d110482004017ec927a40ca.1558780708.git.imeevma@gmail.com \ --to=imeevma@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v1 21/21] sql: remove sql_log()' \ /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