From: Nikita Pettik <korablev@tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v3 04/20] sql: rename sqlPrepare() to sql_stmt_compile() Date: Fri, 20 Dec 2019 15:47:09 +0300 [thread overview] Message-ID: <18b8be4f4c38db262517b7137a729d04531717f4.1576844632.git.korablev@tarantool.org> (raw) In-Reply-To: <cover.1576844631.git.korablev@tarantool.org> In-Reply-To: <cover.1576844631.git.korablev@tarantool.org> sql_prepare() is going not only to compile statement, but also to save it to the prepared statement cache. So we'd better rename sqlPrepare() which is static wrapper around sql_prepare() and make it non-static. Where it is possible let's use sql_stmt_compile() instead of sql_prepare(). Needed for #2592 --- src/box/execute.c | 2 +- src/box/sql/analyze.c | 6 +++--- src/box/sql/legacy.c | 2 +- src/box/sql/prepare.c | 21 ++++++--------------- src/box/sql/sqlInt.h | 14 ++++++++++++++ src/box/sql/vdbeapi.c | 2 +- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/box/execute.c b/src/box/execute.c index 0b21386b5..af66447b5 100644 --- a/src/box/execute.c +++ b/src/box/execute.c @@ -442,7 +442,7 @@ sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, struct region *region) { struct sql_stmt *stmt; - if (sql_prepare(sql, len, &stmt, NULL) != 0) + if (sql_stmt_compile(sql, len, NULL, &stmt, NULL) != 0) return -1; assert(stmt != NULL); port_sql_create(port, stmt); diff --git a/src/box/sql/analyze.c b/src/box/sql/analyze.c index 00ca15413..42e2a1a2f 100644 --- a/src/box/sql/analyze.c +++ b/src/box/sql/analyze.c @@ -1359,7 +1359,7 @@ load_stat_from_space(const char *sql_select_prepare, } } sql_stmt *stmt = NULL; - int rc = sql_prepare(sql_select_prepare, -1, &stmt, 0); + int rc = sql_stmt_compile(sql_select_prepare, -1, NULL, &stmt, 0); if (rc) goto finalize; uint32_t current_idx_count = 0; @@ -1427,7 +1427,7 @@ load_stat_from_space(const char *sql_select_prepare, rc = sql_finalize(stmt); if (rc) goto finalize; - rc = sql_prepare(sql_select_load, -1, &stmt, 0); + rc = sql_stmt_compile(sql_select_load, -1, NULL, &stmt, 0); if (rc) goto finalize; struct index *prev_index = NULL; @@ -1509,7 +1509,7 @@ load_stat_to_index(const char *sql_select_load, struct index_stat **stats) { assert(stats != NULL && *stats != NULL); struct sql_stmt *stmt = NULL; - if (sql_prepare(sql_select_load, -1, &stmt, 0) != 0) + if (sql_stmt_compile(sql_select_load, -1, NULL, &stmt, 0) != 0) return -1; uint32_t current_idx_count = 0; while (sql_step(stmt) == SQL_ROW) { diff --git a/src/box/sql/legacy.c b/src/box/sql/legacy.c index e3a2c77ca..458afd7f8 100644 --- a/src/box/sql/legacy.c +++ b/src/box/sql/legacy.c @@ -71,7 +71,7 @@ sql_exec(sql * db, /* The database on which the SQL executes */ char **azVals = 0; pStmt = 0; - rc = sql_prepare(zSql, -1, &pStmt, &zLeftover); + rc = sql_stmt_compile(zSql, -1, NULL, &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 520b52d64..73d6866a4 100644 --- a/src/box/sql/prepare.c +++ b/src/box/sql/prepare.c @@ -39,18 +39,11 @@ #include "box/space.h" #include "box/session.h" -/* - * Compile the UTF-8 encoded SQL statement zSql into a statement handle. - */ -static int -sqlPrepare(sql * db, /* Database handle. */ - const char *zSql, /* UTF-8 encoded SQL statement. */ - int nBytes, /* Length of zSql in bytes. */ - Vdbe * pReprepare, /* VM being reprepared */ - sql_stmt ** ppStmt, /* OUT: A pointer to the prepared statement */ - const char **pzTail /* OUT: End of parsed string */ - ) +int +sql_stmt_compile(const char *zSql, int nBytes, struct Vdbe *pReprepare, + sql_stmt **ppStmt, const char **pzTail) { + struct sql *db = sql_get(); int rc = 0; /* Result code */ Parse sParse; /* Parsing context */ sql_parser_create(&sParse, db, current_session()->sql_flags); @@ -185,12 +178,10 @@ sqlReprepare(Vdbe * p) { 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); - if (sqlPrepare(db, zSql, -1, p, &pNew, 0) != 0) { + if (sql_stmt_compile(zSql, -1, p, &pNew, 0) != 0) { assert(pNew == 0); return -1; } @@ -206,7 +197,7 @@ int sql_prepare(const char *sql, int length, struct sql_stmt **stmt, const char **sql_tail) { - int rc = sqlPrepare(sql_get(), sql, length, 0, stmt, sql_tail); + int rc = sql_stmt_compile(sql, length, 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 3ca10778e..03deb733c 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -468,6 +468,20 @@ typedef void (*sql_destructor_type) (void *); #define SQL_STATIC ((sql_destructor_type)0) #define SQL_TRANSIENT ((sql_destructor_type)-1) +/** + * Compile the UTF-8 encoded SQL statement into + * a statement handle (struct Vdbe). + * + * @param sql UTF-8 encoded SQL statement. + * @param sql_len Length of @sql in bytes. + * @param re_prepared VM being re-compiled. Can be NULL. + * @param[out] stmt A pointer to the compiled statement. + * @param[out] sql_tail End of parsed string. + */ +int +sql_stmt_compile(const char *sql, int bytes_count, struct Vdbe *re_prepared, + 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 db7936e78..ab8441bc5 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -71,7 +71,7 @@ invokeProfileCallback(sql * db, Vdbe * p) /* * The following routine destroys a virtual machine that is created by - * the sql_compile() routine. The integer returned is an SQL_ + * the sql_stmt_compile() routine. The integer returned is an SQL_ * success/failure code that describes the result of executing the virtual * machine. */ -- 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 ` [Tarantool-patches] [PATCH v3 01/20] sql: remove sql_prepare_v2() Nikita Pettik 2019-12-23 14:03 ` 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 ` Nikita Pettik [this message] 2019-12-24 12:01 ` [Tarantool-patches] [PATCH v3 04/20] sql: rename sqlPrepare() to sql_stmt_compile() 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=18b8be4f4c38db262517b7137a729d04531717f4.1576844632.git.korablev@tarantool.org \ --to=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 04/20] sql: rename sqlPrepare() to sql_stmt_compile()' \ /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