Lower the default SQLITE_SORTER_PMASZ value back to 10, where it has been for

the past couple of releases.  Applications that need a larger value can set
one.

FossilOrigin-Name: 1ba8911c18f2fe34c20dc42f25a8f3c1c798fa7a

diff --git a/manifest b/manifest
index a3d0a725cf2bf4e5e8693bd91d3340967d1771f6..b0f6c74e0a4a63a925a707ac48213f1fb273315c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\ssqlite3_table_column_metadata()\sinterface\savailable\sby\sdefault\sand\nwithout\srequiring\sthe\sSQLITE_ENABLE_COLUMN_METADATA\scompile-time\soption.\nOther\ssqlite3_column_*\sinterfaces\sthat\shave\sa\srun-time\spenalty\seven\sif\sthey\nare\sunused\sstill\srequire\sthe\sSQLITE_ENABLE_COLUMN_METADATA\soption\sat\ncompile-time.
-D 2014-12-09T19:07:29.805
+C Lower\sthe\sdefault\sSQLITE_SORTER_PMASZ\svalue\sback\sto\s10,\swhere\sit\shas\sbeen\sfor\nthe\spast\scouple\sof\sreleases.\s\sApplications\sthat\sneed\sa\slarger\svalue\scan\sset\none.
+D 2014-12-09T19:16:41.997
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -298,7 +298,7 @@ F src/vdbeapi.c 07acb615d1e4170e71fc1b0d087f3c53a1ad8e83
 F src/vdbeaux.c 6f7f39c3fcf0f5923758df8561bb5d843908a553
 F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
-F src/vdbesort.c db015e20a77b25eca4d1e125815f4998a3ca1354
+F src/vdbesort.c c150803a3e98fbc68bd07772cbbd4328a0a7212d
 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
 F src/wal.c 847692349eb6e1fb8543dbc97e69ddbfa4cc7ea7
@@ -1226,7 +1226,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 75a803e694d2c4e67579f45d54a0aaf120411a6e
-R 9dd53b5b296f2bafeeb64e18470c82ee
+P 4f7549ff924b8ed8f90fc447cd4be11421453984
+R 07540d2951e499e9ba9f784727d9cc12
 U drh
-Z b9a2aab60506af9678a60cdb34c9d56c
+Z 7254b0c65f796e3de7bb7b37671c0413

diff --git a/manifest.uuid b/manifest.uuid
index c4f34c586def4cc0e90af6daecd3d645a8ddbb1e..f4de208a5d7f8be7a4d53e3ff7cee4f44343b64c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f7549ff924b8ed8f90fc447cd4be11421453984
\ No newline at end of file
+1ba8911c18f2fe34c20dc42f25a8f3c1c798fa7a
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index 29ec40c0d153aed2d93fd2e1c3d063deedd9bcb6..78ecc1efb934d0becc1046aa96d1f08fe94445ae 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -451,7 +451,7 @@ struct SorterRecord {
 /* The minimum PMA size is set to this value multiplied by the database
 ** page size in bytes.  */
 #ifndef SQLITE_SORTER_PMASZ
-# define SQLITE_SORTER_PMASZ 250
+# define SQLITE_SORTER_PMASZ 10
 #endif
 
 /* Maximum number of PMAs that a single MergeEngine can merge */