From: Mergen Imeev <imeevma@tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] Re: [PATCH v1 25/28] sql: remove sql_log() Date: Sat, 15 Jun 2019 13:02:57 +0300 [thread overview] Message-ID: <20190615100257.GH32365@tarantool.org> (raw) In-Reply-To: <e09175b6-58bd-c10a-e7dc-9ff175873321@tarantool.org> On Fri, Jun 14, 2019 at 12:24:53AM +0200, Vladislav Shpilevoy wrote: > Thanks for the patch! > > Consider my review fixes below and on the branch > in a separate commit. > Thank you! New patch: From 59aeab3a41c3107bccbcb31f9f9b1bc7f8f9ed81 Mon Sep 17 00:00:00 2001 Date: Sat, 25 May 2019 11:56:19 +0300 Subject: [PATCH] sql: remove sql_log() This function is not used in Tarantool and should be removed. diff --git a/src/box/sql/global.c b/src/box/sql/global.c index 13e9c67..2d937d7 100644 --- a/src/box/sql/global.c +++ b/src/box/sql/global.c @@ -196,8 +196,6 @@ SQL_WSD struct sqlConfig sqlConfig = { 0, /* isInit */ 0, /* inProgress */ 0, /* isMallocInit */ - 0, /* xLog */ - 0, /* pLogArg */ #ifdef SQL_VDBE_COVERAGE 0, /* xVdbeBranch */ 0, /* pVbeBranchArg */ diff --git a/src/box/sql/os_unix.c b/src/box/sql/os_unix.c index ad8f289..683a71d 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 8abb673..98372f0 100644 --- a/src/box/sql/printf.c +++ b/src/box/sql/printf.c @@ -1114,40 +1114,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 be8cc25..fdf3703 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 c7a1a81..434a5bd 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -554,9 +554,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); @@ -2592,8 +2589,6 @@ struct sqlConfig { int isInit; /* True after initialization has finished */ int inProgress; /* True while initialization in progress */ int isMallocInit; /* True after malloc is initialized */ - void (*xLog) (void *, int, const char *); /* Function for logging */ - void *pLogArg; /* First argument to xLog() */ #ifdef SQL_VDBE_COVERAGE /* The following callback (if not NULL) is invoked on every VDBE branch * operation. Set the callback using sql_TESTCTRL_VDBE_COVERAGE.
next prev parent reply other threads:[~2019-06-15 10:03 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 [this message] 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=20190615100257.GH32365@tarantool.org \ --to=imeevma@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=v.shpilevoy@tarantool.org \ --subject='[tarantool-patches] Re: [PATCH v1 25/28] 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