database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Changes to give a warning-free build with SQLITE_OMIT_INCRBLOB and

Browse Source 
SQLITE_OMIT_SHARED_CACHE.

FossilOrigin-Name: 711c59171b22df04224183a713e6c36e0bb3bba8
This commit is contained in:
drh
2016-09-10 19:51:40 +00:00
parent 9871664ed6
commit 2eb22af03d
7 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
manifest
View File

@@ -1,5 +1,5 @@
C Add\stest\scode\sto\sdelete\san\sSQLite\sdatabase\sand\sits\sauxiliary\sfiles. C Changes\sto\sgive\sa\swarning-free\sbuild\swith\sSQLITE_OMIT_INCRBLOB\sand\nSQLITE_OMIT_SHARED_CACHE.
D 2016-09-10T14:43:07.292 D 2016-09-10T19:51:40.868
F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc e1aa788e84f926e42239ee167c53f785bedacacd F Makefile.msc e1aa788e84f926e42239ee167c53f785bedacacd
@@ -330,7 +330,7 @@ F src/backup.c 92c2e3b5fcb47626413717138617f4d32f08aea4
F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
F src/btree.c 2551bd3ecb8b8988fb8b23aabadfb214dbc38e46 F src/btree.c 2551bd3ecb8b8988fb8b23aabadfb214dbc38e46
F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
F src/build.c c2ccfcdd99e18894a8750e215b8d9c5398a3c073 F src/build.c c2ccfcdd99e18894a8750e215b8d9c5398a3c073
F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
@@ -395,10 +395,10 @@ F src/sqliteInt.h c9e010a79ab4ed7bdc910a24d8f08f3c6d5f822c
F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
F src/tclsqlite.c bdae822f21e229b6daced15938b6343ce44ef454 F src/tclsqlite.c aef87dcd8cb66564d560ab48d43d19ac812a1eab
F src/test1.c 61a08ed5861f3396ea4ff83931387696b692e1f8 F src/test1.c 61a08ed5861f3396ea4ff83931387696b692e1f8
F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab
F src/test3.c 1339a40be39650ae83894b6578f971dc7f96ea8a F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6 F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
F src/test6.c 55aa2775c154415dcf4ed7cd1e19a193122b3a02 F src/test6.c 55aa2775c154415dcf4ed7cd1e19a193122b3a02
@@ -453,13 +453,13 @@ F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3 F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
F src/vdbe.c 2087dfd6f013a9c808c92f8713fd8c7c62be2857 F src/vdbe.c bac0b2ed0ceb7efcbfb1a3c0731937c23a5ddfc8
F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
F src/vdbeapi.c a32d61b7dd05e6890d8fd44d2805f55e2f5ba9f3 F src/vdbeapi.c a32d61b7dd05e6890d8fd44d2805f55e2f5ba9f3
F src/vdbeaux.c 230b6826656144bcdca6d9c09d38da9d927739be F src/vdbeaux.c 230b6826656144bcdca6d9c09d38da9d927739be
F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937 F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
F src/vdbemem.c 1f28b306cd3ea8c74c1783b1f112ee2b16ebff1f F src/vdbemem.c 357caac1a404f37ee6087b17613f92107c13f733
F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834 F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8 F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
@@ -1525,8 +1525,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 19e2e5950541f1a93eed994cc2b1eaf64b68e858 0e3ace39f234c204649ec69c6a69fb0e062c58f7 P 8a9d128119fde36c175735be56876d30e5c8586f
R 024543a45b4f17dba023932165fefef1 R 2ee1cf2f5a2187396df115af39b9bf82
T +closed 0e3ace39f234c204649ec69c6a69fb0e062c58f7 U drh
U dan Z cef02d90fc649c97d5e20753bc980470
Z df256d05aba4cb5f3d126d4e91c30d89

2
manifest.uuid
View File

@@ -1 +1 @@
8a9d128119fde36c175735be56876d30e5c8586f 711c59171b22df04224183a713e6c36e0bb3bba8

4
src/btree.h
View File

