From: imeevma@tarantool.org To: korablev@tarantool.org Cc: tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v1 11/21] sql: remove SQL_SCHEMA errcode Date: Sat, 25 May 2019 13:44:48 +0300 [thread overview] Message-ID: <cee56913a1cc9426ca6d18ebd96b4f0f20991898.1558780708.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1558780708.git.imeevma@gmail.com> Removing this error code is part of getting rid of the SQL error system. --- src/box/sql/prepare.c | 45 ++------------------------------------------- src/box/sql/sqlInt.h | 3 --- src/box/sql/vdbe.c | 5 +---- src/box/sql/vdbeInt.h | 8 -------- src/box/sql/vdbeapi.c | 23 +++-------------------- 5 files changed, 6 insertions(+), 78 deletions(-) diff --git a/src/box/sql/prepare.c b/src/box/sql/prepare.c index 2083d27..61081fb 100644 --- a/src/box/sql/prepare.c +++ b/src/box/sql/prepare.c @@ -190,56 +190,15 @@ sqlLockAndPrepare(sql * db, /* Database handle. */ sql_stmt ** ppStmt, /* OUT: A pointer to the prepared statement */ const char **pzTail) /* OUT: End of parsed string */ { - int rc; - *ppStmt = 0; assert(zSql != NULL && db != NULL); - rc = sqlPrepare(db, zSql, nBytes, saveSqlFlag, pOld, ppStmt, - pzTail); - if (rc == SQL_SCHEMA) { - sql_finalize(*ppStmt); - rc = sqlPrepare(db, zSql, nBytes, saveSqlFlag, pOld, ppStmt, - pzTail); - } - assert(rc == 0 || *ppStmt == 0); - return rc; -} - -/* - * Rerun the compilation of a statement after a schema change. - */ -int -sqlReprepare(Vdbe * p) -{ - int rc; - sql_stmt *pNew; - const char *zSql; - sql *db; - - zSql = sql_sql((sql_stmt *) p); - assert(zSql != 0); /* Reprepare only called for prepare_v2() statements */ - db = sqlVdbeDb(p); - rc = sqlLockAndPrepare(db, zSql, -1, 0, p, &pNew, 0); - if (rc) { - if (rc == SQL_NOMEM) { - sqlOomFault(db); - } - assert(pNew == 0); - return rc; - } else { - assert(pNew != 0); - } - sqlVdbeSwap((Vdbe *) pNew, p); - sqlTransferBindings(pNew, (sql_stmt *) p); - sqlVdbeResetStepResult((Vdbe *) pNew); - sqlVdbeFinalize((Vdbe *) pNew); - return 0; + return sqlPrepare(db, zSql, nBytes, saveSqlFlag, pOld, ppStmt, pzTail); } /* * Two versions of the official API. Legacy and new use. In the legacy * version, the original SQL text is not saved in the prepared statement - * and so if a schema change occurs, SQL_SCHEMA is returned by + * and so if a schema change occurs, error is returned by * sql_step(). In the new version, the original SQL text is retained * and the statement is automatically recompiled if an schema change * occurs. diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 8da946a..0419933 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -364,8 +364,6 @@ enum sql_ret_code { SQL_NOMEM, /** Some kind of disk I/O error occurred. */ SQL_IOERR, - /** The database schema changed. */ - SQL_SCHEMA, /** String or BLOB exceeds size limit. */ SQL_TOOBIG, /** Abort due to constraint violation. */ @@ -4687,7 +4685,6 @@ void sqlInvalidFunction(sql_context *, int, sql_value **); sql_int64 sqlStmtCurrentTime(sql_context *); int sqlVdbeParameterIndex(Vdbe *, const char *, int); int sqlTransferBindings(sql_stmt *, sql_stmt *); -int sqlReprepare(Vdbe *); /** * This function verifies that two collations (to be more precise diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index a1be48d..27ad06f 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -5142,10 +5142,7 @@ case OP_AggFinal: { /* Opcode: Expire P1 * * * * * - * Cause precompiled statements to expire. When an expired statement - * is executed using sql_step() it will either automatically - * reprepare itself (if it was originally created using sql_prepare_v2()) - * or it will fail with SQL_SCHEMA. + * Cause precompiled statements to expire. * * If P1 is 0, then all SQL statements become expired. If P1 is non-zero, * then only the currently executing statement is expired. diff --git a/src/box/sql/vdbeInt.h b/src/box/sql/vdbeInt.h index a163940..59a5cc8 100644 --- a/src/box/sql/vdbeInt.h +++ b/src/box/sql/vdbeInt.h @@ -40,14 +40,6 @@ #define SQL_VDBEINT_H /* - * The maximum number of times that a statement will try to reparse - * itself before giving up and returning SQL_SCHEMA. - */ -#ifndef SQL_MAX_SCHEMA_RETRY -#define SQL_MAX_SCHEMA_RETRY 50 -#endif - -/* * SQL is translated into a sequence of instructions to be * executed by a virtual machine. Each instruction is an instance * of the following structure. diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index c697efb..78b6db9 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -438,9 +438,8 @@ sqlStep(Vdbe * p) } if (p->pc <= 0 && p->expired) { - p->rc = SQL_SCHEMA; - rc = SQL_ERROR; - goto end_of_step; + p->rc = SQL_TARANTOOL_ERROR; + return SQL_TARANTOOL_ERROR; } if (p->pc < 0) { @@ -473,7 +472,6 @@ sqlStep(Vdbe * p) if (SQL_NOMEM == sqlApiExit(p->db, p->rc)) { p->rc = SQL_NOMEM; } - end_of_step: if (p->isPrepareV2 && rc != SQL_ROW && rc != SQL_DONE) { /* If this statement was prepared using sql_prepare_v2(), and an * error has occurred, then return the error code in p->rc to the @@ -492,24 +490,9 @@ sqlStep(Vdbe * p) int sql_step(sql_stmt * pStmt) { - int rc; /* Result from sqlStep() */ Vdbe *v = (Vdbe *) pStmt; /* the prepared statement */ - int cnt = 0; /* Counter to prevent infinite loop of reprepares */ - assert(v != NULL); - v->doingRerun = 0; - while ((rc = sqlStep(v)) == SQL_SCHEMA - && cnt++ < SQL_MAX_SCHEMA_RETRY) { - int savedPc = v->pc; - rc = sqlReprepare(v); - if (rc != 0) - break; - sql_reset(pStmt); - if (savedPc >= 0) - v->doingRerun = 1; - assert(v->expired == 0); - } - return rc; + return sqlStep(v); } /* -- 2.7.4
next prev parent reply other threads:[~2019-05-25 10:44 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 ` imeevma [this message] 2019-05-25 16:18 ` [tarantool-patches] Re: [PATCH v1 11/21] sql: remove SQL_SCHEMA errcode 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 ` [tarantool-patches] [PATCH v1 21/21] sql: remove sql_log() imeevma 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=cee56913a1cc9426ca6d18ebd96b4f0f20991898.1558780708.git.imeevma@gmail.com \ --to=imeevma@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v1 11/21] sql: remove SQL_SCHEMA errcode' \ /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