[tarantool-patches] Re: [PATCH 1/7] sql: remove struct schema from struct Table

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Wed Aug 29 03:58:32 MSK 2018


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.




More information about the Tarantool-patches mailing list