mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor optimizations. (CVS 4955)

Browse Source 
FossilOrigin-Name: e8529455803e0dab167f4faba5846fa1eafef741
This commit is contained in:
drh 2008-04-02 18:33:07 +00:00
parent 6a9ad3da22
commit 41eb9e9986
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Simplifications\sto\sthe\sLockTable\sopcode.\s(CVS\s4954) C Minor\soptimizations.\s(CVS\s4955)
D 2008-04-02T16:29:31 D 2008-04-02T18:33:08
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in b861627d91df5ee422c54237aa38296954dc0151 F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -86,7 +86,7 @@ F src/attach.c bdc75e759ca25a16f4dc7fbdbc6d37ad2561bb24
F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
F src/bitvec.c 49817d442e51e4123585f3cf3c2afc293a3c91e2 F src/bitvec.c 49817d442e51e4123585f3cf3c2afc293a3c91e2
F src/btmutex.c 483ced3c52205b04b97df69161fadbf87f4f1ea2 F src/btmutex.c 483ced3c52205b04b97df69161fadbf87f4f1ea2
F src/btree.c 00cc20be5ca9aabf36a6578d3945294eba2aea95 F src/btree.c 680c357b178146dd37910f42f9e6e8a2a7b1e61d
F src/btree.h c66cb17c6fffa84a88926dbef173bab4ae692fd4 F src/btree.h c66cb17c6fffa84a88926dbef173bab4ae692fd4
F src/btreeInt.h 8a2718652ed9413dc6acbb02a5c5a23a35a6e983 F src/btreeInt.h 8a2718652ed9413dc6acbb02a5c5a23a35a6e983
F src/build.c 5d36a6041202a1f3a8b2eee3a631cbce74e5f696 F src/build.c 5d36a6041202a1f3a8b2eee3a631cbce74e5f696
@ -98,7 +98,7 @@ F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
F src/expr.c acc695135dc7f7a3080139ae48c16b92d1fa54fb F src/expr.c acc695135dc7f7a3080139ae48c16b92d1fa54fb
F src/fault.c 83057e86815d473e526f7df0b0108dfdd022ff23 F src/fault.c 83057e86815d473e526f7df0b0108dfdd022ff23
F src/func.c c9e8c7ff4c45027edee89bde7adbf86a3a3b2afe F src/func.c c9e8c7ff4c45027edee89bde7adbf86a3a3b2afe
F src/hash.c 53655c312280211444bfe23af6490a460aec2980 F src/hash.c 522a8f5a23cf18fe5845afee7263c5be76c25ca2
F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53 F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
F src/insert.c 6974a1d02f2dcd616d00eef4996d4872495fad0f F src/insert.c 6974a1d02f2dcd616d00eef4996d4872495fad0f
F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2 F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2
@ -621,7 +621,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 846f9739d3e288dc81e40f5bfab046bd80bb22b2 P 66c5d715bbb732b0861a8a6f994cb4a8f259f2f8
R b5b81be90c9f85b4a5bfa0dee7823251 R dd2bdb1a317a2780511925890196cf96
U drh U drh
Z 7b266a6dff6de99012c6173c0f15f9bd Z c96cbc0506d0e982c38b7e2dc6d52960

2
manifest.uuid
View File

@ -1 +1 @@
66c5d715bbb732b0861a8a6f994cb4a8f259f2f8 e8529455803e0dab167f4faba5846fa1eafef741

13
src/btree.c
View File

@ -9,7 +9,7 @@
** May you share freely, never taking more than you give. ** May you share freely, never taking more than you give.
** **
************************************************************************* *************************************************************************
** $Id: btree.c,v 1.449 2008/04/02 16:29:31 drh Exp $ ** $Id: btree.c,v 1.450 2008/04/02 18:33:08 drh Exp $
** **
** This file implements a external (disk-based) database using BTrees. ** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information. ** See the header comment on "btreeInt.h" for additional information.
@ -3671,12 +3671,13 @@ int sqlite3BtreeMoveto(
pCell += getVarint32(pCell, &dummy); pCell += getVarint32(pCell, &dummy);
} }
getVarint(pCell, (u64*)&nCellKey); getVarint(pCell, (u64*)&nCellKey);
if( nCellKey<nKey ){ if( nCellKey==nKey ){
c = -1;
}else if( nCellKey>nKey ){
c = +1;
}else{
c = 0; c = 0;
}else if( nCellKey<nKey ){
c = -1;
}else{
assert( nCellKey>nKey );
c = +1;
} }
}else{ }else{
int available; int available;

6
src/hash.c
View File

@ -12,7 +12,7 @@
** This is the implementation of generic hash-tables ** This is the implementation of generic hash-tables
** used in SQLite. ** used in SQLite.
** **
** $Id: hash.c,v 1.26 2008/02/18 22:24:58 drh Exp $ ** $Id: hash.c,v 1.27 2008/04/02 18:33:08 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <assert.h> #include <assert.h>
@ -53,7 +53,7 @@ void sqlite3HashClear(Hash *pH){
assert( pH!=0 ); assert( pH!=0 );
elem = pH->first; elem = pH->first;
pH->first = 0; pH->first = 0;
if( pH->ht ) sqlite3_free(pH->ht); sqlite3_free(pH->ht);
pH->ht = 0; pH->ht = 0;
pH->htsize = 0; pH->htsize = 0;
while( elem ){ while( elem ){
@ -238,7 +238,7 @@ static void rehash(Hash *pH, int new_size){
sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 0); sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 0);
if( new_ht==0 ) return; if( new_ht==0 ) return;
if( pH->ht ) sqlite3_free(pH->ht); sqlite3_free(pH->ht);
pH->ht = new_ht; pH->ht = new_ht;
pH->htsize = new_size; pH->htsize = new_size;
xHash = hashFunction(pH->keyClass); xHash = hashFunction(pH->keyClass);