From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (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 DFDD546970E for ; Fri, 27 Dec 2019 22:18:19 +0300 (MSK) Date: Fri, 27 Dec 2019 22:18:18 +0300 From: Sergey Ostanevich Message-ID: <20191227191818.GD1222@tarantool.org> References: <60fcb0e2b538ead54180a780b93b9f396730b50a.1576844632.git.korablev@tarantool.org> <20191223140355.GA19594@tarantool.org> <20191224005108.GD41539@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191224005108.GD41539@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v3 01/20] sql: remove sql_prepare_v2() List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikita Pettik Cc: tarantool-patches@dev.tarantool.org Thanks, LGTM. Sergos On 24 Dec 03:51, Nikita Pettik wrote: > On 23 Dec 17:03, Sergey Ostanevich wrote: > > Hi! > > > > Thanks for the patch! > > > > On 20 Dec 15:47, Nikita Pettik wrote: > > > 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. > > > > Could you please extend the description with details on SQL text > > preservance and recmopilation, same as it was in old version? > > It was obsolete and non-relevant (related purely to SQLite) comment. > It has nothing to do with current sql_prepare() behaviour. > > > > + * > > > + * @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 > > >