From 6034b1e07e9f59621e46be9dd0aa463fe373e4e5 Mon Sep 17 00:00:00 2001 From: pweilbacher Date: Wed, 13 Feb 2008 23:48:02 +0000 Subject: [PATCH] always use random access mode when opening files (like on Windows) (CVS 4784) FossilOrigin-Name: 9f4da1013b558fcabadc3a3bec6bcdae9b06399e --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_os2.c | 11 ++--------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index d87aedc6ca..68f3ec81f4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Where\spossible,\savoid\sfreeing\sbuffers\sallocated\sfor\svdbe\smemory\scells\sin\scase\sthey\scan\sbe\sreused.\s(CVS\s4783) -D 2008-02-13T18:25:27 +C always\suse\srandom\saccess\smode\swhen\sopening\sfiles\s(like\son\sWindows)\s(CVS\s4784) +D 2008-02-13T23:48:03 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in bc2b5df3e3d0d4b801b824b7ef6dec43812b049b F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -117,7 +117,7 @@ F src/mutex_w32.c 6e197765f283815496193e78e9548b5d0e53b68e F src/os.c 2f2753b8d33f79d169c43d6bb0b25b3c58fd33de F src/os.h d04706d54a072c7a30ab9e346ad916ef28c842d5 F src/os_common.h 98862f120ca6bf7a48ce8b16f158b77d00bc9d2f -F src/os_os2.c bf1cd3d4f42c1b1ab059c12732cd9f7be4e718a6 +F src/os_os2.c c87c6501bd90896cfca822a4e4d0ac5a79726833 F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 @@ -617,7 +617,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 5ab71c3a79cac04cb2c576f83a62218d05571006 -R c1dd02f73a73bb7e12988703f2d12663 -U danielk1977 -Z 2dff5d02e45b3ba8d57e28cad43b1b4e +P 990237e27e417aff3dbf05784b716c21f3761a3a +R 3788206f84973cfe13dcb12194a04a3f +U pweilbacher +Z e273b159944d84bb5a06e978a939110a diff --git a/manifest.uuid b/manifest.uuid index 6137d5bb89..4eca3aa07e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -990237e27e417aff3dbf05784b716c21f3761a3a \ No newline at end of file +9f4da1013b558fcabadc3a3bec6bcdae9b06399e \ No newline at end of file diff --git a/src/os_os2.c b/src/os_os2.c index d5e3382468..5a5f1fad62 100644 --- a/src/os_os2.c +++ b/src/os_os2.c @@ -641,15 +641,8 @@ static int os2Open( OSTRACE1( "OPEN normal file attribute\n" ); } - //ulOpenMode |= flags & (SQLITE_OPEN_MAIN_DB | SQLITE_OPEN_TEMP_DB) ? - // OPEN_FLAGS_RANDOM : OPEN_FLAGS_SEQUENTIAL; - if( flags & (SQLITE_OPEN_MAIN_DB | SQLITE_OPEN_TEMP_DB) ){ - ulOpenMode |= OPEN_FLAGS_RANDOM; - OSTRACE1( "OPEN random access\n" ); - }else{ - ulOpenMode |= OPEN_FLAGS_SEQUENTIAL; - OSTRACE1( "OPEN sequential access\n" ); - } + /* always open in random access mode for possibly better speed */ + ulOpenMode |= OPEN_FLAGS_RANDOM; ulOpenMode |= OPEN_FLAGS_FAIL_ON_ERROR; rc = DosOpen( (PSZ)zName, -- 2.47.3