@@ -90,7 +90,9 @@ int sqlite3BtreeIsInReadTrans(Btree*);
int sqlite3BtreeIsInBackup(Btree*); int sqlite3BtreeIsInBackup(Btree*);
void *sqlite3BtreeSchema(Btree *, int, void(*)(void *)); void *sqlite3BtreeSchema(Btree *, int, void(*)(void *));
int sqlite3BtreeSchemaLocked(Btree *pBtree); int sqlite3BtreeSchemaLocked(Btree *pBtree);
#ifndef SQLITE_OMIT_SHARED_CACHE
int sqlite3BtreeLockTable(Btree *pBtree, int iTab, u8 isWriteLock); int sqlite3BtreeLockTable(Btree *pBtree, int iTab, u8 isWriteLock);
#endif
int sqlite3BtreeSavepoint(Btree *, int, int); int sqlite3BtreeSavepoint(Btree *, int, int);
const char *sqlite3BtreeGetFilename(Btree *); const char *sqlite3BtreeGetFilename(Btree *);
@@ -293,8 +295,10 @@ int sqlite3BtreeData(BtCursor*, u32 offset, u32 amt, void*);
char *sqlite3BtreeIntegrityCheck(Btree*, int *aRoot, int nRoot, int, int*); char *sqlite3BtreeIntegrityCheck(Btree*, int *aRoot, int nRoot, int, int*);
struct Pager *sqlite3BtreePager(Btree*); struct Pager *sqlite3BtreePager(Btree*);
#ifndef SQLITE_OMIT_INCRBLOB
int sqlite3BtreePutData(BtCursor*, u32 offset, u32 amt, void*); int sqlite3BtreePutData(BtCursor*, u32 offset, u32 amt, void*);
void sqlite3BtreeIncrblobCursor(BtCursor *); void sqlite3BtreeIncrblobCursor(BtCursor *);
#endif
void sqlite3BtreeClearCursor(BtCursor *); void sqlite3BtreeClearCursor(BtCursor *);
int sqlite3BtreeSetVersion(Btree *pBt, int iVersion); int sqlite3BtreeSetVersion(Btree *pBt, int iVersion);
int sqlite3BtreeCursorHasHint(BtCursor*, unsigned int mask); int sqlite3BtreeCursorHasHint(BtCursor*, unsigned int mask);

13
src/tclsqlite.c
View File

