From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@freelists.org, Nikita Pettik <korablev@tarantool.org> Subject: [tarantool-patches] Re: [PATCH 1/2] sql: fix tuple format leak Date: Thu, 12 Apr 2018 14:58:13 +0300 [thread overview] Message-ID: <b2b9ed52-14ee-f1ee-4e88-792319296a16@tarantool.org> (raw) In-Reply-To: <8d8d9f3056d4af42638ab403de6f19d2eb76f07a.1523468339.git.korablev@tarantool.org> Hello. Thank you for contributing! See below 3 comments. > diff --git a/src/box/sql.c b/src/box/sql.c > index a6713f1f0..dd0cfcc1a 100644 > --- a/src/box/sql.c > +++ b/src/box/sql.c > @@ -451,17 +451,13 @@ int tarantoolSqlite3EphemeralCreate(BtCursor *pCur, uint32_t field_count, > * > * @retval SQLITE_OK on success, SQLITE_TARANTOOL_ERROR otherwise. > */ > -int tarantoolSqlite3EphemeralInsert(BtCursor *pCur) > +int tarantoolSqlite3EphemeralInsert(struct space *space, char *tuple, > + char *tuple_end) 1. Please, update the comment as well. And lets move it to a header, as it is done in tarantool core. > { > - assert(pCur); > - assert(pCur->curFlags & BTCF_TEphemCursor); > - mp_tuple_assert(pCur->key, pCur->key + pCur->nKey); > - > - if (space_ephemeral_replace(pCur->space, pCur->key, > - pCur->key + pCur->nKey) != 0) { > - diag_log(); > + assert(space != NULL); > + mp_tuple_assert(tuple, tuple_end); > + if (space_ephemeral_replace(space, tuple, tuple_end) != 0) > return SQL_TARANTOOL_INSERT_FAIL; > - } > return SQLITE_OK; > } > > @@ -475,28 +471,29 @@ int tarantoolSqlite3EphemeralDrop(BtCursor *pCur) > } > > static inline int > -insertOrReplace(BtCursor *pCur, enum iproto_type type) > +insertOrReplace(struct space *space, char *tuple, char *tuple_end, > + enum iproto_type type) 2. Please, make a pointer be const, if it is not changed. Here it is const. Const specifier helps compiler to do more accurate optimization. > -int tarantoolSqlite3Insert(BtCursor *pCur) > +int tarantoolSqlite3Insert(struct space *space, char *tuple, char *tuple_end) > { > - return insertOrReplace(pCur, IPROTO_INSERT); > + return insertOrReplace(space, tuple, tuple_end, IPROTO_INSERT); > } > > -int tarantoolSqlite3Replace(BtCursor *pCur) > +int tarantoolSqlite3Replace(struct space *space, char *tuple, char *tuple_end) 3. Same.
next prev parent reply other threads:[~2018-04-12 11:58 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-11 19:35 [tarantool-patches] [PATCH 0/2] sql: SQL bindings refactoring Nikita Pettik 2018-04-11 19:35 ` [tarantool-patches] [PATCH 1/2] sql: fix tuple format leak Nikita Pettik 2018-04-12 11:58 ` Vladislav Shpilevoy [this message] 2018-04-13 8:39 ` [tarantool-patches] " n.pettik 2018-04-11 19:35 ` [tarantool-patches] [PATCH 2/2] sql: refactor cursor closing routine Nikita Pettik 2018-04-12 13:28 ` [tarantool-patches] " Vladislav Shpilevoy
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=b2b9ed52-14ee-f1ee-4e88-792319296a16@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH 1/2] sql: fix tuple format leak' \ /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