Fix typo and improve the wording of the description of "Metadata" in the

output of the sqlite3_analyzer tool.

FossilOrigin-Name: ca1ff70780e07e5ee930fe7972db02e887d9b085d8ab78e878d7f966b6d684d4

diff --git a/manifest b/manifest
index e98acb5f54eb6cd21772aa34976bc83bcf4c8817..45ac624396f334697da3c5641da079ef7bb18034 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sthe\sshell.c\sfile
-D 2017-06-15T13:07:56.351
+C Fix\stypo\sand\simprove\sthe\swording\sof\sthe\sdescription\sof\s"Metadata"\sin\sthe\noutput\sof\sthe\ssqlite3_analyzer\stool.
+D 2017-06-15T16:45:23.229
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -1541,7 +1541,7 @@ F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68
 F tool/showstat4.c b14159aa062f661b394ba37b6b7b94bfb8012ab9
 F tool/showwal.c ad9d768f96ca6199ad3a8c9562d679680bd032dd01204ea3e5ea6fb931d81847
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
-F tool/spaceanal.tcl a91e09e9e3dd10e67ffe4a01155161fb5e6b6d399002716593780493452c4b28
+F tool/spaceanal.tcl f40dc82b4d5e39d040a02a3ec38268e324068815e4292a15ffa30ee93208bbfd
 F tool/speed-check.sh 9630ba0468b609c52f48309243d4eb6e9c34deda
 F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
 F tool/speedtest16.c ecb6542862151c3e6509bbc00509b234562ae81e
@@ -1582,7 +1582,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 c7f778b7cee16a1dcebccd256408ee1d08ef2b62e388a9ebba5738a0a89bf3a0
-R 2abdc374b32c7bda232d41622d54318f
+P 9afd7a2ffd3a39456190ad05e85ff6485298aae262d9e0698a58c1d73507a36f
+R d7d9e08f1b748cb64c86b209b3f80ec6
 U drh
-Z 65a79c7805978f50bb15716d0b6d13ff
+Z ab25672babe6d73331acc6dc2b1d5532

diff --git a/manifest.uuid b/manifest.uuid
index 9e0af2d15423840291645351408eaf921405ceca..d899e0cce8a296bf17bd7ded41458b2f01594a26 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9afd7a2ffd3a39456190ad05e85ff6485298aae262d9e0698a58c1d73507a36f
\ No newline at end of file
+ca1ff70780e07e5ee930fe7972db02e887d9b085d8ab78e878d7f966b6d684d4
\ No newline at end of file

diff --git a/tool/spaceanal.tcl b/tool/spaceanal.tcl
index 0309e5f2f4a736fb5551473ba97229aceda84df0..9db108dc26bc802a899b8b29a2788dd3677f2013 100644 (file)
--- a/tool/spaceanal.tcl
+++ b/tool/spaceanal.tcl
@@ -766,12 +766,13 @@ Bytes of payload
 
 Bytes of metadata
 
-    The amount of formatting and structural information stored on for the
+    The amount of formatting and structural information stored in the
     table or index.  Metadata includes the btree page header, the cell pointer
     array, the size field for each cell, the left child pointer or non-leaf
     cells, the overflow pointers for overflow cells, and the rowid value for
-    rowid table cells.  In other words, metadata is everything that is not
-    unused space and that is not content.
+    rowid table cells.  In other words, metadata is everything that is neither
+    unused space nor content.  The record header in the payload is counted as
+    content, not metadata.
 
 Average payload per entry