[tarantool-patches] [PATCH v1 25/28] sql: remove sql_log()
imeevma at tarantool.org
imeevma at tarantool.org
Mon Jun 10 16:57:06 MSK 2019
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 087e9dd..7252348 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 fbf5f72..3825a2b 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -591,9 +591,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
More information about the Tarantool-patches
mailing list