From: Nikita Pettik <korablev@tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v3 01/20] sql: remove sql_prepare_v2() Date: Fri, 20 Dec 2019 15:47:06 +0300 [thread overview] Message-ID: <60fcb0e2b538ead54180a780b93b9f396730b50a.1576844632.git.korablev@tarantool.org> (raw) In-Reply-To: <cover.1576844631.git.korablev@tarantool.org> In-Reply-To: <cover.1576844631.git.korablev@tarantool.org> There are two versions of the same function (sql_prepare()) which are almost identical. Let's keep more relevant version sql_prepare_v2() but rename it to sql_prepare() in order to avoid any mess. Needed for #3292 --- src/box/execute.c | 2 +- src/box/sql/legacy.c | 2 +- src/box/sql/prepare.c | 32 ++++---------------------------- src/box/sql/sqlInt.h | 25 +++++++++++-------------- src/box/sql/vdbeapi.c | 2 +- 5 files changed, 18 insertions(+), 45 deletions(-) diff --git a/src/box/execute.c b/src/box/execute.c index e8b012e5b..130a3f675 100644 --- a/src/box/execute.c +++ b/src/box/execute.c @@ -443,7 +443,7 @@ sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, { struct sql_stmt *stmt; struct sql *db = sql_get(); - if (sql_prepare_v2(db, sql, len, &stmt, NULL) != 0) + if (sql_prepare(db, sql, len, &stmt, NULL) != 0) return -1; assert(stmt != NULL); port_sql_create(port, stmt); diff --git a/src/box/sql/legacy.c b/src/box/sql/legacy.c index 0b1370f4a..bfd1e32b9 100644 --- a/src/box/sql/legacy.c +++ b/src/box/sql/legacy.c @@ -70,7 +70,7 @@ sql_exec(sql * db, /* The database on which the SQL executes */ char **azVals = 0; pStmt = 0; - rc = sql_prepare_v2(db, zSql, -1, &pStmt, &zLeftover); + rc = sql_prepare(db, zSql, -1, &pStmt, &zLeftover); assert(rc == 0 || pStmt == NULL); if (rc != 0) continue; diff --git a/src/box/sql/prepare.c b/src/box/sql/prepare.c index 0ecc676e2..35e81212d 100644 --- a/src/box/sql/prepare.c +++ b/src/box/sql/prepare.c @@ -204,36 +204,12 @@ sqlReprepare(Vdbe * p) return 0; } -/* - * 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, an 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. - */ -int -sql_prepare(sql * db, /* Database handle. */ - const char *zSql, /* UTF-8 encoded SQL statement. */ - int nBytes, /* Length of zSql in bytes. */ - sql_stmt ** ppStmt, /* OUT: A pointer to the prepared statement */ - const char **pzTail) /* OUT: End of parsed string */ -{ - int rc = sqlPrepare(db, zSql, nBytes, 0, 0, ppStmt, pzTail); - assert(rc == 0 || ppStmt == NULL || *ppStmt == NULL); /* VERIFY: F13021 */ - return rc; -} - int -sql_prepare_v2(sql * db, /* Database handle. */ - const char *zSql, /* UTF-8 encoded SQL statement. */ - int nBytes, /* Length of zSql in bytes. */ - sql_stmt ** ppStmt, /* OUT: A pointer to the prepared statement */ - const char **pzTail /* OUT: End of parsed string */ - ) +sql_prepare(struct sql *db, const char *sql, int length, struct sql_stmt **stmt, + const char **sql_tail) { - int rc = sqlPrepare(db, zSql, nBytes, 1, 0, ppStmt, pzTail); - assert(rc == 0 || ppStmt == NULL || *ppStmt == NULL); /* VERIFY: F13021 */ + int rc = sqlPrepare(db, sql, length, 1, 0, stmt, sql_tail); + assert(rc == 0 || stmt == NULL || *stmt == NULL); return rc; } diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 2594b73e0..7bd952a17 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -468,21 +468,18 @@ typedef void (*sql_destructor_type) (void *); #define SQL_STATIC ((sql_destructor_type)0) #define SQL_TRANSIENT ((sql_destructor_type)-1) +/** + * Prepare (compile into VDBE byte-code) statement. + * + * @param db Database handle. + * @param sql UTF-8 encoded SQL statement. + * @param length Length of @param sql in bytes. + * @param[out] stmt A pointer to the prepared statement. + * @param[out] sql_tail End of parsed string. + */ int -sql_prepare(sql * db, /* Database handle */ - const char *zSql, /* SQL statement, UTF-8 encoded */ - int nByte, /* Maximum length of zSql in bytes. */ - sql_stmt ** ppStmt, /* OUT: Statement handle */ - const char **pzTail /* OUT: Pointer to unused portion of zSql */ - ); - -int -sql_prepare_v2(sql * db, /* Database handle */ - const char *zSql, /* SQL statement, UTF-8 encoded */ - int nByte, /* Maximum length of zSql in bytes. */ - sql_stmt ** ppStmt, /* OUT: Statement handle */ - const char **pzTail /* OUT: Pointer to unused portion of zSql */ - ); +sql_prepare(struct sql *db, const char *sql, int length, struct sql_stmt **stmt, + const char **sql_tail); int sql_step(sql_stmt *); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 685212d91..12449d3bc 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -452,7 +452,7 @@ sqlStep(Vdbe * p) checkProfileCallback(db, p); if (p->isPrepareV2 && rc != SQL_ROW && rc != SQL_DONE) { - /* If this statement was prepared using sql_prepare_v2(), and an + /* If this statement was prepared using sql_prepare(), and an * error has occurred, then return an error. */ if (p->is_aborted) -- 2.15.1
next prev parent reply other threads:[~2019-12-20 12:47 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-20 12:47 [Tarantool-patches] [PATCH v3 00/20] sql: prepared statements Nikita Pettik 2019-12-20 12:47 ` Nikita Pettik [this message] 2019-12-23 14:03 ` [Tarantool-patches] [PATCH v3 01/20] sql: remove sql_prepare_v2() Sergey Ostanevich 2019-12-24 0:51 ` Nikita Pettik 2019-12-27 19:18 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 02/20] sql: refactor sql_prepare() and sqlPrepare() Nikita Pettik 2019-12-24 11:35 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 03/20] sql: move sql_prepare() declaration to box/execute.h Nikita Pettik 2019-12-24 11:40 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 04/20] sql: rename sqlPrepare() to sql_stmt_compile() Nikita Pettik 2019-12-24 12:01 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 05/20] sql: rename sql_finalize() to sql_stmt_finalize() Nikita Pettik 2019-12-24 12:08 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 06/20] sql: rename sql_reset() to sql_stmt_reset() Nikita Pettik 2019-12-24 12:09 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 07/20] sql: move sql_stmt_finalize() to execute.h Nikita Pettik 2019-12-24 12:11 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 08/20] port: increase padding of struct port Nikita Pettik 2019-12-24 12:34 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 09/20] port: add result set format and request type to port_sql Nikita Pettik 2019-12-25 13:37 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 10/20] sql: resurrect sql_bind_parameter_count() function Nikita Pettik 2019-12-24 20:23 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 11/20] sql: resurrect sql_bind_parameter_name() Nikita Pettik 2019-12-24 20:26 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 12/20] sql: add sql_stmt_schema_version() Nikita Pettik 2019-12-25 13:37 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 13/20] sql: introduce sql_stmt_sizeof() function Nikita Pettik 2019-12-25 13:44 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 14/20] box: increment schema_version on ddl operations Nikita Pettik 2019-12-25 14:33 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 15/20] sql: introduce sql_stmt_query_str() method Nikita Pettik 2019-12-25 14:36 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 16/20] sql: move sql_stmt_busy() declaration to box/execute.h Nikita Pettik 2019-12-25 14:54 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 17/20] sql: introduce holder for prepared statemets Nikita Pettik 2019-12-23 20:54 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 18/20] box: introduce prepared statements Nikita Pettik 2019-12-25 15:23 ` Sergey Ostanevich 2019-12-30 10:27 ` Nikita Pettik 2019-12-30 14:15 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 19/20] netbox: " Nikita Pettik 2019-12-25 20:41 ` Sergey Ostanevich 2019-12-30 9:58 ` Nikita Pettik 2019-12-30 14:16 ` Sergey Ostanevich 2019-12-20 12:47 ` [Tarantool-patches] [PATCH v3 20/20] sql: add cache statistics to box.info Nikita Pettik 2019-12-25 20:53 ` Sergey Ostanevich 2019-12-30 9:46 ` Nikita Pettik 2019-12-30 14:23 ` Sergey Ostanevich 2019-12-30 1:13 ` [Tarantool-patches] [PATCH v3 00/20] sql: prepared statements Nikita Pettik 2019-12-31 8:39 ` 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=60fcb0e2b538ead54180a780b93b9f396730b50a.1576844632.git.korablev@tarantool.org \ --to=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 01/20] sql: remove sql_prepare_v2()' \ /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