From: Nikita Pettik <korablev@tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v3 06/20] sql: rename sql_reset() to sql_stmt_reset() Date: Fri, 20 Dec 2019 15:47:11 +0300 [thread overview] Message-ID: <8a4361895df79b705c5df3d72013ae01089f3257.1576844632.git.korablev@tarantool.org> (raw) In-Reply-To: <cover.1576844631.git.korablev@tarantool.org> In-Reply-To: <cover.1576844631.git.korablev@tarantool.org> --- src/box/ck_constraint.c | 2 +- src/box/sql/sqlInt.h | 2 +- src/box/sql/vdbe.c | 2 +- src/box/sql/vdbeapi.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/box/ck_constraint.c b/src/box/ck_constraint.c index 551bdd397..bc2a5e8f4 100644 --- a/src/box/ck_constraint.c +++ b/src/box/ck_constraint.c @@ -173,7 +173,7 @@ ck_constraint_program_run(struct ck_constraint *ck_constraint, * Get VDBE execution state and reset VM to run it * next time. */ - return sql_reset(ck_constraint->stmt); + return sql_stmt_reset(ck_constraint->stmt); } int diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index cf0b946f1..b1e4ac2fa 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -532,7 +532,7 @@ sql_stmt_finalize(sql_stmt * pStmt); * @retval sql_ret_code Error code on error. */ int -sql_reset(struct sql_stmt *stmt); +sql_stmt_reset(struct sql_stmt *stmt); int sql_exec(sql *, /* An open database */ diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 336fd4a52..8da007b4d 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1084,7 +1084,7 @@ case OP_Yield: { /* in1, jump */ * automatically. * * P1 is the result code returned by sql_exec(), - * sql_reset(), or sql_stmt_finalize(). For a normal halt, + * sql_stmt_reset(), or sql_stmt_finalize(). For a normal halt, * this should be 0. * For errors, it can be some other value. If P1!=0 then P2 will * determine whether or not to rollback the current transaction. diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 7463fb9d7..b6bf9aa81 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -88,7 +88,7 @@ sql_stmt_finalize(sql_stmt * pStmt) } int -sql_reset(sql_stmt * pStmt) +sql_stmt_reset(sql_stmt *pStmt) { assert(pStmt != NULL); struct Vdbe *v = (Vdbe *) pStmt; @@ -414,7 +414,7 @@ sqlStep(Vdbe * p) assert(p); if (p->magic != VDBE_MAGIC_RUN) - sql_reset((sql_stmt *) p); + sql_stmt_reset((sql_stmt *) p); /* Check that malloc() has not failed. If it has, return early. */ db = p->db; -- 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 ` Nikita Pettik [this message] 2019-12-24 12:09 ` [Tarantool-patches] [PATCH v3 06/20] sql: rename sql_reset() to sql_stmt_reset() 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=8a4361895df79b705c5df3d72013ae01089f3257.1576844632.git.korablev@tarantool.org \ --to=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 06/20] sql: rename sql_reset() to sql_stmt_reset()' \ /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