Do not compute column and row size estimates for the transient Table objects
associated with the result set of a SELECT statement, since those estimates are never used for anything constructive. FossilOrigin-Name: e4342fd401d4025eecc53ebfcd59f3150166a5f0bd6adb1b5820703bd4a1ec58
This commit is contained in:
drh
parent
878fcf9d4e
commit
cafc2f7b3e
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
||||
C Mark\sa\ssingle\sbranch\swithin\ssqlite3SelectExpand()\sas\san\soptimization.
|
||||
D 2017-10-02T23:50:08.350
|
||||
C Do\snot\scompute\scolumn\sand\srow\ssize\sestimates\sfor\sthe\stransient\sTable\sobjects\nassociated\swith\sthe\sresult\sset\sof\sa\sSELECT\sstatement,\ssince\sthose\sestimates\nare\snever\sused\sfor\sanything\sconstructive.
|
||||
D 2017-10-03T03:01:09.197
|
||||
F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
|
||||
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
|
||||
F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
|
||||
@ -458,7 +458,7 @@ F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c
|
||||
F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
|
||||
F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
|
||||
F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
|
||||
F src/select.c 3e3fb2e45e26fe5f12d1765e6c40c57762977f36a2436aaa7463b82eb5ed760f
|
||||
F src/select.c 1a11e6ab321c22a20146c44d315ece07899f7abad5dab839c9d4cf6556ef588b
|
||||
F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
|
||||
F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
|
||||
F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
|
||||
@ -1655,7 +1655,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 5bf2ccb908dc6ebf7e063014b0a4bed7e3e9e0a555f78c6b4f6647adfb7209e4
|
||||
R eefaca2ea58aad260c29aab3ab787ea1
|
||||
P 3a4ffb21d0ee2326c31b9ddc512d79d4ebf3a249a2840e88e99165978eec31fd
|
||||
R 2ffb7cd4a155ee43580067e1a47b5521
|
||||
U drh
|
||||
Z 1bd2e271ce965a5407b85612faa9a389
|
||||
Z 7536be1ae6bc2716a9cf67864c3578f3
|
||||
|
||||
@ -1 +1 @@
|
||||
3a4ffb21d0ee2326c31b9ddc512d79d4ebf3a249a2840e88e99165978eec31fd
|
||||
e4342fd401d4025eecc53ebfcd59f3150166a5f0bd6adb1b5820703bd4a1ec58
|
||||
30
src/select.c
30
src/select.c
@ -1362,23 +1362,23 @@ static void generateSortTail(
|
||||
** the SQLITE_ENABLE_COLUMN_METADATA compile-time option is used.
|
||||
*/
|
||||
#ifdef SQLITE_ENABLE_COLUMN_METADATA
|
||||
# define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,C,D,E,F)
|
||||
# define columnType(A,B,C,D,E) columnTypeImpl(A,B,C,D,E)
|
||||
#else /* if !defined(SQLITE_ENABLE_COLUMN_METADATA) */
|
||||
# define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,F)
|
||||
# define columnType(A,B,C,D,E) columnTypeImpl(A,B)
|
||||
#endif
|
||||
static const char *columnTypeImpl(
|
||||
NameContext *pNC,
|
||||
#ifndef SQLITE_ENABLE_COLUMN_METADATA
|
||||
Expr *pExpr
|
||||
#else
|
||||
Expr *pExpr,
|
||||
#ifdef SQLITE_ENABLE_COLUMN_METADATA
|
||||
const char **pzOrigDb,
|
||||
const char **pzOrigTab,
|
||||
const char **pzOrigCol,
|
||||
const char **pzOrigCol
|
||||
#endif
|
||||
u8 *pEstWidth
|
||||
){
|
||||
char const *zType = 0;
|
||||
int j;
|
||||
u8 estWidth = 1;
|
||||
#ifdef SQLITE_ENABLE_COLUMN_METADATA
|
||||
char const *zOrigDb = 0;
|
||||
char const *zOrigTab = 0;
|
||||
@ -1447,7 +1447,7 @@ static const char *columnTypeImpl(
|
||||
sNC.pSrcList = pS->pSrc;
|
||||
sNC.pNext = pNC;
|
||||
sNC.pParse = pNC->pParse;
|
||||
zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol, &estWidth);
|
||||
zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol);
|
||||
}
|
||||
}else if( pTab->pSchema ){
|
||||
/* A real table */
|
||||
@ -1461,7 +1461,6 @@ static const char *columnTypeImpl(
|
||||
}else{
|
||||
zOrigCol = pTab->aCol[iCol].zName;
|
||||
zType = sqlite3ColumnType(&pTab->aCol[iCol],0);
|
||||
estWidth = pTab->aCol[iCol].szEst;
|
||||
}
|
||||
zOrigTab = pTab->zName;
|
||||
if( pNC->pParse ){
|
||||
@ -1473,7 +1472,6 @@ static const char *columnTypeImpl(
|
||||
zType = "INTEGER";
|
||||
}else{
|
||||
zType = sqlite3ColumnType(&pTab->aCol[iCol],0);
|
||||
estWidth = pTab->aCol[iCol].szEst;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -1492,7 +1490,7 @@ static const char *columnTypeImpl(
|
||||
sNC.pSrcList = pS->pSrc;
|
||||
sNC.pNext = pNC;
|
||||
sNC.pParse = pNC->pParse;
|
||||
zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol, &estWidth);
|
||||
zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
@ -1506,7 +1504,6 @@ static const char *columnTypeImpl(
|
||||
*pzOrigCol = zOrigCol;
|
||||
}
|
||||
#endif
|
||||
if( pEstWidth ) *pEstWidth = estWidth;
|
||||
return zType;
|
||||
}
|
||||
|
||||
@ -1533,7 +1530,7 @@ static void generateColumnTypes(
|
||||
const char *zOrigDb = 0;
|
||||
const char *zOrigTab = 0;
|
||||
const char *zOrigCol = 0;
|
||||
zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol, 0);
|
||||
zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol);
|
||||
|
||||
/* The vdbe must make its own copy of the column-type and other
|
||||
** column specific strings, in case the schema is reset before this
|
||||
@ -1543,7 +1540,7 @@ static void generateColumnTypes(
|
||||
sqlite3VdbeSetColName(v, i, COLNAME_TABLE, zOrigTab, SQLITE_TRANSIENT);
|
||||
sqlite3VdbeSetColName(v, i, COLNAME_COLUMN, zOrigCol, SQLITE_TRANSIENT);
|
||||
#else
|
||||
zType = columnType(&sNC, p, 0, 0, 0, 0);
|
||||
zType = columnType(&sNC, p, 0, 0, 0);
|
||||
#endif
|
||||
sqlite3VdbeSetColName(v, i, COLNAME_DECLTYPE, zType, SQLITE_TRANSIENT);
|
||||
}
|
||||
@ -1788,7 +1785,6 @@ void sqlite3SelectAddColumnTypeAndCollation(
|
||||
int i;
|
||||
Expr *p;
|
||||
struct ExprList_item *a;
|
||||
u64 szAll = 0;
|
||||
|
||||
assert( pSelect!=0 );
|
||||
assert( (pSelect->selFlags & SF_Resolved)!=0 );
|
||||
@ -1801,8 +1797,8 @@ void sqlite3SelectAddColumnTypeAndCollation(
|
||||
const char *zType;
|
||||
int n, m;
|
||||
p = a[i].pExpr;
|
||||
zType = columnType(&sNC, p, 0, 0, 0, &pCol->szEst);
|
||||
szAll += pCol->szEst;
|
||||
zType = columnType(&sNC, p, 0, 0, 0);
|
||||
/* pCol->szEst = ... // Column size est for SELECT tables never used */
|
||||
pCol->affinity = sqlite3ExprAffinity(p);
|
||||
if( zType && (m = sqlite3Strlen30(zType))>0 ){
|
||||
n = sqlite3Strlen30(pCol->zName);
|
||||
@ -1818,7 +1814,7 @@ void sqlite3SelectAddColumnTypeAndCollation(
|
||||
pCol->zColl = sqlite3DbStrDup(db, pColl->zName);
|
||||
}
|
||||
}
|
||||
pTab->szTabRow = sqlite3LogEst(szAll*4);
|
||||
pTab->szTabRow = 1; /* Any non-zero value works */
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user