-C Fix\sfor\sticket\s#1575.\s(CVS\s2844)
-D 2005-12-29T12:53:10
+C Add\sserial-types\s8\sand\s9\sfor\sinteger\sconstants\sof\s0\sand\s1\sthat\suse\szero\nbytes\sof\sstorage.\s\sMake\sthe\sdefault\sfile\sformat\s4.\s\sAdd\sthe\nSQLITE_DEFAULT_FILE_FORMAT\scompile-time\soption\sto\slower\sthe\sdefault\nfile\sformat\snumber\sso\sthat\snewly\screated\sdatabases\scan\sbe\sread\sand\nwritten\sby\solder\sversions\sof\sSQLite.\s(CVS\s2845)
+D 2005-12-29T19:23:07
F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102
F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
F src/auth.c 31e2304bef67f44d635655f44234387ea7d21454
F src/btree.c 2b2651e0f6f9f8c5976b662fbfab7fc8f54f02c9
F src/btree.h 8ff86378bb5af0cde282614c16bf0c0190b6d216
-F src/build.c 88a441416fb28139fa24fd0fa34288c618c2b3fc
+F src/build.c 0982b00aeab443c1469ff83f54df4b383247ca92
F src/callback.c 62066afd516f220575e81b1a1239ab92a2eae252
F src/complete.c df1681cef40dec33a286006981845f87b194e7a4
F src/date.c bb079317bff6a2b78aba5c0d2ddae5f6f03acfb7
F src/pager.h e0acb095b3ad0bca48f2ab00c87346665643f64f
F src/parse.y 13343510907419ecd2fe72a245f9880df9a7dc20
F src/pragma.c 8883b4d34796efa315bdd0ec1b03f580ef1575b9
-F src/prepare.c 1417a396efe55e2767f9f97f694d21b8cac2f4d6
+F src/prepare.c 1f2bf83038792294ef4a307d95993f90e6c70561
F src/printf.c f47a2f4b5387cd2ebb12e9117a1a5d6bd9a2b812
F src/random.c ff5e9a8cad790e2a51cd4d2e7737dc8540e09d1d
F src/select.c 2292b065bc6be61e01aad39a2e1b93e332fb7e57
F src/shell.c 66b073375efbdee19045e7e0cd38b85f9aff71da
F src/sqlite.h.in 015e02efa9e8bafa31b6c270116369ddff4e9803
-F src/sqliteInt.h 361a613a1b7b1bdf1f040f11fd82e2c3a80a4259
+F src/sqliteInt.h e3a49f17bd7cb6d3bf33d53d2fdb4e5d69c18e67
F src/table.c 486dcfce532685b53b5a2b5da8bba0ded6fb2316
F src/tclsqlite.c ce481c0a21a20641cdfe87c9cbbb328cfb3a58b9
F src/test1.c 4691cc7235683324791a0be560308ca338de36de
F src/utf.c b7bffac4260177ae7f83c01d025fe0f5ed70ce71
F src/util.c a690bbf549fc5c465384f624e90c009935b6d18b
F src/vacuum.c fbfdd3967fd34e2f260fafed88dcbf3c10856b94
-F src/vdbe.c c04d2e517e7b515993164f51a3a8fb0958b7f4ce
+F src/vdbe.c 8b0d676bcd8d8b12606f684ea2d7934147b40101
F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
-F src/vdbeInt.h 7b8b8c5dcb203243e4a9a4414c9e488473f67741
+F src/vdbeInt.h 9b78ba00cc006bff17e04a54ba3ded9fc7810a10
F src/vdbeapi.c b270b680cbc5d20b5a1abfdb08339667985df94e
-F src/vdbeaux.c 8fd4f36dba8729fabe7ed6b2a2c1b05b7bf96ebe
+F src/vdbeaux.c 9dc10a70f0f697b9ede43237522e93ef863763e1
F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
F src/vdbemem.c deba8d6e3727643924b210a8c531a496c2b8d386
F src/where.c 0296a20c2e2a39c0cb785efe471fd1958a5259f3
F test/delete.test e08ffb452f581d58703d0294242c9e2b8d091916
F test/delete2.test e382b6a97787197eb8b93dd4ccd37797c3725ea3
F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
-F test/descidx1.test 8e9c3b91fd70d7a781d4081d8a62e24b7fd88aef
-F test/descidx2.test c68734d4068b7f7039deb9586cf0117b86c0d850
+F test/descidx1.test 466a9b87f3a7682156916dcbd5b77be55fd39d75
+F test/descidx2.test f9f73c562932b81207faa525cd52acdfd2fc0482
F test/diskfull.test d828d72adfc9e2d1a194d25996718c1989152cf9
F test/distinctagg.test 2b89d1c5220d966a30ba4b40430338669301188b
F test/enc.test 7a03417a1051fe8bc6c7641cf4c8c3f7e0066d52
F test/trigger5.test 619391a3e9fc194081d22cefd830d811e7badf83
F test/trigger6.test 0e411654f122552da6590f0b4e6f781048a4a9b9
F test/trigger7.test 0afa870be2ce1b132cdb85b17a4a4ef45aa8cece
-F test/types.test 77b9cfe18dd9089f731bc4306dcc2ff079a8c1e0
+F test/types.test effd31af136981ab970f72951ef33f4f62297a63
F test/types2.test 81dd1897be8ef4b5b73d0006e6076abe40610de3
F test/types3.test e5f789503849294de74a23b433168e8211523a25
F test/unique.test 0253c4227a5dc533e312202ce21ecfad18058d18
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P a4c547de83d8b27f06a58f9e530a7c983ec1dc3a
-R d2eb26dccbd5fff18c55c4a521df8e83
+P 1586921b54da5ba3bea80e8e656a11d32996ab3a
+R bc4db2dc25be0402b8c9a8b5fd5e6e6b
U drh
-Z 8810d9bb0581dec82c81c2f588a4d368
+Z 530db925ca043764a717a222a6169115
-1586921b54da5ba3bea80e8e656a11d32996ab3a
\ No newline at end of file
+ae301db8a61a74bc72f67f5766811d89a3b3ec72
\ No newline at end of file
** COMMIT
** ROLLBACK
**
-** $Id: build.c,v 1.362 2005/12/29 01:11:37 drh Exp $
+** $Id: build.c,v 1.363 2005/12/29 19:23:07 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
sqlite3VdbeAddOp(v, OP_ReadCookie, iDb, 1); /* file_format */
lbl = sqlite3VdbeMakeLabel(v);
sqlite3VdbeAddOp(v, OP_If, 0, lbl);
- sqlite3VdbeAddOp(v, OP_Integer, 1, 0); /* file format defaults to 1 */
+ sqlite3VdbeAddOp(v, OP_Integer, SQLITE_DEFAULT_FILE_FORMAT, 0);
sqlite3VdbeAddOp(v, OP_SetCookie, iDb, 1);
sqlite3VdbeAddOp(v, OP_Integer, db->enc, 0);
sqlite3VdbeAddOp(v, OP_SetCookie, iDb, 4);
Token nullId; /* Fake token for an empty ID list */
DbFixer sFix; /* For assigning database names to pTable */
int sortOrderMask; /* 1 to honor DESC in index. 0 to ignore. */
- int descSeen = 0; /* Changes to true if a DESC is seen */
sqlite3 *db = pParse->db;
Db *pDb; /* The specific table containing the indexed database */
int iDb; /* Index of the database that is being written */
/* Check to see if we should honor DESC requests on index columns
*/
- if( pDb->file_format>=4 || (!pDb->descIndex && !db->init.busy) ){
+ if( pDb->file_format>=4 ){
sortOrderMask = -1; /* Honor DESC */
}else{
sortOrderMask = 0; /* Ignore DESC */
){
goto exit_create_index;
}
- requestedSortOrder = pListItem->sortOrder;
- pDb->descIndex |= requestedSortOrder;
- requestedSortOrder &= sortOrderMask;
+ requestedSortOrder = pListItem->sortOrder & sortOrderMask;
pIndex->keyInfo.aSortOrder[i] = requestedSortOrder;
- descSeen |= requestedSortOrder;
}
pIndex->keyInfo.nField = pList->nExpr;
sqlite3DefaultRowEst(pIndex);
sqlite3VdbeAddOp(v, OP_CreateIndex, iDb, 0);
sqlite3VdbeAddOp(v, OP_MemStore, iMem, 0);
- /* Make sure the file_format is at least 4 if we have DESC indices. */
- if( descSeen ){
- sqlite3MinimumFileFormat(pParse, iDb, 4);
- }
-
/* Gather the complete text of the CREATE INDEX statement into
** the zStmt variable
*/
** interface, and routines that contribute to loading the database schema
** from disk.
**
-** $Id: prepare.c,v 1.10 2005/12/16 01:06:17 drh Exp $
+** $Id: prepare.c,v 1.11 2005/12/29 19:23:07 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
** file_format==1 Version 3.0.0.
** file_format==2 Version 3.1.3. // ALTER TABLE ADD COLUMN
** file_format==3 Version 3.1.4. // ditto but with non-NULL defaults
- ** file_format==4 Version 3.3.0. // DESC indices
+ ** file_format==4 Version 3.3.0. // DESC indices. Boolean constants
*/
pDb->file_format = meta[1];
if( pDb->file_format==0 ){
pDb->file_format = 1;
}
- if( pDb->file_format>4 ){
+ if( pDb->file_format>SQLITE_MAX_FILE_FORMAT ){
sqlite3BtreeCloseCursor(curMain);
sqlite3SetString(pzErrMsg, "unsupported file format", (char*)0);
return SQLITE_ERROR;
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqliteInt.h,v 1.443 2005/12/29 01:11:37 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.444 2005/12/29 19:23:07 drh Exp $
*/
#ifndef _SQLITEINT_H_
#define _SQLITEINT_H_
*/
#define SQLITE_MAX_VARIABLE_NUMBER 999
+/*
+** The "file format" number is an integer that is incremented whenever
+** the VDBE-level file format changes. The following macros define the
+** the default file format for new databases and the maximum file format
+** that the library can read.
+*/
+#define SQLITE_MAX_FILE_FORMAT 4
+#ifndef SQLITE_DEFAULT_FILE_FORMAT
+# define SQLITE_DEFAULT_FILE_FORMAT 4
+#endif
+
/*
** Provide a default value for TEMP_STORE in case it is not specified
** on the command-line
u8 inTrans; /* 0: not writable. 1: Transaction. 2: Checkpoint */
u8 safety_level; /* How aggressive at synching data to disk */
u8 file_format; /* Schema format version for this file */
- u8 descIndex; /* True if any index uses the DESC attribute */
int cache_size; /* Number of pages to use in the cache */
Table *pSeqTab; /* The sqlite_sequence table used by AUTOINCREMENT */
void *pAux; /* Auxiliary data. Usually NULL */
** 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.508 2005/12/21 18:36:46 drh Exp $
+** $Id: vdbe.c,v 1.509 2005/12/29 19:23:07 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
**
** See also OP_MakeIdxRec
*/
-/* Opcode: MakeRecordI P1 P2 P3
+/* Opcode: MakeIdxRec P1 P2 P3
**
** This opcode works just OP_MakeRecord except that it reads an extra
** integer from the stack (thus reading a total of abs(P1+1) entries)
int jumpIfNull; /* Jump here if non-zero and any entries are NULL. */
int addRowid; /* True to append a rowid column at the end */
char *zAffinity; /* The affinity string for the record */
+ int file_format; /* File format to use for encoding */
leaveOnStack = ((pOp->p1<0)?1:0);
nField = pOp->p1 * (leaveOnStack?-1:1);
pData0 = &pTos[1-nField];
assert( pData0>=p->aStack );
containsNull = 0;
+ file_format = p->minWriteFileFormat;
/* Loop through the elements that will make up the record to figure
** out how much space is required for the new record.
if( pRec->flags&MEM_Null ){
containsNull = 1;
}
- serial_type = sqlite3VdbeSerialType(pRec);
+ serial_type = sqlite3VdbeSerialType(pRec, file_format);
nData += sqlite3VdbeSerialTypeLen(serial_type);
nHdr += sqlite3VarintLen(serial_type);
}
pRowid = &pTos[0-nField];
assert( pRowid>=p->aStack );
sqlite3VdbeMemIntegerify(pRowid);
- serial_type = sqlite3VdbeSerialType(pRowid);
+ serial_type = sqlite3VdbeSerialType(pRowid, 0);
nData += sqlite3VdbeSerialTypeLen(serial_type);
nHdr += sqlite3VarintLen(serial_type);
}
zCsr = zNewRecord;
zCsr += sqlite3PutVarint(zCsr, nHdr);
for(pRec=pData0; pRec<=pTos; pRec++){
- serial_type = sqlite3VdbeSerialType(pRec);
+ serial_type = sqlite3VdbeSerialType(pRec, file_format);
zCsr += sqlite3PutVarint(zCsr, serial_type); /* serial type */
}
if( addRowid ){
- zCsr += sqlite3PutVarint(zCsr, sqlite3VdbeSerialType(pRowid));
+ zCsr += sqlite3PutVarint(zCsr, sqlite3VdbeSerialType(pRowid, 0));
}
for(pRec=pData0; pRec<=pTos; pRec++){
- zCsr += sqlite3VdbeSerialPut(zCsr, pRec); /* serial data */
+ zCsr += sqlite3VdbeSerialPut(zCsr, pRec, file_format); /* serial data */
}
if( addRowid ){
- zCsr += sqlite3VdbeSerialPut(zCsr, pRowid);
+ zCsr += sqlite3VdbeSerialPut(zCsr, pRowid, 0);
}
assert( zCsr==(zNewRecord+nByte) );
Btree *pX;
int iDb;
Cursor *pCur;
+ Db *pDb;
assert( pTos>=p->aStack );
sqlite3VdbeMemIntegerify(pTos);
assert( (pTos->flags & MEM_Dyn)==0 );
pTos--;
assert( iDb>=0 && iDb<db->nDb );
- pX = db->aDb[iDb].pBt;
+ pDb = &db->aDb[iDb];
+ pX = pDb->pBt;
assert( pX!=0 );
- wrFlag = pOp->opcode==OP_OpenWrite;
+ if( pOp->opcode==OP_OpenWrite ){
+ wrFlag = 1;
+ if( pDb->file_format < p->minWriteFileFormat ){
+ p->minWriteFileFormat = pDb->file_format;
+ }
+ }else{
+ wrFlag = 0;
+ }
if( p2<=0 ){
assert( pTos>=p->aStack );
sqlite3VdbeMemIntegerify(pTos);
u8 changeCntOn; /* True to update the change-counter */
u8 aborted; /* True if ROLLBACK in another VM causes an abort */
u8 expired; /* True if the VM needs to be recompiled */
+ u8 minWriteFileFormat; /* Minimum file format for writable database files */
int nChange; /* Number of db changes made since last reset */
i64 startTime; /* Time when query started - used for profiling */
};
void sqlite3VdbePrintSql(Vdbe*);
#endif
int sqlite3VdbeSerialTypeLen(u32);
-u32 sqlite3VdbeSerialType(Mem*);
-int sqlite3VdbeSerialPut(unsigned char*, Mem*);
+u32 sqlite3VdbeSerialType(Mem*, int);
+int sqlite3VdbeSerialPut(unsigned char*, Mem*, int);
int sqlite3VdbeSerialGet(const unsigned char*, u32, Mem*);
void sqlite3VdbeDeleteAuxData(VdbeFunc*, int);
p->explain |= isExplain;
p->magic = VDBE_MAGIC_RUN;
p->nChange = 0;
+ p->minWriteFileFormat = 255;
#ifdef VDBE_PROFILE
{
int i;
** 5 6 signed integer
** 6 8 signed integer
** 7 8 IEEE float
-** 8-11 reserved for expansion
+** 8 0 Integer constant 0
+** 9 0 Integer constant 1
+** 10,11 reserved for expansion
** N>=12 and even (N-12)/2 BLOB
** N>=13 and odd (N-13)/2 text
**
/*
** Return the serial-type for the value stored in pMem.
*/
-u32 sqlite3VdbeSerialType(Mem *pMem){
+u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){
int flags = pMem->flags;
if( flags&MEM_Null ){
/* Figure out whether to use 1, 2, 4, 6 or 8 bytes. */
# define MAX_6BYTE ((((i64)0x00001000)<<32)-1)
i64 i = pMem->i;
- u64 u = i<0 ? -i : i;
+ u64 u;
+ if( file_format>=4 && (i&1)==i ){
+ return 8+i;
+ }
+ u = i<0 ? -i : i;
if( u<=127 ) return 1;
if( u<=32767 ) return 2;
if( u<=8388607 ) return 3;
** buf. It is assumed that the caller has allocated sufficient space.
** Return the number of bytes written.
*/
-int sqlite3VdbeSerialPut(unsigned char *buf, Mem *pMem){
- u32 serial_type = sqlite3VdbeSerialType(pMem);
+int sqlite3VdbeSerialPut(unsigned char *buf, Mem *pMem, int file_format){
+ u32 serial_type = sqlite3VdbeSerialType(pMem, file_format);
int len;
- /* NULL */
- if( serial_type==0 ){
- return 0;
- }
-
/* Integer and Real */
- if( serial_type<=7 ){
+ if( serial_type<=7 && serial_type>0 ){
u64 v;
int i;
if( serial_type==7 ){
}
return len;
}
-
+
/* String or blob */
- assert( serial_type>=12 );
- len = sqlite3VdbeSerialTypeLen(serial_type);
- memcpy(buf, pMem->z, len);
- return len;
+ if( serial_type>=12 ){
+ len = sqlite3VdbeSerialTypeLen(serial_type);
+ memcpy(buf, pMem->z, len);
+ return len;
+ }
+
+ /* NULL or constants 0 or 1 */
+ return 0;
}
/*
Mem *pMem /* Memory cell to write value into */
){
switch( serial_type ){
- case 8: /* Reserved for future use */
- case 9: /* Reserved for future use */
case 10: /* Reserved for future use */
case 11: /* Reserved for future use */
case 0: { /* NULL */
}
return 8;
}
+ case 8: /* Integer 0 */
+ case 9: { /* Integer 1 */
+ pMem->i = serial_type-8;
+ pMem->flags = MEM_Int;
+ return 0;
+ }
default: {
int len = (serial_type-12)/2;
pMem->z = (char *)buf;
# This file implements regression tests for SQLite library. The
# focus of this script is descending indices.
#
-# $Id: descidx1.test,v 1.2 2005/12/21 18:36:46 drh Exp $
+# $Id: descidx1.test,v 1.3 2005/12/29 19:23:07 drh Exp $
#
set testdir [file dirname $argv0]
lindex $meta 2
}
-# Verify that the file format jumps to (at least) 4 as soon as a
-# descending index is created.
+# Verify that the file format starts as 4.
#
do_test descidx1-1.1 {
execsql {
CREATE INDEX i1 ON t1(b ASC);
}
get_file_format
-} {1}
+} {4}
do_test descidx1-1.2 {
execsql {
CREATE INDEX i2 ON t1(a DESC);
# This file implements regression tests for SQLite library. The
# focus of this script is descending indices.
#
-# $Id: descidx2.test,v 1.1 2005/12/21 18:36:46 drh Exp $
+# $Id: descidx2.test,v 1.2 2005/12/29 19:23:07 drh Exp $
#
set testdir [file dirname $argv0]
lindex $meta 2
}
-# Verify that the file format jumps to (at least) 4 as soon as a
-# descending index is created.
+# Verify that the file format starts as 4
#
do_test descidx2-1.1 {
execsql {
CREATE INDEX i1 ON t1(b ASC);
}
get_file_format
-} {1}
+} {4}
do_test descidx2-1.2 {
execsql {
CREATE INDEX i2 ON t1(a DESC);
# it tests that the different storage classes (integer, real, text etc.)
# all work correctly.
#
-# $Id: types.test,v 1.16 2005/11/14 22:29:06 drh Exp $
+# $Id: types.test,v 1.17 2005/12/29 19:23:07 drh Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
do_test types-2.1.9 {
set root [db eval {select rootpage from sqlite_master where name = 't1'}]
record_sizes $root
-} {3 3 3 4 4 6 6 10 10}
+} {2 3 3 4 4 6 6 10 10}
# Insert some reals. These should be 10 byte records.
do_test types-2.2.1 {
do_test types-2.2.3 {
set root [db eval {select rootpage from sqlite_master where name = 't2'}]
record_sizes $root
-} {3 10 10}
+} {2 10 10}
# Insert a NULL. This should be a two byte record.
do_test types-2.3.1 {
projects / thirdparty / sqlite.git / commitdiff
