From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id B9C6942F4C5 for ; Thu, 7 Nov 2019 04:05:02 +0300 (MSK) From: Nikita Pettik Date: Thu, 7 Nov 2019 04:04:45 +0300 Message-Id: <20191107010455.64457-6-korablev@tarantool.org> In-Reply-To: <20191107010455.64457-1-korablev@tarantool.org> References: <20191107010455.64457-1-korablev@tarantool.org> Subject: [Tarantool-patches] [PATCH 05/15] sql: move sql_finalize() to execute.h List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: v.shpilevoy@tarantool.org We are going to make prepared statement cache be session local. Hence, when sessions is destroyed we should erase its cache and deallocate each prepared statement in it. As a consequence, we should be able to call sql_finalize() from box/ submodule. So let's move its signature to box/execute.h Need for #2592 --- src/box/ck_constraint.c | 1 + src/box/execute.h | 3 +++ src/box/sql/sqlInt.h | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/box/ck_constraint.c b/src/box/ck_constraint.c index d21717f94..6b9d44775 100644 --- a/src/box/ck_constraint.c +++ b/src/box/ck_constraint.c @@ -29,6 +29,7 @@ * SUCH DAMAGE. */ #include "box/session.h" +#include "execute.h" #include "bind.h" #include "ck_constraint.h" #include "errcode.h" diff --git a/src/box/execute.h b/src/box/execute.h index a6000c08b..a85fca5fc 100644 --- a/src/box/execute.h +++ b/src/box/execute.h @@ -89,6 +89,9 @@ struct port_sql { extern const struct port_vtab port_sql_vtab; +int +sql_finalize(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 4a28e5fb9..553a48d60 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -510,9 +510,6 @@ sql_value * sql_column_value(sql_stmt *, int iCol); -int -sql_finalize(sql_stmt * pStmt); - /* * Terminate the current execution of an SQL statement and reset * it back to its starting state so that it can be reused. -- 2.15.1