From: drh Date: Fri, 21 May 2010 18:24:06 +0000 (+0000) Subject: Comment out the SQLITE_FCNTL_SIZE_HINT from os_unix.c since it does not X-Git-Tag: version-3.7.2~351 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c527669df560befda372dff4af13dfafd307a52e;p=thirdparty%2Fsqlite.git Comment out the SQLITE_FCNTL_SIZE_HINT from os_unix.c since it does not seem to provide any performance gain there. FossilOrigin-Name: 7d01309da658d6b658c1b2e53bbdc5112fb0a4d9 --- diff --git a/manifest b/manifest index b5c7007617..26c17a3bc3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,8 @@ -C Correct\san\soff-by-one\sbug\sin\sthe\sprevious\scommit. -D 2010-05-21T16:23:44 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Comment\sout\sthe\sSQLITE_FCNTL_SIZE_HINT\sfrom\sos_unix.c\ssince\sit\sdoes\snot\s\nseem\sto\sprovide\sany\sperformance\sgain\sthere. +D 2010-05-21T18:24:07 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -152,7 +155,7 @@ F src/os.c 2285265f7e8035ba77e8e8ec93adf3c3c61fc60e F src/os.h efcc7f0072ae362b44eab8588b43a943da61504e F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19 -F src/os_unix.c 5c53b43c846ff417504e3000d331bd5326bb0b05 +F src/os_unix.c 35ace483789db8ede92acc46134930c2c4267645 F src/os_win.c 1e44ee84210b59db1e098bbbc66f6dee68e20d5f F src/pager.c d3284a6bbedeaa4ef3f5668af309d4381df97618 F src/pager.h 76466c3a5af56943537f68b1f16567101a0cd1d0 @@ -813,7 +816,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 36795c2b23a78978528cace193e386138adacd41 -R 63c928b9ccf2140d57615bbbd5e376ff -U dan -Z ffdf9334b2c259a667ae34031d21c40b +P 75a1130d86faf18e73cb46cda5d029f1e913e4e6 +R 839c593a17a6b567af49cdb7ef23c4db +U drh +Z 8d7556ec9f9935e65fbd17fdc1af5967 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFL9s/KoxKgR168RlERAuA2AJ4qgUiS8IHtHs0yl0ksOmtgd7JGxQCbBhTM +nKBnhjb7e+PupUPnzd4kGOI= +=H7pO +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index a8ae2d038b..745e064808 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -75a1130d86faf18e73cb46cda5d029f1e913e4e6 \ No newline at end of file +7d01309da658d6b658c1b2e53bbdc5112fb0a4d9 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 0a302a455c..6cb594478f 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3046,9 +3046,11 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){ return SQLITE_OK; } case SQLITE_FCNTL_SIZE_HINT: { +#if 0 /* No performance advantage seen on Linux */ sqlite3_int64 szFile = *(sqlite3_int64*)pArg; unixFile *pFile = (unixFile*)id; ftruncate(pFile->h, szFile); +#endif return SQLITE_OK; } #ifndef NDEBUG