Skip to content

Commit

Permalink
sql: remove sql_log()
Browse files Browse the repository at this point in the history
This function is not used in Tarantool and should be removed.
  • Loading branch information
ImeevMA committed Jun 10, 2019
1 parent 2324c85 commit f838cc2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 43 deletions.
7 changes: 3 additions & 4 deletions src/box/sql/os_unix.c
Expand Up @@ -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 */
Expand Down
34 changes: 0 additions & 34 deletions src/box/sql/printf.c
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions src/box/sql/resolve.c
Expand Up @@ -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++) {
Expand Down
3 changes: 0 additions & 3 deletions src/box/sql/sqlInt.h
Expand Up @@ -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);
Expand Down

0 comments on commit f838cc2

Please sign in to comment.