Make the size of a Bitvec object 512 bytes on all platforms, instead of

having the size depend on the size of a pointer.  This makes testing easier.

FossilOrigin-Name: ca479f3de2927ccc05dc76d10e40c00b8e0c88d1

diff --git a/manifest b/manifest
index fa53325a5645cb232e0bffc86e7cdcc20bbda839..2057083d8f2100b180778523e34fc1a659dfa71b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Do\snot\sread\sthe\sdatabase\sfile\ssize\son\sa\sSAVEPOINT\srollback\sany\smore\ssince\nafter\scheckin\s[65b8636ac6e5]\sthe\sin-header-size\sfield\sis\salways\svalid.
-D 2010-08-05T03:21:40
+C Make\sthe\ssize\sof\sa\sBitvec\sobject\s512\sbytes\son\sall\splatforms,\sinstead\sof\nhaving\sthe\ssize\sdepend\son\sthe\ssize\sof\sa\spointer.\s\sThis\smakes\stesting\seasier.
+D 2010-08-05T11:56:01
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -114,7 +114,7 @@ F src/analyze.c 3642ebcd13f1ffb5773b9e08910e0492ec4cf946
 F src/attach.c 17bec1f18254d9341369f20f90ba24ce35d20d10
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 51d83300fe0baee39405c416ceb19a58ed30a8ed
-F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
+F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
 F src/btree.c 63eebba7bd87207556670139eae5ef6c1f8bb416
 F src/btree.h b4ba2fdf6b64c7c376bdfffa826af6b786b151d9
@@ -844,14 +844,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 309bbedf9648c750d7b8aedbc15d4fd68f846824
-R bda8b5590c04c7d8c36202547873a81d
+P fbe70e1106bcc5086ceb9d8f39cc39baf3643092
+R a25d4976c28303b9ae9125c186188014
 U drh
-Z 8bb9067ef709f53cb1b5f1b652ca859d
+Z 8f5efa6fecfd7fa3fad1ed81decfa1dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMWi5HoxKgR168RlERAlXwAJ9qH3avuE8PBfX9m6PAH1EzBknHOgCfXXO6
-/hMYcMneW5BDk2aaY4BAU3Q=
-=bhUe
+iD8DBQFMWqbVoxKgR168RlERAscFAJ45yMty4Qnb2iMTPTMkwlnUoOKhngCfQYvQ
+vojbw1sglMnSTmStMZz2HhI=
+=ZUPy
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 148593a12568009c14bf7aed8cc68ca59558a64f..7b55127e1c13cfe1cb023b6743642264871fe631 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fbe70e1106bcc5086ceb9d8f39cc39baf3643092
\ No newline at end of file
+ca479f3de2927ccc05dc76d10e40c00b8e0c88d1
\ No newline at end of file

diff --git a/src/bitvec.c b/src/bitvec.c
index c0e25a4e69ad22a5631d508f5563b68b95107aeb..47d33ea840833e575464c853f501e7c60ef1bde6 100644 (file)
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -37,7 +37,7 @@
 #include "sqliteInt.h"
 
 /* Size of the Bitvec structure in bytes. */
-#define BITVEC_SZ        (sizeof(void*)*128)  /* 512 on 32bit.  1024 on 64bit */
+#define BITVEC_SZ        512
 
 /* Round the union size down to the nearest pointer boundary, since that's how 
 ** it will be aligned within the Bitvec struct. */