database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-27 20:41:58 +03:00
Code Activity

In RTREE, use an sqlite3_blob object rather than an sqlite3_stmt object

Browse Source 
for reading content out of the %_node shadow table.

FossilOrigin-Name: 97ccf3e4de11ffea46993cb7fb7ab559b9810705
This commit is contained in:
drh
2017-02-04 14:24:05 +00:00
parent 88610c968e 010e312f8f
commit fe05491b87
4 changed files with 117 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
ext/rtree/rtree.c
View File

@ -119,11 +119,13 @@ struct Rtree {
u8 nDim2; /* Twice the number of dimensions */ u8 nDim2; /* Twice the number of dimensions */
u8 eCoordType; /* RTREE_COORD_REAL32 or RTREE_COORD_INT32 */ u8 eCoordType; /* RTREE_COORD_REAL32 or RTREE_COORD_INT32 */
u8 nBytesPerCell; /* Bytes consumed per cell */ u8 nBytesPerCell; /* Bytes consumed per cell */
u8 inWrTrans; /* True if inside write transaction */
int iDepth; /* Current depth of the r-tree structure */ int iDepth; /* Current depth of the r-tree structure */
char *zDb; /* Name of database containing r-tree table */ char *zDb; /* Name of database containing r-tree table */
char *zName; /* Name of r-tree table */ char *zName; /* Name of r-tree table */
int nBusy; /* Current number of users of this structure */ u32 nBusy; /* Current number of users of this structure */
i64 nRowEst; /* Estimated number of rows in this table */ i64 nRowEst; /* Estimated number of rows in this table */
u32 nCursor; /* Number of open cursors */
/* List of nodes removed during a CondenseTree operation. List is /* List of nodes removed during a CondenseTree operation. List is
** linked together via the pointer normally used for hash chains - ** linked together via the pointer normally used for hash chains -
@ -133,8 +135,10 @@ struct Rtree {
RtreeNode *pDeleted; RtreeNode *pDeleted;
int iReinsertHeight; /* Height of sub-trees Reinsert() has run on */ int iReinsertHeight; /* Height of sub-trees Reinsert() has run on */
/* Blob I/O on xxx_node */
sqlite3_blob *pNodeBlob;
/* Statements to read/write/delete a record from xxx_node */ /* Statements to read/write/delete a record from xxx_node */
sqlite3_stmt *pReadNode;
sqlite3_stmt *pWriteNode; sqlite3_stmt *pWriteNode;
sqlite3_stmt *pDeleteNode; sqlite3_stmt *pDeleteNode;
@ -385,7 +389,7 @@ struct RtreeMatchArg {
/* The testcase() macro should already be defined in the amalgamation. If /* The testcase() macro should already be defined in the amalgamation. If
** it is not, make it a no-op. ** it is not, make it a no-op.
*/ */
#ifndef SQLITE_AMALGMATION #ifndef SQLITE_AMALGAMATION
# define testcase(X) # define testcase(X)
#endif #endif
@ -615,6 +619,17 @@ static RtreeNode *nodeNew(Rtree *pRtree, RtreeNode *pParent){
return pNode; return pNode;
} }
/*
** Clear the Rtree.pNodeBlob object
*/
static void nodeBlobReset(Rtree *pRtree){
if( pRtree->pNodeBlob && pRtree->inWrTrans==0 && pRtree->nCursor==0 ){
sqlite3_blob *pBlob = pRtree->pNodeBlob;
pRtree->pNodeBlob = 0;
sqlite3_blob_close(pBlob);
}
}
/* /*
** Obtain a reference to an r-tree node. ** Obtain a reference to an r-tree node.
*/ */
@ -624,9 +639,8 @@ static int nodeAcquire(
RtreeNode *pParent, /* Either the parent node or NULL */ RtreeNode *pParent, /* Either the parent node or NULL */
RtreeNode **ppNode /* OUT: Acquired node */ RtreeNode **ppNode /* OUT: Acquired node */
){ ){
int rc; int rc = SQLITE_OK;
int rc2 = SQLITE_OK; RtreeNode *pNode = 0;
RtreeNode *pNode;
/* Check if the requested node is already in the hash table. If so, /* Check if the requested node is already in the hash table. If so,
** increase its reference count and return it. ** increase its reference count and return it.
@ -642,28 +656,45 @@ static int nodeAcquire(
return SQLITE_OK; return SQLITE_OK;
} }
sqlite3_bind_int64(pRtree->pReadNode, 1, iNode); if( pRtree->pNodeBlob ){
rc = sqlite3_step(pRtree->pReadNode); sqlite3_blob *pBlob = pRtree->pNodeBlob;
if( rc==SQLITE_ROW ){ pRtree->pNodeBlob = 0;
const u8 *zBlob = sqlite3_column_blob(pRtree->pReadNode, 0); rc = sqlite3_blob_reopen(pBlob, iNode);
if( pRtree->iNodeSize==sqlite3_column_bytes(pRtree->pReadNode, 0) ){ pRtree->pNodeBlob = pBlob;
pNode = (RtreeNode *)sqlite3_malloc(sizeof(RtreeNode)+pRtree->iNodeSize); if( rc ){
if( !pNode ){ nodeBlobReset(pRtree);
rc2 = SQLITE_NOMEM; if( rc==SQLITE_NOMEM ) return SQLITE_NOMEM;
}else{ }
pNode->pParent = pParent; }
pNode->zData = (u8 *)&pNode[1]; if( pRtree->pNodeBlob==0 ){
pNode->nRef = 1; char *zTab = sqlite3_mprintf("%s_node", pRtree->zName);
pNode->iNode = iNode; if( zTab==0 ) return SQLITE_NOMEM;
pNode->isDirty = 0; rc = sqlite3_blob_open(pRtree->db, pRtree->zDb, zTab, "data", iNode, 0,
pNode->pNext = 0; &pRtree->pNodeBlob);
memcpy(pNode->zData, zBlob, pRtree->iNodeSize); sqlite3_free(zTab);
nodeReference(pParent); }
} if( rc ){
nodeBlobReset(pRtree);
*ppNode = 0;
/* If unable to open an sqlite3_blob on the desired row, that can only
** be because the shadow tables hold erroneous data. */
if( rc==SQLITE_ERROR ) rc = SQLITE_CORRUPT_VTAB;
}else if( pRtree->iNodeSize==sqlite3_blob_bytes(pRtree->pNodeBlob) ){
pNode = (RtreeNode *)sqlite3_malloc(sizeof(RtreeNode)+pRtree->iNodeSize);
if( !pNode ){
rc = SQLITE_NOMEM;
}else{
pNode->pParent = pParent;
pNode->zData = (u8 *)&pNode[1];
pNode->nRef = 1;
pNode->iNode = iNode;
pNode->isDirty = 0;
pNode->pNext = 0;
rc = sqlite3_blob_read(pRtree->pNodeBlob, pNode->zData,
pRtree->iNodeSize, 0);
nodeReference(pParent);
} }
} }
rc = sqlite3_reset(pRtree->pReadNode);
if( rc==SQLITE_OK ) rc = rc2;
/* If the root node was just loaded, set pRtree->iDepth to the height /* If the root node was just loaded, set pRtree->iDepth to the height
** of the r-tree structure. A height of zero means all data is stored on ** of the r-tree structure. A height of zero means all data is stored on
@ -909,7 +940,9 @@ static void rtreeReference(Rtree *pRtree){
static void rtreeRelease(Rtree *pRtree){ static void rtreeRelease(Rtree *pRtree){
pRtree->nBusy--; pRtree->nBusy--;
if( pRtree->nBusy==0 ){ if( pRtree->nBusy==0 ){
sqlite3_finalize(pRtree->pReadNode); pRtree->inWrTrans = 0;
pRtree->nCursor = 0;
nodeBlobReset(pRtree);
sqlite3_finalize(pRtree->pWriteNode); sqlite3_finalize(pRtree->pWriteNode);
sqlite3_finalize(pRtree->pDeleteNode); sqlite3_finalize(pRtree->pDeleteNode);
sqlite3_finalize(pRtree->pReadRowid); sqlite3_finalize(pRtree->pReadRowid);
@ -947,6 +980,7 @@ static int rtreeDestroy(sqlite3_vtab *pVtab){
if( !zCreate ){ if( !zCreate ){
rc = SQLITE_NOMEM; rc = SQLITE_NOMEM;
}else{ }else{
nodeBlobReset(pRtree);
rc = sqlite3_exec(pRtree->db, zCreate, 0, 0, 0); rc = sqlite3_exec(pRtree->db, zCreate, 0, 0, 0);
sqlite3_free(zCreate); sqlite3_free(zCreate);
} }
@ -962,6 +996,7 @@ static int rtreeDestroy(sqlite3_vtab *pVtab){
*/ */
static int rtreeOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){ static int rtreeOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){
int rc = SQLITE_NOMEM; int rc = SQLITE_NOMEM;
Rtree *pRtree = (Rtree *)pVTab;
RtreeCursor *pCsr; RtreeCursor *pCsr;
pCsr = (RtreeCursor *)sqlite3_malloc(sizeof(RtreeCursor)); pCsr = (RtreeCursor *)sqlite3_malloc(sizeof(RtreeCursor));
@ -969,6 +1004,7 @@ static int rtreeOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){
memset(pCsr, 0, sizeof(RtreeCursor)); memset(pCsr, 0, sizeof(RtreeCursor));
pCsr->base.pVtab = pVTab; pCsr->base.pVtab = pVTab;
rc = SQLITE_OK; rc = SQLITE_OK;
pRtree->nCursor++;
} }
*ppCursor = (sqlite3_vtab_cursor *)pCsr; *ppCursor = (sqlite3_vtab_cursor *)pCsr;
@ -1001,10 +1037,13 @@ static int rtreeClose(sqlite3_vtab_cursor *cur){
Rtree *pRtree = (Rtree *)(cur->pVtab); Rtree *pRtree = (Rtree *)(cur->pVtab);
int ii; int ii;
RtreeCursor *pCsr = (RtreeCursor *)cur; RtreeCursor *pCsr = (RtreeCursor *)cur;
assert( pRtree->nCursor>0 );
freeCursorConstraints(pCsr); freeCursorConstraints(pCsr);
sqlite3_free(pCsr->aPoint); sqlite3_free(pCsr->aPoint);
for(ii=0; ii<RTREE_CACHE_SZ; ii++) nodeRelease(pRtree, pCsr->aNode[ii]); for(ii=0; ii<RTREE_CACHE_SZ; ii++) nodeRelease(pRtree, pCsr->aNode[ii]);
sqlite3_free(pCsr); sqlite3_free(pCsr);
pRtree->nCursor--;
nodeBlobReset(pRtree);
return SQLITE_OK; return SQLITE_OK;
} }
@ -1077,7 +1116,6 @@ static int rtreeCallbackConstraint(
sqlite3_rtree_dbl *prScore, /* OUT: score for the cell */ sqlite3_rtree_dbl *prScore, /* OUT: score for the cell */
int *peWithin /* OUT: visibility of the cell */ int *peWithin /* OUT: visibility of the cell */
){ ){
int i; /* Loop counter */
sqlite3_rtree_query_info *pInfo = pConstraint->pInfo; /* Callback info */ sqlite3_rtree_query_info *pInfo = pConstraint->pInfo; /* Callback info */
int nCoord = pInfo->nCoord; /* No. of coordinates */ int nCoord = pInfo->nCoord; /* No. of coordinates */
int rc; /* Callback return code */ int rc; /* Callback return code */
@ -1122,9 +1160,10 @@ static int rtreeCallbackConstraint(
} }
} }
if( pConstraint->op==RTREE_MATCH ){ if( pConstraint->op==RTREE_MATCH ){
int eWithin = 0;
rc = pConstraint->u.xGeom((sqlite3_rtree_geometry*)pInfo, rc = pConstraint->u.xGeom((sqlite3_rtree_geometry*)pInfo,
nCoord, aCoord, &i); nCoord, aCoord, &eWithin);
if( i==0 ) *peWithin = NOT_WITHIN; if( eWithin==0 ) *peWithin = NOT_WITHIN;
*prScore = RTREE_ZERO; *prScore = RTREE_ZERO;
}else{ }else{
pInfo->aCoord = aCoord; pInfo->aCoord = aCoord;
@ -3152,6 +3191,27 @@ constraint:
return rc; return rc;
} }
/*
** Called when a transaction starts.
*/
static int rtreeBeginTransaction(sqlite3_vtab *pVtab){
Rtree *pRtree = (Rtree *)pVtab;
assert( pRtree->inWrTrans==0 );
pRtree->inWrTrans++;
return SQLITE_OK;
}
/*
** Called when a transaction completes (either by COMMIT or ROLLBACK).
** The sqlite3_blob object should be released at this point.
*/
static int rtreeEndTransaction(sqlite3_vtab *pVtab){
Rtree *pRtree = (Rtree *)pVtab;
pRtree->inWrTrans = 0;
nodeBlobReset(pRtree);
return SQLITE_OK;
}
/* /*
** The xRename method for rtree module virtual tables. ** The xRename method for rtree module virtual tables.
*/ */
@ -3173,6 +3233,7 @@ static int rtreeRename(sqlite3_vtab *pVtab, const char *zNewName){
return rc; return rc;
} }
/* /*
** This function populates the pRtree->nRowEst variable with an estimate ** This function populates the pRtree->nRowEst variable with an estimate
** of the number of rows in the virtual table. If possible, this is based ** of the number of rows in the virtual table. If possible, this is based
@ -3232,15 +3293,15 @@ static sqlite3_module rtreeModule = {
rtreeColumn, /* xColumn - read data */ rtreeColumn, /* xColumn - read data */
rtreeRowid, /* xRowid - read data */ rtreeRowid, /* xRowid - read data */
rtreeUpdate, /* xUpdate - write data */ rtreeUpdate, /* xUpdate - write data */
0, /* xBegin - begin transaction */ rtreeBeginTransaction, /* xBegin - begin transaction */
0, /* xSync - sync transaction */ rtreeEndTransaction, /* xSync - sync transaction */
0, /* xCommit - commit transaction */ rtreeEndTransaction, /* xCommit - commit transaction */
0, /* xRollback - rollback transaction */ rtreeEndTransaction, /* xRollback - rollback transaction */
0, /* xFindFunction - function overloading */ 0, /* xFindFunction - function overloading */
rtreeRename, /* xRename - rename the table */ rtreeRename, /* xRename - rename the table */
0, /* xSavepoint */ 0, /* xSavepoint */
0, /* xRelease */ 0, /* xRelease */
0 /* xRollbackTo */ 0, /* xRollbackTo */
}; };
static int rtreeSqlInit( static int rtreeSqlInit(
@ -3252,10 +3313,9 @@ static int rtreeSqlInit(
){ ){
int rc = SQLITE_OK; int rc = SQLITE_OK;
#define N_STATEMENT 9 #define N_STATEMENT 8
static const char *azSql[N_STATEMENT] = { static const char *azSql[N_STATEMENT] = {
/* Read and write the xxx_node table */ /* Write the xxx_node table */
"SELECT data FROM '%q'.'%q_node' WHERE nodeno = :1",
"INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(:1, :2)", "INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(:1, :2)",
"DELETE FROM '%q'.'%q_node' WHERE nodeno = :1", "DELETE FROM '%q'.'%q_node' WHERE nodeno = :1",
@ -3293,15 +3353,14 @@ static int rtreeSqlInit(
} }
} }
appStmt[0] = &pRtree->pReadNode; appStmt[0] = &pRtree->pWriteNode;
appStmt[1] = &pRtree->pWriteNode; appStmt[1] = &pRtree->pDeleteNode;
appStmt[2] = &pRtree->pDeleteNode; appStmt[2] = &pRtree->pReadRowid;
appStmt[3] = &pRtree->pReadRowid; appStmt[3] = &pRtree->pWriteRowid;
appStmt[4] = &pRtree->pWriteRowid; appStmt[4] = &pRtree->pDeleteRowid;
appStmt[5] = &pRtree->pDeleteRowid; appStmt[5] = &pRtree->pReadParent;
appStmt[6] = &pRtree->pReadParent; appStmt[6] = &pRtree->pWriteParent;
appStmt[7] = &pRtree->pWriteParent; appStmt[7] = &pRtree->pDeleteParent;
appStmt[8] = &pRtree->pDeleteParent;
rc = rtreeQueryStat1(db, pRtree); rc = rtreeQueryStat1(db, pRtree);
for(i=0; i<N_STATEMENT && rc==SQLITE_OK; i++){ for(i=0; i<N_STATEMENT && rc==SQLITE_OK; i++){
@ -3440,7 +3499,7 @@ static int rtreeInit(
pRtree->zDb = (char *)&pRtree[1]; pRtree->zDb = (char *)&pRtree[1];
pRtree->zName = &pRtree->zDb[nDb+1]; pRtree->zName = &pRtree->zDb[nDb+1];
pRtree->nDim = (u8)((argc-4)/2); pRtree->nDim = (u8)((argc-4)/2);
pRtree->nDim2 = argc - 4; pRtree->nDim2 = pRtree->nDim*2;
pRtree->nBytesPerCell = 8 + pRtree->nDim2*4; pRtree->nBytesPerCell = 8 + pRtree->nDim2*4;
pRtree->eCoordType = (u8)eCoordType; pRtree->eCoordType = (u8)eCoordType;
memcpy(pRtree->zDb, argv[1], nDb); memcpy(pRtree->zDb, argv[1], nDb);

2
ext/rtree/rtreeA.test
View File

@ -109,7 +109,7 @@ do_corruption_tests rtreeA-1.1 {
} }
do_execsql_test rtreeA-1.2.0 { DROP TABLE t1_node } {} do_execsql_test rtreeA-1.2.0 { DROP TABLE t1_node } {}
do_corruption_tests rtreeA-1.2 -error "SQL logic error or missing database" { do_corruption_tests rtreeA-1.2 -error "database disk image is malformed" {
1 "SELECT * FROM t1" 1 "SELECT * FROM t1"
2 "SELECT * FROM t1 WHERE rowid=5" 2 "SELECT * FROM t1 WHERE rowid=5"
3 "INSERT INTO t1 VALUES(1000, 1, 2, 3, 4)" 3 "INSERT INTO t1 VALUES(1000, 1, 2, 3, 4)"

16
manifest
View File

@ -1,5 +1,5 @@
C Improved\sperformance\sand\sstack\susage\swhen\sprocessing\sVALUES\sclauses\swith\na\svery\slarge\snumber\sof\srows. C In\sRTREE,\suse\san\ssqlite3_blob\sobject\srather\sthan\san\ssqlite3_stmt\sobject\nfor\sreading\scontent\sout\sof\sthe\s%_node\sshadow\stable.
D 2017-02-03T20:54:57.815 D 2017-02-04T14:24:05.401
F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964 F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@ -264,7 +264,7 @@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d55a097238a434b7e99caf318
F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88 F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
F ext/rtree/rtree.c 70f2488eef5c04dccf15a52cbd4961492124f825 F ext/rtree/rtree.c 0c229d23ce7b9bc69365281689065f3cbbe4561e
F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@ -275,7 +275,7 @@ F ext/rtree/rtree6.test 773a90db2dce6a8353dd0d5b64bca69b29761196
F ext/rtree/rtree7.test 1fa710b9e6bf997a0c1a537b81be7bb6fded1971 F ext/rtree/rtree7.test 1fa710b9e6bf997a0c1a537b81be7bb6fded1971
F ext/rtree/rtree8.test db79c812f9e4a11f9b1f3f9934007884610a713a F ext/rtree/rtree8.test db79c812f9e4a11f9b1f3f9934007884610a713a
F ext/rtree/rtree9.test b5eb13849545dfd271a54ff16784cb00d8792aea F ext/rtree/rtree9.test b5eb13849545dfd271a54ff16784cb00d8792aea
F ext/rtree/rtreeA.test ace05e729a36e342d40cf94e9efc7b4723d9dcdf F ext/rtree/rtreeA.test ac8b503931f2f397cc3c3303354e1e085dcadb86
F ext/rtree/rtreeB.test c85f9ce78766c4e68b8b89fbf2979ee9cfa82b4e F ext/rtree/rtreeB.test c85f9ce78766c4e68b8b89fbf2979ee9cfa82b4e
F ext/rtree/rtreeC.test c0a9c67f2efa98b6fae12acb8a28348d231a481d F ext/rtree/rtreeC.test c0a9c67f2efa98b6fae12acb8a28348d231a481d
F ext/rtree/rtreeD.test bdfaaf26df8b4eea7364039aca9150bc1e1f8825 F ext/rtree/rtreeD.test bdfaaf26df8b4eea7364039aca9150bc1e1f8825
@ -1552,8 +1552,8 @@ 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 83a099f139aba03edac19c890a0019e922032a25 f5306ad6816cc377036685cdae227e762885229c P 5706d4708a30eb54da0ecbb6eb02f54746c390d9 95ee745fceb4a48c683f34c404c380fe5e7d684a
R 907fd4e78b73041fa2c16ebe05829550 R ad6ed02dcc60e4bca51c672c64ac9b20
T +closed f5306ad6816cc377036685cdae227e762885229c T +closed 95ee745fceb4a48c683f34c404c380fe5e7d684a
U drh U drh
Z 822640b9e481bfb5464894fc5cf2cee4 Z c59d505acee8b5f741c72c39e5c6cdac

2
manifest.uuid
View File

@ -1 +1 @@
5706d4708a30eb54da0ecbb6eb02f54746c390d9 97ccf3e4de11ffea46993cb7fb7ab559b9810705