Index: main.mk ================================================================== --- main.mk +++ main.mk @@ -113,10 +113,11 @@ $(TOP)/src/global.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ $(TOP)/src/insert.c \ + $(TOP)/src/kv.h \ $(TOP)/src/kvlsm.c \ $(TOP)/src/kvmem.c \ $(TOP)/src/legacy.c \ $(TOP)/src/lsm.h \ $(TOP)/src/lsmInt.h \ @@ -159,11 +160,10 @@ $(TOP)/src/sqlite.h.in \ $(TOP)/src/sqliteInt.h \ $(TOP)/src/sqliteLimit.h \ $(TOP)/src/status.c \ $(TOP)/src/storage.c \ - $(TOP)/src/storage.h \ $(TOP)/src/tclsqlite.c \ $(TOP)/src/tokenize.c \ $(TOP)/src/trigger.c \ $(TOP)/src/utf.c \ $(TOP)/src/update.c \ @@ -274,20 +274,20 @@ # HDR = \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ keywordhash.h \ + $(TOP)/src/kv.h \ $(TOP)/src/lsm.h \ $(TOP)/src/lsmInt.h \ $(TOP)/src/mutex.h \ opcodes.h \ $(TOP)/src/os.h \ parse.h \ sqlite4.h \ $(TOP)/src/sqliteInt.h \ $(TOP)/src/sqliteLimit.h \ - $(TOP)/src/storage.h \ $(TOP)/src/vdbe.h \ $(TOP)/src/vdbeInt.h EXTHDR = \ $(TOP)/ext/fts3/fts3.h \ ADDED src/kv.h Index: src/kv.h ================================================================== --- src/kv.h +++ src/kv.h @@ -0,0 +1,179 @@ +/* +** 2012 January 20 +** +** The author disclaims copyright to this source code. In place of +** a legal notice, here is a blessing: +** +** May you do good and not evil. +** May you find forgiveness for yourself and forgive others. +** May you share freely, never taking more than you give. +** +************************************************************************* +** +** This header file defines the interface to the KV storage engine(s). +** +** Notes on the storage subsystem interface: +** +** The storage subsystem is a key/value database. All keys and values are +** binary with arbitrary content. Keys are unique. Keys compare in +** memcmp() order. Shorter keys appear first. +** +** The xBegin, xCommit, and xRollback methods change the transaction level +** of the store. The transaction level is a non-negative integer that is +** initialized to zero. The transaction level must be at least 1 in order +** for content to be read. The transaction level must be at least 2 for +** content to be modified. +** +** The xBegin method increases transaction level. The increase may be no +** more than 1 unless the transaction level is initially 0 in which case +** it can be increased immediately to 2. Increasing the transaction level +** to 1 or more makes a "snapshot" of the database file such that changes +** made by other connections are not visible. Calls to xBegin may fail +** with SQLITE4_BUSY if the initial transaction level is 0 or 1. +** +** A read-only database will fail an attempt to increase xBegin above 1. An +** implementation that does not support nested transactions will fail any +** attempt to increase the transaction level above 2. +** +** The xCommitPhaseOne and xCommitPhaseTwo methods implement a 2-phase +** commit that lowers the transaction level to the value given in the +** second argument, making all the changes made at higher transaction levels +** permanent. A rollback is still possible following phase one. If +** possible, errors should be reported during phase one so that a +** multiple-database transaction can still be rolled back if the +** phase one fails on a different database. Implementations that do not +** support two-phase commit can implement xCommitPhaseOne as a no-op function +** returning SQLITE4_OK. +** +** The xRollback method lowers the transaction level to the value given in +** its argument and reverts or undoes all changes made at higher transaction +** levels. An xRollback to level N causes the database to revert to the state +** it was in on the most recent xBegin to level N+1. +** +** The xRevert(N) method causes the state of the database file to go back +** to what it was immediately after the most recent xCommit(N). Higher-level +** subtransactions are cancelled. This call is equivalent to xRollback(N-1) +** followed by xBegin(N) but is atomic and might be more efficient. +** +** The xReplace method replaces the value for an existing entry with the +** given key, or creates a new entry with the given key and value if no +** prior entry exists with the given key. The key and value pointers passed +** into xReplace belong to the caller and will likely be destroyed when the +** call to xReplace returns so the xReplace routine must make its own +** copy of that information if it needs to retain it after returning. +** +** A cursor is at all times pointing to ether an entry in the database or +** to EOF. EOF means "no entry". Cursor operations other than xCloseCursor +** will fail if the transaction level is less than 1. +** +** The xSeek method moves a cursor to an entry in the database that matches +** the supplied key as closely as possible. If the dir argument is 0, then +** the match must be exact or else the seek fails and the cursor is left +** pointing to EOF. If dir is negative, then an exact match is +** found if it is available, otherwise the cursor is positioned at the largest +** entry that is less than the search key or to EOF if the store contains no +** entry less than the search key. If dir is positive, then an exist match +** is found if it is available, otherwise the cursor is left pointing the +** the smallest entry that is larger than the search key, or to EOF if there +** are no entries larger than the search key. +** +** The return code from xSeek might be one of the following: +** +** SQLITE4_OK The cursor is left pointing to any entry that +** exactly matchings the probe key. +** +** SQLITE4_INEXACT The cursor is left pointing to the nearest entry +** to the probe it could find, either before or after +** the probe, according to the dir argument. +** +** SQLITE4_NOTFOUND No suitable entry could be found. Either dir==0 and +** there was no exact match, or dir<0 and the probe is +** smaller than every entry in the database, or dir>0 and +** the probe is larger than every entry in the database. +** +** xSeek might also return some error code like SQLITE4_IOERR or +** SQLITE4_NOMEM. +** +** The xNext method will only be called following an xSeek with a positive dir, +** or another xNext. The xPrev method will only be called following an xSeek +** with a negative dir or another xPrev. Both xNext and xPrev will return +** SQLITE4_OK on success and SQLITE4_NOTFOUND if they run off the end of the +** database. Both routines might also return error codes such as +** SQLITE4_IOERR, SQLITE4_CORRUPT, or SQLITE4_NOMEM. +** +** Values returned by xKey and xData are guaranteed to remain stable until +** the next xSeek, xNext, xPrev, xReset, xDelete, or xCloseCursor on the same +** cursor. This is true even if the transaction level is reduced to zero, +** or if the content of the entry is changed by xInsert, xDelete on a different +** cursor, or xRollback. The content returned by repeated calls to xKey and +** xData is allowed (but is not required) to change if xInsert, xDelete, or +** xRollback are invoked in between the calls, but the content returned by +** every call must be stable until the cursor moves, or is reset or closed. +** The cursor owns the values returned by xKey and xData and will take +** responsiblity for freeing memory used to hold those values when appropriate. +** +** The xDelete method deletes the entry that the cursor is currently +** pointing at. However, subsequent xNext or xPrev calls behave as if the +** entries is not actually deleted until the cursor moves. In other words +** it is acceptable to xDelete an entry out from under a cursor. Subsequent +** xNext or xPrev calls on that cursor will work the same as if the entry +** had not been deleted. Two cursors can be pointing to the same entry and +** one cursor can xDelete and the other cursor is expected to continue +** functioning normally, including responding correctly to subsequent +** xNext and xPrev calls. +*/ + +/* Typedefs of datatypes */ +typedef struct sqlite4_kvstore KVStore; +typedef struct sqlite4_kv_methods KVStoreMethods; +typedef struct sqlite4_kvcursor KVCursor; +typedef unsigned char KVByteArray; +typedef sqlite4_kvsize KVSize; + + +int sqlite4KVStoreOpenMem(sqlite4_env*, KVStore**, const char *, unsigned); +int sqlite4KVStoreOpenLsm(sqlite4_env*, KVStore**, const char *, unsigned); +int sqlite4KVStoreOpen( + sqlite4*, + const char *zLabel, + const char *zUri, + KVStore**, + unsigned flags +); +int sqlite4KVStoreReplace( + KVStore*, + const KVByteArray *pKey, KVSize nKey, + const KVByteArray *pData, KVSize nData +); +int sqlite4KVStoreOpenCursor(KVStore *p, KVCursor **ppKVCursor); +int sqlite4KVCursorSeek( + KVCursor *p, + const KVByteArray *pKey, KVSize nKey, + int dir +); +int sqlite4KVCursorNext(KVCursor *p); +int sqlite4KVCursorPrev(KVCursor *p); +int sqlite4KVCursorDelete(KVCursor *p); +int sqlite4KVCursorReset(KVCursor *p); +int sqlite4KVCursorKey(KVCursor *p, const KVByteArray **ppKey, KVSize *pnKey); +int sqlite4KVCursorData( + KVCursor *p, + KVSize ofst, + KVSize n, + const KVByteArray **ppData, + KVSize *pnData +); +int sqlite4KVCursorClose(KVCursor *p); +int sqlite4KVStoreBegin(KVStore *p, int iLevel); +int sqlite4KVStoreCommitPhaseOne(KVStore *p, int iLevel); +int sqlite4KVStoreCommitPhaseTwo(KVStore *p, int iLevel); +int sqlite4KVStoreCommit(KVStore *p, int iLevel); +int sqlite4KVStoreRollback(KVStore *p, int iLevel); +int sqlite4KVStoreRevert(KVStore *p, int iLevel); +int sqlite4KVStoreClose(KVStore *p); + +int sqlite4KVStoreGetMeta(KVStore *p, int, int, unsigned int*); +int sqlite4KVStorePutMeta(sqlite4*, KVStore *p, int, int, unsigned int*); +#ifdef SQLITE4_DEBUG + void sqlite4KVStoreDump(KVStore *p); +#endif Index: src/kvlsm.c ================================================================== --- src/kvlsm.c +++ src/kvlsm.c @@ -9,24 +9,32 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** An in-memory key/value storage subsystem that presents the interfadce -** defined by storage.h +** defined by kv.h */ #include "sqliteInt.h" #include "lsm.h" +/* Forward declarations of objects */ typedef struct KVLsm KVLsm; typedef struct KVLsmCsr KVLsmCsr; +/* +** An instance of an open connection to an LSM store. A subclass of KVStore. +*/ struct KVLsm { KVStore base; /* Base class, must be first */ lsm_db *pDb; /* LSM database handle */ lsm_cursor *pCsr; /* LSM cursor holding read-trans open */ }; +/* +** An instance of an open cursor pointing into an LSM store. A subclass +** of KVCursor. +*/ struct KVLsmCsr { KVCursor base; /* Base class. Must be first */ lsm_cursor *pCsr; /* LSM cursor handle */ }; Index: src/kvmem.c ================================================================== --- src/kvmem.c +++ src/kvmem.c @@ -9,11 +9,11 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** An in-memory key/value storage subsystem that presents the interfadce -** defined by storage.h +** defined by kv.h */ #include "sqliteInt.h" /* Forward declarations of object names */ typedef struct KVMemNode KVMemNode; Index: src/shell.c ================================================================== --- src/shell.c +++ src/shell.c @@ -177,12 +177,12 @@ } } /* Return the difference of two FILETIME structs in seconds */ static double timeDiff(FILETIME *pStart, FILETIME *pEnd){ - sqlite_int64 i64Start = *((sqlite_int64 *) pStart); - sqlite_int64 i64End = *((sqlite_int64 *) pEnd); + sqlite4_int64 i64Start = *((sqlite4_int64 *) pStart); + sqlite4_int64 i64End = *((sqlite4_int64 *) pEnd); return (double) ((i64End - i64Start) / 10000000.0); } /* ** Print the timing results. Index: src/sqlite.h.in ================================================================== --- src/sqlite.h.in +++ src/sqlite.h.in @@ -254,19 +254,15 @@ */ typedef struct sqlite4 sqlite4; /* ** CAPIREF: 64-Bit Integer Types -** KEYWORDS: sqlite_int64 sqlite_uint64 +** KEYWORDS: sqlite4_int64 sqlite4_uint64 ** ** Because there is no cross-platform way to specify 64-bit integer types ** SQLite includes typedefs for 64-bit signed and unsigned integers. ** -** The sqlite4_int64 and sqlite4_uint64 are the preferred type definitions. -** The sqlite_int64 and sqlite_uint64 types are supported for backwards -** compatibility only. -** ** ^The sqlite4_int64 and sqlite_int64 types can store integer values ** between -9223372036854775808 and +9223372036854775807 inclusive. ^The ** sqlite4_uint64 and sqlite_uint64 types can store integer values ** between 0 and +18446744073709551615 inclusive. */ Index: src/sqliteInt.h ================================================================== --- src/sqliteInt.h +++ src/sqliteInt.h @@ -302,13 +302,13 @@ /* ** If compiling for a processor that lacks floating point support, ** substitute integer for floating-point */ #ifdef SQLITE4_OMIT_FLOATING_POINT -# define double sqlite_int64 -# define float sqlite_int64 -# define LONGDOUBLE_TYPE sqlite_int64 +# define double sqlite4_int64 +# define float sqlite4_int64 +# define LONGDOUBLE_TYPE sqlite4_int64 # ifndef SQLITE4_BIG_DBL # define SQLITE4_BIG_DBL (((sqlite4_int64)1)<<50) # endif # define SQLITE4_OMIT_DATETIME_FUNCS 1 # define SQLITE4_OMIT_TRACE 1 @@ -593,11 +593,11 @@ typedef struct WhereInfo WhereInfo; typedef struct WhereLevel WhereLevel; #include "vdbe.h" -#include "storage.h" +#include "kv.h" #include "os.h" #include "mutex.h" DELETED src/storage.h Index: src/storage.h ================================================================== --- src/storage.h +++ src/storage.h @@ -1,179 +0,0 @@ -/* -** 2012 January 20 -** -** The author disclaims copyright to this source code. In place of -** a legal notice, here is a blessing: -** -** May you do good and not evil. -** May you find forgiveness for yourself and forgive others. -** May you share freely, never taking more than you give. -** -************************************************************************* -** -** This header file defines the interface to the KV storage engine(s). -** -** Notes on the storage subsystem interface: -** -** The storage subsystem is a key/value database. All keys and values are -** binary with arbitrary content. Keys are unique. Keys compare in -** memcmp() order. Shorter keys appear first. -** -** The xBegin, xCommit, and xRollback methods change the transaction level -** of the store. The transaction level is a non-negative integer that is -** initialized to zero. The transaction level must be at least 1 in order -** for content to be read. The transaction level must be at least 2 for -** content to be modified. -** -** The xBegin method increases transaction level. The increase may be no -** more than 1 unless the transaction level is initially 0 in which case -** it can be increased immediately to 2. Increasing the transaction level -** to 1 or more makes a "snapshot" of the database file such that changes -** made by other connections are not visible. An xBegin call may fail -** with SQLITE4_BUSY if the initial transaction level is 0 or 1. -** -** A read-only database will fail an attempt to increase xBegin above 1. An -** implementation that does not support nested transactions will fail any -** attempt to increase the transaction level above 2. -** -** The xCommitPhaseOne and xCommitPhaseTwo methods implement a 2-phase -** commit that lowers the transaction level to the value given in the -** second argument, making all the changes made at higher transaction levels -** permanent. A rollback is still possible following phase one. If -** possible, errors should be reported during phase one so that a -** multiple-database transaction can still be rolled back if the -** phase one fails on a different database. Implementations that do not -** support two-phase commit can implement xCommitPhaseOne as a no-op function -** returning SQLITE4_OK. -** -** The xRollback method lowers the transaction level to the value given in -** its argument and reverts or undoes all changes made at higher transaction -** levels. An xRollback to level N causes the database to revert to the state -** it was in on the most recent xBegin to level N+1. -** -** The xRevert(N) method causes the state of the database file to go back -** to what it was immediately after the most recent xCommit(N). Higher-level -** subtransactions are cancelled. This call is equivalent to xRollback(N-1) -** followed by xBegin(N) but is atomic and might be more efficient. -** -** The xReplace method replaces the value for an existing entry with the -** given key, or creates a new entry with the given key and value if no -** prior entry exists with the given key. The key and value pointers passed -** into xReplace belong to the caller will likely be destroyed when the -** call to xReplace returns so the xReplace routine must make its own -** copy of that information. -** -** A cursor is at all times pointing to ether an entry in the database or -** to EOF. EOF means "no entry". Cursor operations other than xCloseCursor -** will fail if the transaction level is less than 1. -** -** The xSeek method moves a cursor to an entry in the database that matches -** the supplied key as closely as possible. If the dir argument is 0, then -** the match must be exact or else the seek fails and the cursor is left -** pointing to EOF. If dir is negative, then an exact match is -** found if it is available, otherwise the cursor is positioned at the largest -** entry that is less than the search key or to EOF if the store contains no -** entry less than the search key. If dir is positive, then an exist match -** is found if it is available, otherwise the cursor is left pointing the -** the smallest entry that is larger than the search key, or to EOF if there -** are no entries larger than the search key. -** -** The return code from xSeek might be one of the following: -** -** SQLITE4_OK The cursor is left pointing to any entry that -** exactly matchings the probe key. -** -** SQLITE4_INEXACT The cursor is left pointing to the nearest entry -** to the probe it could find, either before or after -** the probe, according to the dir argument. -** -** SQLITE4_NOTFOUND No suitable entry could be found. Either dir==0 and -** there was no exact match, or dir<0 and the probe is -** smaller than every entry in the database, or dir>0 and -** the probe is larger than every entry in the database. -** -** xSeek might also return some error code like SQLITE4_IOERR or -** SQLITE4_NOMEM. -** -** The xNext method will only be called following an xSeek with a positive dir, -** or another xNext. The xPrev method will only be called following an xSeek -** with a negative dir or another xPrev. Both xNext and xPrev will return -** SQLITE4_OK on success and SQLITE4_NOTFOUND if they run off the end of the -** database. Both routines might also return error codes such as -** SQLITE4_IOERR, SQLITE4_CORRUPT, or SQLITE4_NOMEM. -** -** Values returned by xKey and xData are guaranteed to remain stable until -** the next xSeek, xNext, xPrev, xReset, xDelete, or xCloseCursor on the same -** cursor. This is true even if the transaction level is reduced to zero, -** or if the content of the entry is changed by xInsert, xDelete on a different -** cursor, or xRollback. The content returned by repeated calls to xKey and -** xData is allowed (but is not required) to change if xInsert, xDelete, or -** xRollback are invoked in between the calls, but the content returned by -** every call must be stable until the cursor moves, or is reset or closed. -** The cursor owns the values returned by xKey and xData and will take -** responsiblity for freeing memory used to hold those values when appropriate. -** -** The xDelete method deletes the entry that the cursor is currently -** pointing at. However, subsequent xNext or xPrev calls behave as if the -** entries is not actually deleted until the cursor moves. In other words -** it is acceptable to xDelete an entry out from under a cursor. Subsequent -** xNext or xPrev calls on that cursor will work the same as if the entry -** had not been deleted. Two cursors can be pointing to the same entry and -** one cursor can xDelete and the other cursor is expected to continue -** functioning normally, including responding correctly to subsequent -** xNext and xPrev calls. -*/ - -/* Typedefs of datatypes */ -typedef struct sqlite4_kvstore KVStore; -typedef struct sqlite4_kv_methods KVStoreMethods; -typedef struct sqlite4_kvcursor KVCursor; -typedef unsigned char KVByteArray; -typedef sqlite4_kvsize KVSize; - - -int sqlite4KVStoreOpenMem(sqlite4_env*, KVStore**, const char *, unsigned); -int sqlite4KVStoreOpenLsm(sqlite4_env*, KVStore**, const char *, unsigned); -int sqlite4KVStoreOpen( - sqlite4*, - const char *zLabel, - const char *zUri, - KVStore**, - unsigned flags -); -int sqlite4KVStoreReplace( - KVStore*, - const KVByteArray *pKey, KVSize nKey, - const KVByteArray *pData, KVSize nData -); -int sqlite4KVStoreOpenCursor(KVStore *p, KVCursor **ppKVCursor); -int sqlite4KVCursorSeek( - KVCursor *p, - const KVByteArray *pKey, KVSize nKey, - int dir -); -int sqlite4KVCursorNext(KVCursor *p); -int sqlite4KVCursorPrev(KVCursor *p); -int sqlite4KVCursorDelete(KVCursor *p); -int sqlite4KVCursorReset(KVCursor *p); -int sqlite4KVCursorKey(KVCursor *p, const KVByteArray **ppKey, KVSize *pnKey); -int sqlite4KVCursorData( - KVCursor *p, - KVSize ofst, - KVSize n, - const KVByteArray **ppData, - KVSize *pnData -); -int sqlite4KVCursorClose(KVCursor *p); -int sqlite4KVStoreBegin(KVStore *p, int iLevel); -int sqlite4KVStoreCommitPhaseOne(KVStore *p, int iLevel); -int sqlite4KVStoreCommitPhaseTwo(KVStore *p, int iLevel); -int sqlite4KVStoreCommit(KVStore *p, int iLevel); -int sqlite4KVStoreRollback(KVStore *p, int iLevel); -int sqlite4KVStoreRevert(KVStore *p, int iLevel); -int sqlite4KVStoreClose(KVStore *p); - -int sqlite4KVStoreGetMeta(KVStore *p, int, int, unsigned int*); -int sqlite4KVStorePutMeta(sqlite4*, KVStore *p, int, int, unsigned int*); -#ifdef SQLITE4_DEBUG - void sqlite4KVStoreDump(KVStore *p); -#endif Index: src/vdbe.c ================================================================== --- src/vdbe.c +++ src/vdbe.c @@ -4755,11 +4755,11 @@ case OP_VUpdate: { sqlite4_vtab *pVtab; sqlite4_module *pModule; int nArg; int i; - sqlite_int64 rowid; + sqlite4_int64 rowid; Mem **apArg; Mem *pX; assert( pOp->p2==1 || pOp->p5==OE_Fail || pOp->p5==OE_Rollback || pOp->p5==OE_Abort || pOp->p5==OE_Ignore || pOp->p5==OE_Replace Index: tool/mksqlite4c.tcl ================================================================== --- tool/mksqlite4c.tcl +++ tool/mksqlite4c.tcl @@ -92,20 +92,20 @@ # foreach hdr { hash.h hwtime.h keywordhash.h + kv.h lsm.h lsmInt.h mutex.h opcodes.h os.h parse.h sqlite4.h sqliteInt.h sqliteLimit.h - storage.h vdbe.h vdbeInt.h } { set available_hdr($hdr) 1 }