Improved output formatting for the showstat4 tool.

FossilOrigin-Name: 7df82c46da437bc743576358c25e758280067df8

diff --git a/manifest b/manifest
index e9f3481cbad11e42f0d49654c19c3c23bb0b70c4..9ad9755cc5dccbb92c92578e5b593456a98a3437 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\svarious\srequirements\sevidence\smarks\sfor\ssqlite3_config()\soptions.
-D 2014-11-04T17:23:24.610
+C Improved\soutput\sformatting\sfor\sthe\sshowstat4\stool.
+D 2014-11-04T21:38:45.383
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1190,7 +1190,7 @@ F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
 F tool/showdb.c bd073a78bce714a0e42d92ea474b3eb8cb53be5d
 F tool/showjournal.c 053eb1cc774710c6890b7dd6293300cc297b16a5
-F tool/showstat4.c c39279d6bd37cb999b634f0064f6f86ad7af008f
+F tool/showstat4.c 9515faa8ec176599d4a8288293ba8ec61f7b728a
 F tool/showwal.c 85cb36d4fe3e93e2fbd63e786e0d1ce42d0c4fad
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
 F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
@@ -1211,7 +1211,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 391c9b85abcb5ba300fb2e116384639310c69ed2
-R 59d979fd0dabfa4a2d3ae24d9471db8f
+P d423349d2cd8bc7e04f3d90ca7bab11e1ad86e25
+R 3d8e834a0bd7bfcb019dc53478b58f7b
 U drh
-Z d72c7362e49ef35f8e5912118c20e6ff
+Z 0a79c8f46f24bb92a10190eb30b27d6d

diff --git a/manifest.uuid b/manifest.uuid
index 969ed55bc17b0b668a15c72a3a254a429e545668..11e49b8e8c37ea2d2bcdd01359d32307136c2067 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d423349d2cd8bc7e04f3d90ca7bab11e1ad86e25
\ No newline at end of file
+7df82c46da437bc743576358c25e758280067df8
\ No newline at end of file

diff --git a/tool/showstat4.c b/tool/showstat4.c
index 668d2106af270a06fbe17c59d1bdf0f1e06e7e58..215962919ed0798f3b28f9116d78106410fbedd6 100644 (file)
--- a/tool/showstat4.c
+++ b/tool/showstat4.c
@@ -39,6 +39,7 @@ int main(int argc, char **argv){
   int nSample;
   i64 iVal;
   const char *zSep;
+  int iRow = 0;
 
   if( argc!=2 ){
     fprintf(stderr, "Usage: %s DATABASE-FILE\n", argv[0]);
@@ -60,13 +61,13 @@ int main(int argc, char **argv){
   }
   while( SQLITE_ROW==sqlite3_step(pStmt) ){
     if( zIdx==0 || strcmp(zIdx, (const char*)sqlite3_column_text(pStmt,0))!=0 ){
-      if( zIdx ) printf("\n");
+      if( zIdx ) printf("\n**************************************"
+                        "**************\n\n");
       sqlite3_free(zIdx);
       zIdx = sqlite3_mprintf("%s", sqlite3_column_text(pStmt,0));
-      printf("%s:\n", zIdx);
-    }else{
-      printf("  -----------------------------------------------------------\n");
+      iRow = 0;
     }
+    printf("%s sample %d ------------------------------------\n", zIdx, ++iRow);
     printf("  nEq    = %s\n", sqlite3_column_text(pStmt,1));
     printf("  nLt    = %s\n", sqlite3_column_text(pStmt,2));
     printf("  nDLt   = %s\n", sqlite3_column_text(pStmt,3));