Add the sqlite3PutVarint32 routine as an alternative to sqlite3PutVarint.

Gives 0.5% speed increase. (CVS 4968)

FossilOrigin-Name: b2517a7d8f7275943d44cc301f9d54fc8a4653e7

diff --git a/manifest b/manifest
index 952a1507faaf7992e4645089204bc2ca893c7b7c..7366a36a58a5dc0f951ee3a2d940bc8cacec741a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Smaller\sand\shopefully\sfaster\sroutine\sfor\sconverting\sblob\sliterals\sinto\sbinary.\s(CVS\s4967)
-D 2008-04-04T15:12:22
+C Add\sthe\ssqlite3PutVarint32\sroutine\sas\san\salternative\sto\ssqlite3PutVarint.\nGives\s0.5%\sspeed\sincrease.\s(CVS\s4968)
+D 2008-04-05T18:41:43
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -140,7 +140,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 22297fffa6f00a6c6d44020fa13b1184a1bb372d
 F src/sqlite.h.in 5364513316e0c36cb02b27c479643b400dbde9c7
 F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3
-F src/sqliteInt.h cfe0b6c4b1a9b4be22f856ca8058ccd1bf0e41a8
+F src/sqliteInt.h 0f571303e19ccd61b2112d9d2613cd36e2166e89
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/table.c 2c48c575dd59b3a6c5c306bc55f51a9402cf429a
 F src/tclsqlite.c d272cbd208f87712f67ae7462d2d6cffbb28a676
@@ -168,13 +168,13 @@ F src/test_schema.c 12c9de7661d6294eec2d57afbb52e2af1128084f
 F src/test_server.c a6ece6c835e7eae835054124e09e947e422b1ac5
 F src/test_tclvar.c b2d1115e4d489179d3f029e765211b2ad527ba59
 F src/test_thread.c e297dd41db0b249646e69f97d36ec13e56e8b730
-F src/tokenize.c d642f36a07e3c38703f52b609f13cd534897a57e
+F src/tokenize.c a96abe15a8db6fea2e964cdce2acba9ed17bc26f
 F src/trigger.c 9bd3b6fa0beff4a02d262c96466f752ec15a7fc3
 F src/update.c 6d5f7728ec254c4a36a06a744f45b232b2eef857
 F src/utf.c 8c94fa10efc78c2568d08d436acc59df4df7191b
-F src/util.c 9a435395c8e03fa0b1658f59ff44e552844ac6c6
+F src/util.c 02c57c302ef738ff5b554953c12d8f919e501583
 F src/vacuum.c 3524411bfb58aac0d87eadd3e5b7cd532772af30
-F src/vdbe.c 66ca98cce0f5776006eb5fcaa95a6d90b341646e
+F src/vdbe.c edee197463d2505e38e4bf23adca8306e919dd18
 F src/vdbe.h f72201a0657d5f3d6cc008d1f8d9cc65768518c9
 F src/vdbeInt.h 0b96efdeecb0803e504bf1c16b198f87c91d6019
 F src/vdbeapi.c ab6e99f8a6b7fcb82c2c698da7a36762a7593f0a
@@ -625,7 +625,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 9987a7b193095dc90a83666bdac5e23105909cba
-R ef205f0a77d72d2ab92875e08b608793
+P 92d49499ee3371db64267c7e2ba72a5e12ea76f3
+R af4a6a88bcb53a36e6b44d639f315a8f
 U drh
-Z c22c0013da67b67c72be28004cc0d047
+Z 3946a13aed6fbd48a24a47287ad78c71

diff --git a/manifest.uuid b/manifest.uuid
index 5c63cf53bb6ce9c16953f182d61da216f5a7105f..8754d3f5f464b4bc51ef7a2386d78083f38ed32a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-92d49499ee3371db64267c7e2ba72a5e12ea76f3
\ No newline at end of file
+b2517a7d8f7275943d44cc301f9d54fc8a4653e7
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index cc63a04cd34f3c624e32b446307308572d7d8732..e124031ebf589f4de9196b7245c9b7bdfea1d70b 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.688 2008/04/01 18:04:11 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.689 2008/04/05 18:41:43 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1981,7 +1981,8 @@ int sqlite3FitsIn64Bits(const char *, int);
 int sqlite3Utf16ByteLen(const void *pData, int nChar);
 int sqlite3Utf8CharLen(const char *pData, int nByte);
 int sqlite3Utf8Read(const u8*, const u8*, const u8**);
