diff options
| author | drh <drh@noemail.net> | 2011-10-11 12:58:38 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2011-10-11 12:58:38 +0000 |
| commit | 29c21c77af012bed32e3c68c71b813f885c4641d (patch) | |
| tree | d3d62d6714ba3e71397149a98943fab48ecff2b1 /src/shell.c | |
| parent | 946e610a8497e3868e47ad2c976913ec37fb0df6 (diff) | |
| parent | 67855877ffa8a1d70ab17a65ead5dd3872e4623a (diff) | |
| download | sqlite-29c21c77af012bed32e3c68c71b813f885c4641d.tar.gz sqlite-29c21c77af012bed32e3c68c71b813f885c4641d.zip | |
Merge all the latest trunk changes into the sessions branch - especially
the SQLITE_ENABLE_STAT3 enhancements.
FossilOrigin-Name: 403431cac6b039b0693915c5422f08dc60dae230
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/shell.c b/src/shell.c index 9759e93b0..48933bc79 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1029,7 +1029,12 @@ static int display_stats( fprintf(pArg->out, "Lookaside failures due to OOM: %d\n", iHiwtr); iHiwtr = iCur = -1; sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_USED, &iCur, &iHiwtr, bReset); - fprintf(pArg->out, "Pager Heap Usage: %d bytes\n", iCur); + fprintf(pArg->out, "Pager Heap Usage: %d bytes\n", iCur); iHiwtr = iCur = -1; + sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_HIT, &iCur, &iHiwtr, 1); + fprintf(pArg->out, "Page cache hits: %d\n", iCur); + iHiwtr = iCur = -1; + sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_MISS, &iCur, &iHiwtr, 1); + fprintf(pArg->out, "Page cache misses: %d\n", iCur); iHiwtr = iCur = -1; sqlite3_db_status(db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHiwtr, bReset); fprintf(pArg->out, "Schema Heap Usage: %d bytes\n", iCur); @@ -1673,7 +1678,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){ fprintf(stderr, "Error: non-null separator required for import\n"); return 1; } - zSql = sqlite3_mprintf("SELECT * FROM '%q'", zTable); + zSql = sqlite3_mprintf("SELECT * FROM %s", zTable); if( zSql==0 ){ fprintf(stderr, "Error: out of memory\n"); return 1; @@ -1695,7 +1700,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){ fprintf(stderr, "Error: out of memory\n"); return 1; } - sqlite3_snprintf(nByte+20, zSql, "INSERT INTO '%q' VALUES(?", zTable); + sqlite3_snprintf(nByte+20, zSql, "INSERT INTO %s VALUES(?", zTable); j = strlen30(zSql); for(i=1; i<nCol; i++){ zSql[j++] = ','; |