When sqlite3_checker finds a problem, show the row key as part of the error

message, not the row index number.

FossilOrigin-Name: 6ffe917d10e298cd80cd3a8c8c5116a2819145a176fb8cfccd5dbd88b10f39df

diff --git a/ext/repair/sqlite3_checker.tcl b/ext/repair/sqlite3_checker.tcl
index d4aa84aa3be8b234b4211c923d683083345a5e29..25a5d252e654ed5f95aad5e7506ffb200c578c12 100644 (file)
--- a/ext/repair/sqlite3_checker.tcl
+++ b/ext/repair/sqlite3_checker.tcl
@@ -61,7 +61,7 @@ proc check_index {idxname batchsize} {
            puts -nonewline "$idxname: "
         }
         incr nerr
-        puts "row $i: $errmsg"
+        puts "key($key): $errmsg"
       }
       incr i
     }

diff --git a/manifest b/manifest
index a675da0f123908bf888b74b095e9278578b47039..222cd771137e2f26b03a3bee33f2b6fa99171c0c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Actually\sperform\sindex\schecks\swhen\srunning\ssqlite3_checker
-D 2017-11-01T01:01:20.360
+C When\ssqlite3_checker\sfinds\sa\sproblem,\sshow\sthe\srow\skey\sas\spart\sof\sthe\serror\nmessage,\snot\sthe\srow\sindex\snumber.
+D 2017-11-01T01:05:42.000
 F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
@@ -330,7 +330,7 @@ F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b14469
 F ext/repair/checkfreelist.c 0abb84b4545016d57ba1a2aa8884c72c73ed838968909858c03bc1f38fb6b054
 F ext/repair/checkindex.c f33d90ed6a556ad03511f7932891c2fd47ad93ddc998a4ab8bb56f4adf6fb206
 F ext/repair/sqlite3_checker.c.in 16d62615dfce1ff3eeac83d1a77fe376a7b660afa9db07e1fdd8b964dcc41510
-F ext/repair/sqlite3_checker.tcl c7f68b0d2d2832d90a591c5cad936264c0d54cb2a06bee55d7e391d385fc7a1e
+F ext/repair/sqlite3_checker.tcl 1eb23dcc262fb8b6e869775dc06bdfba3931f5c2ea5bfd41188c0b84fa6e35a7
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/rtree.c cc91b6905bf55512c6ebc7dfdd37ac81c86f1753db8cfa6d62f0ee864464044f
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
@@ -1671,7 +1671,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 e82e883b93128e4d1105a82abe8d1860c0a15505b6ca421e187b9bbbc2fdc659
-R 6f23f39130aeaf4ea9f27fe6626dd3eb
+P 54530020260ea9e4cfd021f5ffccb74d78c469b717dce377d3df6eaf84b63719
+R 84bd4abb8e94f0df6079dbff9fcf5a09
 U drh
-Z cc97ad1013bf49d4724282a689bb05ce
+Z d157fe339c4385e31979ffec5d5c510b

diff --git a/manifest.uuid b/manifest.uuid
index 3e765dc206dd2444123e9a0b42df57c7404521c3..69455d17b6b709fd87545b5d593b4413976e742a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54530020260ea9e4cfd021f5ffccb74d78c469b717dce377d3df6eaf84b63719
\ No newline at end of file
+6ffe917d10e298cd80cd3a8c8c5116a2819145a176fb8cfccd5dbd88b10f39df
\ No newline at end of file