-int sqlite3PutVarint(unsigned char *, u64);
+int sqlite3PutVarint(unsigned char*, u64);
+int sqlite3PutVarint32(unsigned char*, u32);
 int sqlite3GetVarint(const unsigned char *, u64 *);
 int sqlite3GetVarint32(const unsigned char *, u32 *);
 int sqlite3VarintLen(u64 v);

diff --git a/src/tokenize.c b/src/tokenize.c
index 66bced6b6258dc5fde40c4eb8daf3a4e460f61b2..6a2beb0bb729d49a2369a005b7bf6b2305bf93c2 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.140 2008/04/03 21:42:21 drh Exp $
+** $Id: tokenize.c,v 1.141 2008/04/05 18:41:43 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -120,7 +120,7 @@ const char sqlite3IsEbcdicIdChar[] = {
 ** Return the length of the token that begins at z[0]. 
 ** Store the token type in *tokenType before returning.
 */
-static int getToken(const unsigned char *z, int *tokenType){
+int sqlite3GetToken(const unsigned char *z, int *tokenType){
   int i, c;
   switch( *z ){
     case ' ': case '\t': case '\n': case '\f': case '\r': {
@@ -370,9 +370,6 @@ static int getToken(const unsigned char *z, int *tokenType){
   *tokenType = TK_ILLEGAL;
   return 1;
 }
-int sqlite3GetToken(const unsigned char *z, int *tokenType){
-  return getToken(z, tokenType);
-}
 
 /*
 ** Run the parser on the given SQL string.  The parser structure is
@@ -412,7 +409,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
     assert( i>=0 );
     pParse->sLastToken.z = (u8*)&zSql[i];
     assert( pParse->sLastToken.dyn==0 );
-    pParse->sLastToken.n = getToken((unsigned char*)&zSql[i],&tokenType);
+    pParse->sLastToken.n = sqlite3GetToken((unsigned char*)&zSql[i],&tokenType);
     i += pParse->sLastToken.n;
     if( i>mxSqlLen ){
       pParse->rc = SQLITE_TOOBIG;

diff --git a/src/util.c b/src/util.c
index ef899aa43be742c221717cd8146c6e7a18319911..22046dad659addb0509bbf658a0643242e98fbc9 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.218 2008/04/04 15:12:22 drh Exp $
+** $Id: util.c,v 1.219 2008/04/05 18:41:43 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -497,6 +497,24 @@ int sqlite3PutVarint(unsigned char *p, u64 v){
   return n;
 }
 
+/*
+** This routine is a faster version of sqlite3PutVarint() that only
+** works for 32-bit positive integers and which is optimized for
+** the common case of small integers.
+*/
+int sqlite3PutVarint32(unsigned char *p, u32 v){
+  if( (v & ~0x7f)==0 ){
+    p[0] = v;
+    return 1;
+  }else if( (v & ~0x3fff)==0 ){
+    p[0] = (v>>7) | 0x80;
+    p[1] = v & 0x7f;
+    return 2;
+  }else{
+    return sqlite3PutVarint(p, v);
+  }
+}
+
 /*
 ** Read a 64-bit variable-length integer from memory starting at p[0].
 ** Return the number of bytes read.  The value is stored in *v.

diff --git a/src/vdbe.c b/src/vdbe.c
index b90ba511a18dfba9302057fa19df631dd7f900ba..793e1211943fd2c7bd39da15b237e05f808197a5 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.727 2008/04/03 20:09:07 drh Exp $
+** $Id: vdbe.c,v 1.728 2008/04/05 18:41:43 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2236,10 +2236,10 @@ case OP_MakeRecord: {
   zNewRecord = (u8 *)pOut->z;
 
   /* Write the record */
-  i = sqlite3PutVarint(zNewRecord, nHdr);
+  i = sqlite3PutVarint32(zNewRecord, nHdr);
   for(pRec=pData0; pRec<=pLast; pRec++){
     serial_type = sqlite3VdbeSerialType(pRec, file_format);
-    i += sqlite3PutVarint(&zNewRecord[i], serial_type);      /* serial type */
+    i += sqlite3PutVarint32(&zNewRecord[i], serial_type);      /* serial type */
   }
   for(pRec=pData0; pRec<=pLast; pRec++){  /* serial data */
     i += sqlite3VdbeSerialPut(&zNewRecord[i], nByte-i, pRec, file_format);