database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-05 04:30:38 +03:00
Code Activity

Changes the formatting of ".scanstats on" in the shell so that the stats for

Browse Source 
subqueries are grouped together and occur after the main query.

FossilOrigin-Name: eacbbd8849db9b023eff15ef1cb42ec941299433
This commit is contained in:
drh
2014-11-06 12:08:21 +00:00
parent c6652b1efe
commit 42f30bce11
3 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Add\sthe\sSQLITE_SCANSTAT_SELECTID\smetric.\s\sUse\sit\sto\simprove\sthe\n".stmtscan\son"\soutput\sin\sthe\sshell. C Changes\sthe\sformatting\sof\s".scanstats\son"\sin\sthe\sshell\sso\sthat\sthe\sstats\sfor\nsubqueries\sare\sgrouped\stogether\sand\soccur\safter\sthe\smain\squery.
D 2014-11-06T04:42:20.310 D 2014-11-06T12:08:21.237
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -228,7 +228,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952 F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
F src/select.c 428165951748151e87a15295b7357221433e311b F src/select.c 428165951748151e87a15295b7357221433e311b
F src/shell.c 74768f90bd0f8880937d52e2eb756655dba0015a F src/shell.c 22c7c693f322091b26e9333a8fa50c56e4aba667
F src/sqlite.h.in 087d30a4c7ec7ae19bcaa03a9db9d6ee7a73b0b3 F src/sqlite.h.in 087d30a4c7ec7ae19bcaa03a9db9d6ee7a73b0b3
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
@@ -1211,7 +1211,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P f9684000665ae7ef6f89c3773612b8286b8f545a P 64ad5761a841f71530d41565b9fbe9d19c2d6aff
R 34f47ade33b56f41a439ae08635a112b R 301cd68395834791ac0b2ebb68f39e69
U drh U drh
Z 216d325be8d3eddf6fd433a7ff464585 Z c6dcae9ced19f9079c51a47717359be1

2
manifest.uuid
View File

@@ -1 +1 @@
64ad5761a841f71530d41565b9fbe9d19c2d6aff eacbbd8849db9b023eff15ef1cb42ec941299433

54
src/shell.c
View File

@@ -1194,39 +1194,33 @@ static void display_scanstats(
ShellState *pArg /* Pointer to ShellState */ ShellState *pArg /* Pointer to ShellState */
){ ){
#ifdef SQLITE_ENABLE_STMT_SCANSTATUS #ifdef SQLITE_ENABLE_STMT_SCANSTATUS
int i; int i, k, n = 1;
double *arEstLoop = 0;
int nEstLoop = 0;
fprintf(pArg->out, "-------- scanstats --------\n"); fprintf(pArg->out, "-------- scanstats --------\n");
for(i=0; 1; i++){ for(k=0; n>0; k++){
sqlite3_stmt *p = pArg->pStmt; double rEstLoop = 1.0;
sqlite3_int64 nLoop, nVisit; for(i=n=0; 1; i++){
double rEst, rLoop; sqlite3_stmt *p = pArg->pStmt;
int iSid; sqlite3_int64 nLoop, nVisit;
const char *zExplain; double rEst;
if( sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NLOOP, (void*)&nLoop) ){ int iSid;
break; const char *zExplain;
if( sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NLOOP, (void*)&nLoop) ){
break;
}
sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_SELECTID, (void*)&iSid);
if( iSid!=k ) continue;
if( n==0 && k>0 ) fprintf(pArg->out, "-------- subquery %d --------\n", k);
n++;
sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NVISIT, (void*)&nVisit);
sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EST, (void*)&rEst);
sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EXPLAIN, (void*)&zExplain);
fprintf(pArg->out, "Loop %2d: %s\n", n, zExplain);
rEstLoop *= rEst;
fprintf(pArg->out, " nLoop=%-8lld nRow=%-8lld estRow=%-8lld estRow/Loop=%-8g\n",
nLoop, nVisit, (sqlite3_int64)rEstLoop, rEst
);
} }
sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NVISIT, (void*)&nVisit);
sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EST, (void*)&rEst);
sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EXPLAIN, (void*)&zExplain);
sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_SELECTID, (void*)&iSid);
if( iSid>=nEstLoop ){
arEstLoop = sqlite3_realloc(arEstLoop, sizeof(arEstLoop[0])*(iSid+1) );
while( nEstLoop<=iSid ) arEstLoop[nEstLoop++] = 1.0;
}
if( iSid>=0 ){
arEstLoop[iSid] *= rEst;
rLoop = arEstLoop[iSid];
}else{
rLoop = rEst;
}
fprintf(pArg->out, "Loop %2d: \"%s\"\n", i, zExplain);
fprintf(pArg->out, " nLoop=%-8lld nRow=%-8lld estRow=%-8lld estRow/Loop=%-8g\n",
nLoop, nVisit, (sqlite3_int64)rLoop, rEst
);
} }
sqlite3_free(arEstLoop);
#else #else
fprintf(pArg->out, "-------- scanstats --------\n"); fprintf(pArg->out, "-------- scanstats --------\n");
fprintf(pArg->out, fprintf(pArg->out,