From: Nikita Pettik <korablev@tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v3 16/20] sql: move sql_stmt_busy() declaration to box/execute.h Date: Fri, 20 Dec 2019 15:47:21 +0300 [thread overview] Message-ID: <aee0232120a0c371fdb4df0df9303d505aa295b6.1576844632.git.korablev@tarantool.org> (raw) In-Reply-To: <cover.1576844631.git.korablev@tarantool.org> In-Reply-To: <cover.1576844631.git.korablev@tarantool.org> We are going to use it in box/execute.c and in SQL prepared statement cache implementation. So to avoid including whole sqlInt.h let's move it to relative small execute.h header. Let's also fix codestyle of this function. Needed for #2592 --- src/box/execute.h | 4 ++++ src/box/sql/sqlInt.h | 3 --- src/box/sql/vdbeapi.c | 10 ++++------ src/box/sql/vdbeaux.c | 1 + 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/box/execute.h b/src/box/execute.h index f3d6c38b3..61c8e0281 100644 --- a/src/box/execute.h +++ b/src/box/execute.h @@ -127,6 +127,10 @@ sql_stmt_est_size(const struct sql_stmt *stmt); const char * sql_stmt_query_str(const struct sql_stmt *stmt); +/** Return true if statement executes right now. */ +int +sql_stmt_busy(const struct sql_stmt *stmt); + /** * Prepare (compile into VDBE byte-code) statement. * diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 7dfc29809..cbe46e790 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -718,9 +718,6 @@ sql_bind_parameter_name(const struct sql_stmt *stmt, int i); int sql_bind_ptr(struct sql_stmt *stmt, int i, void *ptr); -int -sql_stmt_busy(sql_stmt *); - int sql_init_db(sql **db); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 7278d2ab3..01185af5f 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -1190,14 +1190,12 @@ sql_db_handle(sql_stmt * pStmt) return pStmt ? ((Vdbe *) pStmt)->db : 0; } -/* - * Return true if the prepared statement is in need of being reset. - */ int -sql_stmt_busy(sql_stmt * pStmt) +sql_stmt_busy(const struct sql_stmt *stmt) { - Vdbe *v = (Vdbe *) pStmt; - return v != 0 && v->magic == VDBE_MAGIC_RUN && v->pc >= 0; + assert(stmt != NULL); + const struct Vdbe *v = (const struct Vdbe *) stmt; + return v->magic == VDBE_MAGIC_RUN && v->pc >= 0; } /* diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 619105820..afe1ecb2a 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -43,6 +43,7 @@ #include "sqlInt.h" #include "vdbeInt.h" #include "tarantoolInt.h" +#include "box/execute.h" /* * Create a new virtual database engine. -- 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 ` [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 ` Nikita Pettik [this message] 2019-12-25 14:54 ` [Tarantool-patches] [PATCH v3 16/20] sql: move sql_stmt_busy() declaration to box/execute.h 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=aee0232120a0c371fdb4df0df9303d505aa295b6.1576844632.git.korablev@tarantool.org \ --to=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 16/20] sql: move sql_stmt_busy() declaration to box/execute.h' \ /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