Avoid long delays that can occur when ".recover"ing data from a database with a corru...

FossilOrigin-Name: 20f06bf2e659212a68dcf138e444da7bd4220548ec15a97cfd7eb82e028b3630

diff --git a/manifest b/manifest
index df8dca63d0e25022cdabd1f6037d3456d12eaa0d..18555bfa0ac3d5cf88c41c4ea46e67818f230025 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdebugging\soutput\sfrom\sthe\sOP_MakeRecord\sopcode.
-D 2019-05-09T16:22:51.204
+C Avoid\slong\sdelays\sthat\scan\soccur\swhen\s".recover"ing\sdata\sfrom\sa\sdatabase\swith\sa\scorrupt\sfreelist.
+D 2019-05-09T16:57:39.190
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -522,7 +522,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 408632d9531ca8f1df8591f00530797daaa7bde3fe0d3211de4d431cbb99347e
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c ef860c7e5882c89c030432a6d2cf13c67d1d51fd511cf45cbdfd5c2faf44d51d
-F src/shell.c.in f5d3a1f3f99a198bb8335461f1426eec72092786c20f4937d842b6f4988a8f1a
+F src/shell.c.in 6aa1d26eb46ec11ed1ca300e425e7a0d36f915ca94f07f6e47f13d390e897823
 F src/sqlite.h.in 0605c88d98c85fbcba8bbd9716e7cc10b361e7b21cf2375171130f577388c943
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -1825,7 +1825,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 5cd728fb6b3a70f795306d4d6e12151a4de327f801733a8558139e3cd76fe66a
-R 94a11799ce99547c8388638d55d2efb8
-U drh
-Z 61ac47a2d0ae07669269cf3a1070857c
+P ac790729d9c8f8612936bab56dca6061408007bc2150ac8c7089132403d7f885
+R 6e5edbee3c41d65385191dd600b1b4bf
+U dan
+Z 90af5c9a4f9287285acd46f3e2e8c7ab

diff --git a/manifest.uuid b/manifest.uuid
index 52e69a97dbc7a9f4ee44fc55f7fba4d1eda70855..7a6c89caeabccdb1fcc0928ddc7ad326e26b17e3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ac790729d9c8f8612936bab56dca6061408007bc2150ac8c7089132403d7f885
\ No newline at end of file
+20f06bf2e659212a68dcf138e444da7bd4220548ec15a97cfd7eb82e028b3630
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 1fe216557e300b68658d02ef07108ca23e710951..78f1cd9df059434ed43d3f7844910ccb8f176a16 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -6579,7 +6579,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
       "      FROM trunk WHERE x>0"
       "),"
       "freelist(data, n, freepgno) AS ("
-      "  SELECT data, shell_int32(data, 1)-1, t.pgno "
+      "  SELECT data, min(16384, shell_int32(data, 1)-1), t.pgno "
       "      FROM trunk t, sqlite_dbpage s WHERE s.pgno=t.pgno"
       "    UNION ALL"
       "  SELECT data, n-1, shell_int32(data, 2+n) "