Tarantool development patches archive
 help / color / mirror / Atom feed
From: "n.pettik" <korablev@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH 1/7] sql: remove struct schema from struct Table
Date: Mon, 3 Sep 2018 02:51:40 +0300	[thread overview]
Message-ID: <2F12A3CE-DFBE-4A44-BF18-29C643F9AD20@tarantool.org> (raw)
In-Reply-To: <dbf634e1-560f-aa52-16dd-7558f03e7142@tarantool.org>


> Thanks for the patch!
> I have pushed my review fix on the branch. Here
> it is:
> 
> diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c
> index a41ea8f13..7ddedaf8a 100644
> --- a/src/box/sql/expr.c
> +++ b/src/box/sql/expr.c
> @@ -1515,7 +1515,6 @@ sqlite3SrcListDup(sqlite3 * db, SrcList * p, int flags)
> 		struct SrcList_item *pNewItem = &pNew->a[i];
> 		struct SrcList_item *pOldItem = &p->a[i];
> 		Table *pTab;
> -		pNewItem->pSchema = pOldItem->pSchema;
> 		pNewItem->zName = sqlite3DbStrDup(db, pOldItem->zName);
> 		pNewItem->zAlias = sqlite3DbStrDup(db, pOldItem->zAlias);
> 		pNewItem->fg = pOldItem->fg;
> diff --git a/src/box/sql/sqliteInt.h b/src/box/sql/sqliteInt.h
> index 35d3f4cec..6bca506e7 100644
> --- a/src/box/sql/sqliteInt.h
> +++ b/src/box/sql/sqliteInt.h
> @@ -2377,7 +2377,6 @@ struct SrcList {
> 	int nSrc;		/* Number of tables or subqueries in the FROM clause */
> 	u32 nAlloc;		/* Number of entries allocated in a[] below */
> 	struct SrcList_item {
> -		Schema *pSchema;	/* Schema to which this item is fixed */
> 		char *zName;	/* Name of the table */
> 		char *zAlias;	/* The "B" part of a "A AS B" phrase.  zName is the "A" */
> 		Table *pTab;	/* An SQL table corresponding to zName */
> 
> 
> SrcList_item is actually a table most times, so lets
> remove Schema from it as well.

Well, actually I did it in the last patch where I completely
removed struct Schema at all. But OK, I will squash your fix.

  reply	other threads:[~2018-09-02 23:51 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-23 22:55 [tarantool-patches] [PATCH 0/7] Finish SQL DD integration Nikita Pettik
     [not found] ` <cover.1535064700.git.korablev@tarantool.org>
2018-08-23 22:55   ` [tarantool-patches] [PATCH 1/7] sql: remove struct schema from struct Table Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:51       ` n.pettik [this message]
2018-09-16 19:32     ` Vladislav Shpilevoy
2018-09-19 10:58       ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 2/7] sql: remove SQLite original struct Index Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:51       ` n.pettik
2018-09-06 19:54         ` Vladislav Shpilevoy
2018-09-16 19:04           ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 3/7] sql: remove struct Table from analyze routine Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:52       ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 4/7] sql: refactor ALTER RENAME code generation Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:52       ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 5/7] sql: remove lookups in Table hash Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:52       ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 6/7] sql: don't add system spaces to " Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-02 23:52       ` n.pettik
2018-09-06 19:54         ` Vladislav Shpilevoy
2018-09-16 19:04           ` n.pettik
2018-08-23 22:55   ` [tarantool-patches] [PATCH 7/7] sql: finish DD integration Nikita Pettik
2018-08-29  0:58     ` [tarantool-patches] " Vladislav Shpilevoy
2018-09-20 14:45       ` 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=2F12A3CE-DFBE-4A44-BF18-29C643F9AD20@tarantool.org \
    --to=korablev@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='[tarantool-patches] Re: [PATCH 1/7] sql: remove struct schema from struct Table' \
    /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