database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Further tests for legacy rtree geom callbacks.

Browse Source 
FossilOrigin-Name: 99d6bb22e8735681443bfe67287aa15ce2c57d0d63e304abf8aa01fde50dd021
This commit is contained in:
dan
2021-09-18 16:15:54 +00:00
parent d96bcc75e8
commit 5488e0827a
4 changed files with 150 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
ext/rtree/rtreedoc2.test
View File

@ -242,7 +242,104 @@ foreach {tn q vals} {
do_test 5.$tn.2 { set ::box_geom } $vals
}
do_execsql_test 5.0 {
CREATE VIRTUAL TABLE myrtree USING rtree(id, x1,x2);
INSERT INTO myrtree VALUES(1, 1, 1);
INSERT INTO myrtree VALUES(2, 2, 2);
INSERT INTO myrtree VALUES(3, 3, 3);
}
# EVIDENCE-OF: R-44448-00687 The pUser and xDelUser members of the
# sqlite3_rtree_geometry structure are initially set to NULL.
set ::box_geom_calls 0
proc box_geom {args} {
incr ::box_geom_calls
return user_is_zero
}
do_execsql_test 5.1.1 {
SELECT * FROM myrtree WHERE id MATCH box(4, 5);
}
do_test 5.1.2 { set ::box_geom_calls } 3
# EVIDENCE-OF: R-55837-00155 The pUser variable may be set by the
# callback implementation to any arbitrary value that may be useful to
# subsequent invocations of the callback within the same query (for
# example, a pointer to a complicated data structure used to test for
# region intersection).
#
# EVIDENCE-OF: R-34745-08839 If the xDelUser variable is set to a
# non-NULL value, then after the query has finished running SQLite
# automatically invokes it with the value of the pUser variable as the
# only argument.
#
set ::box_geom_calls 0
proc box_geom {args} {
incr ::box_geom_calls
switch -- $::box_geom_calls {
1 {
return user_is_zero
}
2 {
return [list user box_geom_finalizer]
}
}
return ""
}
proc box_geom_finalizer {} {
set ::box_geom_finalizer "::box_geom_calls is $::box_geom_calls"
}
do_execsql_test 5.1.1 {
SELECT * FROM myrtree WHERE id MATCH box(4, 5);
}
do_test 5.1.2 { set ::box_geom_calls } 3
do_test 5.1.3 {
set ::box_geom_finalizer
} {::box_geom_calls is 3}
# EVIDENCE-OF: R-28176-28813 The xGeom callback always does a
# depth-first search of the r-tree.
#
# For a breadth first search, final test case would return "B L" only.
#
do_execsql_test 6.0 {
CREATE VIRTUAL TABLE xyz USING rtree(x, x1,x2, y1,y2);
WITH s(i) AS (
VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<15
)
INSERT INTO xyz SELECT NULL, one.i,one.i+1, two.i,two.i+1 FROM s one, s two;
}
do_execsql_test 6.1 {
SELECT count(*) FROM xyz_node
} {10}
proc box_geom {args} {
set coords [lindex $args 3]
set area [expr {
([lindex $coords 1]-[lindex $coords 0]) *
([lindex $coords 3]-[lindex $coords 2])
}]
if {$area==1} {
lappend ::box_geom_calls L
} else {
lappend ::box_geom_calls B
}
}
set ::box_geom_calls [list]
do_execsql_test 6.2 {
SELECT count(*) FROM xyz WHERE x MATCH box(0,20,0,20)
} 225
do_test 6.3 {
set prev ""
set box_calls [list]
foreach c $::box_geom_calls {
if {$c!=$prev} {
lappend ::box_calls $c
set prev $c
}
}
set ::box_calls
} {B L B L B L B L B L B L B L B L B L}
finish_test

50
ext/rtree/test_rtreedoc.c
View File

@ -31,6 +31,13 @@ struct BoxGeomCtx {
Tcl_Obj *pScript;
};
static void testDelUser(void *pCtx){
BoxGeomCtx *p = (BoxGeomCtx*)pCtx;
Tcl_EvalObjEx(p->interp, p->pScript, 0);
Tcl_DecrRefCount(p->pScript);
sqlite3_free(p);
}
static int invokeTclGeomCb(
const char *zName,
sqlite3_rtree_geometry *p,
@ -48,6 +55,7 @@ static int invokeTclGeomCb(
int ii;
Tcl_Obj *pRes;
pScript = Tcl_DuplicateObj(pCtx->pScript);
Tcl_IncrRefCount(pScript);
Tcl_ListObjAppendElement(interp, pScript, Tcl_NewStringObj(zName,-1));
@ -73,12 +81,41 @@ static int invokeTclGeomCb(
Tcl_ListObjAppendElement(interp, pScript, Tcl_NewStringObj(aPtr,-1));
rc = Tcl_EvalObjEx(interp, pScript, 0);
if( rc!=TCL_OK ) rc = SQLITE_ERROR;
if( rc!=TCL_OK ){
rc = SQLITE_ERROR;
}else{
int nObj = 0;
Tcl_Obj **aObj = 0;
pRes = Tcl_GetObjResult(interp);
if( 0==sqlite3_stricmp(Tcl_GetString(pRes), "zero") ){
p->aParam[0] = 0.0;
p->nParam = 1;
pRes = Tcl_GetObjResult(interp);
if( Tcl_ListObjGetElements(interp, pRes, &nObj, &aObj) ) return TCL_ERROR;
if( nObj>0 ){
const char *zCmd = Tcl_GetString(aObj[0]);
if( 0==sqlite3_stricmp(zCmd, "zero") ){
p->aParam[0] = 0.0;
p->nParam = 1;
}
else if( 0==sqlite3_stricmp(zCmd, "user") ){
if( p->pUser || p->xDelUser ){
rc = SQLITE_ERROR;
}else{
BoxGeomCtx *pCtx = sqlite3_malloc(sizeof(BoxGeomCtx));
if( pCtx==0 ){
rc = SQLITE_NOMEM;
}else{
pCtx->interp = interp;
pCtx->pScript = Tcl_DuplicateObj(pRes);
Tcl_IncrRefCount(pCtx->pScript);
Tcl_ListObjReplace(interp, pCtx->pScript, 0, 1, 0, 0);
p->pUser = (void*)pCtx;
p->xDelUser = testDelUser;
}
}
}
else if( 0==sqlite3_stricmp(zCmd, "user_is_zero") ){
if( p->pUser || p->xDelUser ) rc = SQLITE_ERROR;
}
}
}
}
return rc;
@ -140,7 +177,6 @@ static int SQLITE_TCLAPI register_box_geom(
extern int getDbPointer(Tcl_Interp*, const char*, sqlite3**);
extern const char *sqlite3ErrName(int);
sqlite3 *db;
int rc;
BoxGeomCtx *pCtx;
char aPtr[64];
@ -155,7 +191,7 @@ static int SQLITE_TCLAPI register_box_geom(
pCtx->pScript = Tcl_DuplicateObj(objv[2]);
Tcl_IncrRefCount(pCtx->pScript);
rc = sqlite3_rtree_geometry_callback(db, "box", box_geom, (void*)pCtx);
sqlite3_rtree_geometry_callback(db, "box", box_geom, (void*)pCtx);
sqlite3_snprintf(64, aPtr, "%p", (void*)pCtx);
Tcl_SetObjResult(interp, Tcl_NewStringObj(aPtr, -1));