Cleanup the hash functions in FTS2.

Backports (4440) from fts3. (CVS 5452)

FossilOrigin-Name: e31d2f875c13ee41742c9aaee6291662cdbbf863

diff --git a/ext/fts2/fts2_hash.c b/ext/fts2/fts2_hash.c
index fcd5cc2fd812c7c4d8c5cc0b81158b4719da64ea..7fcafcf3e4e7d8ee0ba83498056a0e4ad549c4e4 100644 (file)
--- a/ext/fts2/fts2_hash.c
+++ b/ext/fts2/fts2_hash.c
@@ -31,13 +31,19 @@
 
 #include "fts2_hash.h"
 
-static void *malloc_and_zero(int n){
-  void *p = malloc(n);
+/*
+** Malloc and Free functions
+*/
+static void *fts2HashMalloc(int n){
+  void *p = sqlite3_malloc(n);
   if( p ){
     memset(p, 0, n);
   }
   return p;
 }
+static void fts2HashFree(void *p){
+  sqlite3_free(p);
+}
 
 /* Turn bulk memory into a hash table object by initializing the
 ** fields of the Hash structure.
@@ -58,8 +64,6 @@ void sqlite3Fts2HashInit(fts2Hash *pNew, int keyClass, int copyKey){
   pNew->count = 0;
   pNew->htsize = 0;
   pNew->ht = 0;
-  pNew->xMalloc = malloc_and_zero;
-  pNew->xFree = free;
 }
 
 /* Remove all entries from a hash table.  Reclaim all memory.
@@ -72,15 +76,15 @@ void sqlite3Fts2HashClear(fts2Hash *pH){
   assert( pH!=0 );
   elem = pH->first;
   pH->first = 0;
-  if( pH->ht ) pH->xFree(pH->ht);
+  fts2HashFree(pH->ht);
   pH->ht = 0;
   pH->htsize = 0;
   while( elem ){
     fts2HashElem *next_elem = elem->next;
     if( pH->copyKey && elem->pKey ){
-      pH->xFree(elem->pKey);
+      fts2HashFree(elem->pKey);
     }
-    pH->xFree(elem);
+    fts2HashFree(elem);
     elem = next_elem;
   }
   pH->count = 0;
@@ -192,9 +196,9 @@ static void rehash(fts2Hash *pH, int new_size){
   int (*xHash)(const void*,int);   /* The hash function */
 
   assert( (new_size & (new_size-1))==0 );
-  new_ht = (struct _fts2ht *)pH->xMalloc( new_size*sizeof(struct _fts2ht) );
+  new_ht = (struct _fts2ht *)fts2HashMalloc( new_size*sizeof(struct _fts2ht) );
   if( new_ht==0 ) return;
-  if( pH->ht ) pH->xFree(pH->ht);
+  fts2HashFree(pH->ht);
   pH->ht = new_ht;
   pH->htsize = new_size;
   xHash = hashFunction(pH->keyClass);
@@ -260,9 +264,9 @@ static void removeElementGivenHash(
     pEntry->chain = 0;
   }
   if( pH->copyKey && elem->pKey ){
-    pH->xFree(elem->pKey);
+    fts2HashFree(elem->pKey);
   }
-  pH->xFree( elem );
+  fts2HashFree( elem );
   pH->count--;
   if( pH->count<=0 ){
     assert( pH->first==0 );
@@ -333,12 +337,12 @@ void *sqlite3Fts2HashInsert(
     return old_data;
   }
   if( data==0 ) return 0;
-  new_elem = (fts2HashElem*)pH->xMalloc( sizeof(fts2HashElem) );
+  new_elem = (fts2HashElem*)fts2HashMalloc( sizeof(fts2HashElem) );
   if( new_elem==0 ) return data;
   if( pH->copyKey && pKey!=0 ){
-    new_elem->pKey = pH->xMalloc( nKey );
+    new_elem->pKey = fts2HashMalloc( nKey );
     if( new_elem->pKey==0 ){
-      pH->xFree(new_elem);
+      fts2HashFree(new_elem);
       return data;
     }
     memcpy((void*)new_elem->pKey, pKey, nKey);
@@ -351,7 +355,7 @@ void *sqlite3Fts2HashInsert(
     rehash(pH,8);
     if( pH->htsize==0 ){
       pH->count = 0;
-      pH->xFree(new_elem);
+      fts2HashFree(new_elem);
       return data;
     }
   }

diff --git a/ext/fts2/fts2_hash.h b/ext/fts2/fts2_hash.h
index 97f35291cb03f6b60a1054dcb0e49809ead64ef8..571aa2c1c2a4a008f697bfd27b11839128923cf9 100644 (file)
--- a/ext/fts2/fts2_hash.h
+++ b/ext/fts2/fts2_hash.h
@@ -34,8 +34,6 @@ struct fts2Hash {
   char copyKey;           /* True if copy of key made on insert */
   int count;              /* Number of entries in this table */
   fts2HashElem *first;    /* The first element of the array */
-  void *(*xMalloc)(int);  /* malloc() function to use */
-  void (*xFree)(void *);  /* free() function to use */
   int htsize;             /* Number of buckets in the hash table */
   struct _fts2ht {        /* the hash table */
     int count;               /* Number of entries with this hash */

diff --git a/manifest b/manifest
index c96e0681a7831695030548edf0658b333820afe6..399ff67e19f1b07ecd035436212d4d7154943f77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Documentation\supdates.\s\sNo\schanges\sto\scode.\s(CVS\s5451)
-D 2008-07-22T18:45:09
+C Cleanup\sthe\shash\sfunctions\sin\sFTS2.\r\nBackports\s(4440)\sfrom\sfts3.\s(CVS\s5452)
+D 2008-07-22T22:15:48
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 77ff156061bb870aa0a8b3d545c670d08070f7e6
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -41,8 +41,8 @@ F ext/fts2/README.tokenizers 21e3684ea5a095b55d70f6878b4ce6af5932dfb7
 F ext/fts2/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
 F ext/fts2/fts2.c 015d44a43d2a3586cd31b29f7fc1c60f21628dc3
 F ext/fts2/fts2.h da5f76c65163301d1068a971fd32f4119e3c95fa
-F ext/fts2/fts2_hash.c cafebb4620d19684c4c9872530012441df60f503
-F ext/fts2/fts2_hash.h e283308156018329f042816eb09334df714e105e
+F ext/fts2/fts2_hash.c 25ad8043ce2e708840a8fb179b8ed04325f860eb
+F ext/fts2/fts2_hash.h 9a5b1be94664139f93217a0770d7144425cffb3a
 F ext/fts2/fts2_icu.c 45b54d1e075020b35db20f69d829f95ca0651111
 F ext/fts2/fts2_porter.c 98c9dbd1eed20032c03ce05877164e262567443e
 F ext/fts2/fts2_tokenizer.c 5cec41326fabe65323945a46fa9495ee85c3d5fd
@@ -608,7 +608,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c0a5cf38eea80640e42c612ce6f4850c98f70638
-R 4296aa63a77dd23807f217c5dc24b853
-U drh
-Z 141f4ca3973bdd37f521849dfab533e1
+P e58b49779bfd4a9e88e8c6b0a929c97167b718b3
+R b0e2e1084cef6fc9b84268ad60b73245
+U shess
+Z f00ba8339a7a0adb9edcff3819c5615c

diff --git a/manifest.uuid b/manifest.uuid
index 04a016e00ed52d9b7db747ae7725f9fbc5ecb2d5..2b2a763b5cc3a19cac3661d1b8d693805514a624 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e58b49779bfd4a9e88e8c6b0a929c97167b718b3
\ No newline at end of file
+e31d2f875c13ee41742c9aaee6291662cdbbf863
\ No newline at end of file