From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 2AF4729474 for ; Sun, 2 Sep 2018 19:51:49 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QEJrssDvLRmS for ; Sun, 2 Sep 2018 19:51:49 -0400 (EDT) Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [94.100.177.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 6FF5029472 for ; Sun, 2 Sep 2018 19:51:48 -0400 (EDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: [tarantool-patches] Re: [PATCH 1/7] sql: remove struct schema from struct Table From: "n.pettik" In-Reply-To: Date: Mon, 3 Sep 2018 02:51:40 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: <2F12A3CE-DFBE-4A44-BF18-29C643F9AD20@tarantool.org> References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Vladislav Shpilevoy > Thanks for the patch! > I have pushed my review fix on the branch. Here > it is: >=20 > 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 =3D &pNew->a[i]; > struct SrcList_item *pOldItem =3D &p->a[i]; > Table *pTab; > - pNewItem->pSchema =3D pOldItem->pSchema; > pNewItem->zName =3D sqlite3DbStrDup(db, = pOldItem->zName); > pNewItem->zAlias =3D sqlite3DbStrDup(db, = pOldItem->zAlias); > pNewItem->fg =3D 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 = */ >=20 >=20 > 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.=