Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Use %w instead of %q when constructing shadow table names for rtree. (CVS 5161) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
78f4ba974d9b768b62391d8cd2ed407d |
| User & Date: | drh 2008-05-26 20:49:03 |
Context
|
2008-05-27
| ||
| 00:06 | Fix a bug in rtree that occurs when too many constraints are passed in on a query. (CVS 5162) check-in: 54b84a3d user: drh tags: trunk | |
|
2008-05-26
| ||
| 20:49 | Use %w instead of %q when constructing shadow table names for rtree. (CVS 5161) check-in: 78f4ba97 user: drh tags: trunk | |
| 20:19 | Update the amalgamation builder to incorporate the RTREE extension. (CVS 5160) check-in: aa8eba33 user: drh tags: trunk | |
Changes
Changes to ext/rtree/rtree.c.
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 .... 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 .... 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code for implementations of the r-tree and r*-tree ** algorithms packaged as an SQLite virtual table module. ** ** $Id: rtree.c,v 1.2 2008/05/26 20:19:25 drh Exp $ */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE) /* ** This file contains an implementation of a couple of different variants ** of the r-tree algorithm. See the README file for further details. The ................................................................................ /* ** The xRename method for rtree module virtual tables. */ static int rtreeRename(sqlite3_vtab *pVtab, const char *zNewName){ Rtree *pRtree = (Rtree *)pVtab; int rc = SQLITE_NOMEM; char *zSql = sqlite3_mprintf( "ALTER TABLE %Q.'%q_node' RENAME TO '%q_node';" "ALTER TABLE %Q.'%q_parent' RENAME TO '%q_parent';" "ALTER TABLE %Q.'%q_rowid' RENAME TO '%q_rowid';" , pRtree->zDb, pRtree->zName, zNewName , pRtree->zDb, pRtree->zName, zNewName , pRtree->zDb, pRtree->zName, zNewName ); if( zSql ){ rc = sqlite3_exec(pRtree->db, zSql, 0, 0, 0); sqlite3_free(zSql); ................................................................................ sqlite3_stmt **appStmt[N_STATEMENT]; int i; pRtree->db = db; if( isCreate ){ char *zCreate = sqlite3_mprintf( "CREATE TABLE '%q'.'%q_node'(nodeno INTEGER PRIMARY KEY, data BLOB);" "CREATE TABLE '%q'.'%q_rowid'(rowid INTEGER PRIMARY KEY, nodeno INTEGER);" "CREATE TABLE '%q'.'%q_parent'(nodeno INTEGER PRIMARY KEY, parentnode INTEGER);" "INSERT INTO '%q'.'%q_node' VALUES(1, zeroblob(%d))", zDb, zPrefix, zDb, zPrefix, zDb, zPrefix, zDb, zPrefix, pRtree->iNodeSize ); if( !zCreate ){ return SQLITE_NOMEM; } rc = sqlite3_exec(db, zCreate, 0, 0, 0); |
| | | | | | | |
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 .... 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 .... 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code for implementations of the r-tree and r*-tree ** algorithms packaged as an SQLite virtual table module. ** ** $Id: rtree.c,v 1.3 2008/05/26 20:49:03 drh Exp $ */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE) /* ** This file contains an implementation of a couple of different variants ** of the r-tree algorithm. See the README file for further details. The ................................................................................ /* ** The xRename method for rtree module virtual tables. */ static int rtreeRename(sqlite3_vtab *pVtab, const char *zNewName){ Rtree *pRtree = (Rtree *)pVtab; int rc = SQLITE_NOMEM; char *zSql = sqlite3_mprintf( "ALTER TABLE %Q.'%q_node' RENAME TO \"%w_node\";" "ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";" "ALTER TABLE %Q.'%q_rowid' RENAME TO \"%w_rowid\";" , pRtree->zDb, pRtree->zName, zNewName , pRtree->zDb, pRtree->zName, zNewName , pRtree->zDb, pRtree->zName, zNewName ); if( zSql ){ rc = sqlite3_exec(pRtree->db, zSql, 0, 0, 0); sqlite3_free(zSql); ................................................................................ sqlite3_stmt **appStmt[N_STATEMENT]; int i; pRtree->db = db; if( isCreate ){ char *zCreate = sqlite3_mprintf( "CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY, data BLOB);" "CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY, nodeno INTEGER);" "CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY, parentnode INTEGER);" "INSERT INTO '%q'.'%q_node' VALUES(1, zeroblob(%d))", zDb, zPrefix, zDb, zPrefix, zDb, zPrefix, zDb, zPrefix, pRtree->iNodeSize ); if( !zCreate ){ return SQLITE_NOMEM; } rc = sqlite3_exec(db, zCreate, 0, 0, 0); |
Changes to ext/rtree/rtree1.test.
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 ... 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 ... 354 355 356 357 358 359 360 361 |
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # # The focus of this file is testing the r-tree extension. # # $Id: rtree1.test,v 1.1 2008/05/26 18:41:54 danielk1977 Exp $ # set testdir [file join [file dirname $argv0] .. .. test] source $testdir/tester.tcl # Test plan: # ................................................................................ # Force the r-tree constructor to fail. # do_test rtree-1.6.1 { execsql { CREATE TABLE t1_rowid(a); } catchsql { CREATE VIRTUAL TABLE t1 USING rtree("the key", "x dim.", "x2'dim"); } } {1 {table 't1_rowid' already exists}} do_test rtree-1.6.1 { execsql { DROP TABLE t1_rowid } } {} #---------------------------------------------------------------------------- # Test cases rtree-2.* # ................................................................................ do_test rtree-8.1.5 { execsql { SELECT ii FROM t6 WHERE x1>5 } } {} do_test rtree-8.1.6 { execsql { SELECT ii FROM t6 WHERE x1<3 } } {} do_test rtree-8.1.7 { execsql { SELECT ii FROM t6 WHERE x1<4 } } {1} do_test rtree-8.1.8 { execsql { SELECT ii FROM t6 WHERE x1<5 } } {1 2} finish_test |
| | < |
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 ... 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 ... 354 355 356 357 358 359 360 |
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # # The focus of this file is testing the r-tree extension. # # $Id: rtree1.test,v 1.2 2008/05/26 20:49:04 drh Exp $ # set testdir [file join [file dirname $argv0] .. .. test] source $testdir/tester.tcl # Test plan: # ................................................................................ # Force the r-tree constructor to fail. # do_test rtree-1.6.1 { execsql { CREATE TABLE t1_rowid(a); } catchsql { CREATE VIRTUAL TABLE t1 USING rtree("the key", "x dim.", "x2'dim"); } } {1 {table "t1_rowid" already exists}} do_test rtree-1.6.1 { execsql { DROP TABLE t1_rowid } } {} #---------------------------------------------------------------------------- # Test cases rtree-2.* # ................................................................................ do_test rtree-8.1.5 { execsql { SELECT ii FROM t6 WHERE x1>5 } } {} do_test rtree-8.1.6 { execsql { SELECT ii FROM t6 WHERE x1<3 } } {} do_test rtree-8.1.7 { execsql { SELECT ii FROM t6 WHERE x1<4 } } {1} do_test rtree-8.1.8 { execsql { SELECT ii FROM t6 WHERE x1<5 } } {1 2} finish_test |