From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: "n.pettik" <korablev@tarantool.org>, tarantool-patches@freelists.org Subject: [tarantool-patches] Re: [PATCH 3/3] sql: implement point where for DELETE stmts Date: Mon, 18 Jun 2018 15:40:06 +0300 [thread overview] Message-ID: <dcbf08ec-9358-e4a4-303a-b609a5f5e154@tarantool.org> (raw) In-Reply-To: <8E3011EE-AF57-4055-AE08-58DABDB1CC40@tarantool.org> Thanks for the fixes! See 2 comments below. >> 2. As I proposed in the review, why can not we use stack struct Table here? >> Just declare it at the beginning of the function and here save its pointer. > > Well, OK it is possible: > > +++ b/src/box/sql/delete.c > @@ -111,9 +111,12 @@ sql_table_delete_from(struct Parse *parse, struct SrcList *tab_list, > * wrapper around space_def to support interface. > */ > space = space_by_id(space_id); > - tab_list->a[0].pTab = sql_table_construct_from_space(space); > - if (tab_list->a[0].pTab == NULL) > - goto delete_from_cleanup; > + struct Table tmp_tab; > + memset(&tmp_tab, 0, sizeof(tmp_tab)); > + tmp_tab.def = space->def; > + /* Prevent from freeing memory in DeleteTable. */ > + tmp_tab.nTabRef = 2; > + tab_list->a[0].pTab = &tmp_tab; 1. Are you sure you can save the pointer to the stack value and then use it out of the declaration context? Here tmp_tab is declared inside {} block, but pointer on it is used out the former. >>> 11 files changed, 256 insertions(+), 253 deletions(-) >>>> diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c >>> index 23e16189a..e7d9723fa 100644 >>> --- a/src/box/sql/resolve.c >>> +++ b/src/box/sql/resolve.c >>> @@ -39,6 +39,9 @@ >>> #include <stdlib.h> >>> #include <string.h> >>> +#include "box/box.h" >>> +#include "box/schema.h" >> >> 4. Why do you need these headers? > > Looks like I forgot to remove them. Anyway, in your fixes you removed them. Thx. > >>> */ >>> static int >>> -sql_where_shortcut(struct WhereLoopBuilder *builder) >>> +where_assign_loop_terms(struct WhereLoop *loop, struct WhereClause *where, >>> + int cursor, struct space_def *space_def, >>> + struct index_def *idx_def) >> >> 5. Why WhereClause new method has prefix 'sql_where_', but WhereLoop method has prefix >> 'where_'? Lets make it 'where_clause_find_term' and 'where_loop_assign_terms’. > > -sql_where_find_term(struct WhereClause *where_clause, int cursor, int column, > - Bitmask is_ready, u32 op, struct space_def *space_def, > - struct key_def *key_def) > +where_clase_find_term(struct WhereClause *where_clause, int cursor, int column, 2. clase - clause. Else the patch can not be built. > + Bitmask is_ready, u32 op, struct space_def *space_def, > + struct key_def *key_def) >
next prev parent reply other threads:[~2018-06-18 12:40 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-01 15:16 [tarantool-patches] [PATCH 0/3] " Kirill Yukhin 2018-06-01 15:16 ` [tarantool-patches] [PATCH 1/3] sql: fetch primary index for affinity only Kirill Yukhin 2018-06-01 18:00 ` [tarantool-patches] " Vladislav Shpilevoy 2018-06-07 12:03 ` Kirill Yukhin 2018-06-07 15:01 ` Vladislav Shpilevoy 2018-06-08 8:25 ` Kirill Yukhin 2018-06-01 15:16 ` [tarantool-patches] [PATCH 2/3] sql: remove expressions from SQL indexes Kirill Yukhin 2018-06-01 18:00 ` [tarantool-patches] " Vladislav Shpilevoy 2018-06-01 15:16 ` [tarantool-patches] [PATCH 3/3] sql: implement point where for DELETE stmts Kirill Yukhin 2018-06-01 18:00 ` [tarantool-patches] " Vladislav Shpilevoy 2018-06-18 2:11 ` n.pettik 2018-06-18 10:44 ` Vladislav Shpilevoy 2018-06-18 10:51 ` Vladislav Shpilevoy 2018-06-18 12:29 ` n.pettik 2018-06-18 12:40 ` Vladislav Shpilevoy [this message] 2018-06-18 14:00 ` n.pettik 2018-06-18 14:17 ` Vladislav Shpilevoy 2018-06-19 8:03 ` Kirill Yukhin 2018-06-14 12:41 ` [tarantool-patches] Re: [PATCH 0/3] " 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=dcbf08ec-9358-e4a4-303a-b609a5f5e154@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH 3/3] sql: implement point where for DELETE stmts' \ /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