@@ -590,7 +590,8 @@ static int DbProgressHandler(void *cd){
} }
#endif #endif
#ifndef SQLITE_OMIT_TRACE #if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) && \
!defined(SQLITE_OMIT_DEPRECATED)
/* /*
** This routine is called by the SQLite trace handler whenever a new ** This routine is called by the SQLite trace handler whenever a new
** block of SQL is executed. The TCL script in pDb->zTrace is executed. ** block of SQL is executed. The TCL script in pDb->zTrace is executed.
@@ -684,7 +685,8 @@ static int DbTraceV2Handler(
} }
#endif #endif
#ifndef SQLITE_OMIT_TRACE #if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) && \
!defined(SQLITE_OMIT_DEPRECATED)
/* /*
** This routine is called by the SQLite profile handler after a statement ** This routine is called by the SQLite profile handler after a statement
** SQL has executed. The TCL script in pDb->zProfile is evaluated. ** SQL has executed. The TCL script in pDb->zProfile is evaluated.
@@ -2747,7 +2749,8 @@ static int SQLITE_TCLAPI DbObjCmd(
}else{ }else{
pDb->zProfile = 0; pDb->zProfile = 0;
} }
#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) #if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) && \
!defined(SQLITE_OMIT_DEPRECATED)
if( pDb->zProfile ){ if( pDb->zProfile ){
pDb->interp = interp; pDb->interp = interp;
sqlite3_profile(pDb->db, DbProfileHandler, pDb); sqlite3_profile(pDb->db, DbProfileHandler, pDb);
@@ -2934,8 +2937,8 @@ static int SQLITE_TCLAPI DbObjCmd(
}else{ }else{
pDb->zTrace = 0; pDb->zTrace = 0;
} }
#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) \ #if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) && \
&& !defined(SQLITE_OMIT_DEPRECATED) !defined(SQLITE_OMIT_DEPRECATED)
if( pDb->zTrace ){ if( pDb->zTrace ){
pDb->interp = interp; pDb->interp = interp;
sqlite3_trace(pDb->db, DbTraceHandler, pDb); sqlite3_trace(pDb->db, DbTraceHandler, pDb);

17
src/test3.c
View File

@@ -253,7 +253,6 @@ static int SQLITE_TCLAPI btree_close_cursor(
const char **argv /* Text of each argument */ const char **argv /* Text of each argument */
){ ){
BtCursor *pCur; BtCursor *pCur;
Btree *pBt;
int rc; int rc;
if( argc!=2 ){ if( argc!=2 ){
@@ -262,12 +261,18 @@ static int SQLITE_TCLAPI btree_close_cursor(
return TCL_ERROR; return TCL_ERROR;
} }
pCur = sqlite3TestTextToPtr(argv[1]); pCur = sqlite3TestTextToPtr(argv[1]);
pBt = pCur->pBtree; #if SQLITE_THREADSAFE>0
sqlite3_mutex_enter(pBt->db->mutex); {
sqlite3BtreeEnter(pBt); Btree *pBt = pCur->pBtree;
sqlite3_mutex_enter(pBt->db->mutex);
sqlite3BtreeEnter(pBt);
rc = sqlite3BtreeCloseCursor(pCur);
sqlite3BtreeLeave(pBt);
sqlite3_mutex_leave(pBt->db->mutex);
}
#else
rc = sqlite3BtreeCloseCursor(pCur); rc = sqlite3BtreeCloseCursor(pCur);
sqlite3BtreeLeave(pBt); #endif
sqlite3_mutex_leave(pBt->db->mutex);
ckfree((char *)pCur); ckfree((char *)pCur);
if( rc ){ if( rc ){
Tcl_AppendResult(interp, sqlite3ErrName(rc), 0); Tcl_AppendResult(interp, sqlite3ErrName(rc), 0);

6
src/vdbe.c
View File

@@ -3877,7 +3877,7 @@ case OP_SeekGT: { /* jump, in3 */
#ifdef SQLITE_DEBUG #ifdef SQLITE_DEBUG
{ int i; for(i=0; i<r.nField; i++) assert( memIsValid(&r.aMem[i]) ); } { int i; for(i=0; i<r.nField; i++) assert( memIsValid(&r.aMem[i]) ); }
#endif #endif
ExpandBlob(r.aMem); (void)ExpandBlob(r.aMem);
r.eqSeen = 0; r.eqSeen = 0;
rc = sqlite3BtreeMovetoUnpacked(pC->uc.pCursor, &r, 0, 0, &res); rc = sqlite3BtreeMovetoUnpacked(pC->uc.pCursor, &r, 0, 0, &res);
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
@@ -4020,7 +4020,7 @@ case OP_Found: { /* jump, in3 */
r.aMem = pIn3; r.aMem = pIn3;
for(ii=0; ii<r.nField; ii++){ for(ii=0; ii<r.nField; ii++){
assert( memIsValid(&r.aMem[ii]) ); assert( memIsValid(&r.aMem[ii]) );
ExpandBlob(&r.aMem[ii]); (void)ExpandBlob(&r.aMem[ii]);
#ifdef SQLITE_DEBUG #ifdef SQLITE_DEBUG
if( ii ) REGISTER_TRACE(pOp->p3+ii, &r.aMem[ii]); if( ii ) REGISTER_TRACE(pOp->p3+ii, &r.aMem[ii]);
#endif #endif
@@ -4032,7 +4032,7 @@ case OP_Found: { /* jump, in3 */
); );
if( pIdxKey==0 ) goto no_mem; if( pIdxKey==0 ) goto no_mem;
assert( pIn3->flags & MEM_Blob ); assert( pIn3->flags & MEM_Blob );
ExpandBlob(pIn3); (void)ExpandBlob(pIn3);
sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z, pIdxKey); sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z, pIdxKey);
} }
pIdxKey->default_rc = 0; pIdxKey->default_rc = 0;

2
src/vdbemem.c
View File

@@ -192,7 +192,7 @@ int sqlite3VdbeMemMakeWriteable(Mem *pMem){
int f; int f;
assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) ); assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
assert( (pMem->flags&MEM_RowSet)==0 ); assert( (pMem->flags&MEM_RowSet)==0 );
ExpandBlob(pMem); (void)ExpandBlob(pMem);
f = pMem->flags; f = pMem->flags;
if( (f&(MEM_Str|MEM_Blob)) && (pMem->szMalloc==0 || pMem->z!=pMem->zMalloc) ){ if( (f&(MEM_Str|MEM_Blob)) && (pMem->szMalloc==0 || pMem->z!=pMem->zMalloc) ){
if( sqlite3VdbeMemGrow(pMem, pMem->n + 2, 1) ){ if( sqlite3VdbeMemGrow(pMem, pMem->n + 2, 1) ){