Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Capture BTREE_FORDELETE test cases that were mistakenly omitted from the previous merge. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
de6972515f65c5cf5da7cfdf876a0571 |
User & Date: | drh 2015-10-26 18:01:36.030 |
Context
2015-10-26
| ||
20:39 | Add new extended error code SQLITE_IOERR_AUTH. (check-in: b4e70dd08e user: dan tags: trunk) | |
20:11 | Merge the BTREE_FORDELETE enhancement with this branch. (check-in: 20da0849ce user: dan tags: cursor-hints) | |
18:01 | Capture BTREE_FORDELETE test cases that were mistakenly omitted from the previous merge. (check-in: de6972515f user: drh tags: trunk) | |
17:50 | Provide the BTREE_FORDELETE flag to sqlite3BtreeCursor() if the cursor will be used only for deletions and seeking. (check-in: 871b1c78bc user: drh tags: trunk) | |
16:34 | Fix an uninitialized variable problem in the test code added by the previous commit. (Closed-Leaf check-in: 7849662ef9 user: dan tags: btree-fordelete-flag) | |
Changes
Changes to src/test3.c.
︙ | ︙ | |||
215 216 217 218 219 220 221 | if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR; if( Tcl_GetBoolean(interp, argv[3], &wrFlag) ) return TCL_ERROR; if( wrFlag ) wrFlag = BTREE_WRCSR; pCur = (BtCursor *)ckalloc(sqlite3BtreeCursorSize()); memset(pCur, 0, sqlite3BtreeCursorSize()); sqlite3BtreeEnter(pBt); #ifndef SQLITE_OMIT_SHARED_CACHE | | | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 | if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR; if( Tcl_GetBoolean(interp, argv[3], &wrFlag) ) return TCL_ERROR; if( wrFlag ) wrFlag = BTREE_WRCSR; pCur = (BtCursor *)ckalloc(sqlite3BtreeCursorSize()); memset(pCur, 0, sqlite3BtreeCursorSize()); sqlite3BtreeEnter(pBt); #ifndef SQLITE_OMIT_SHARED_CACHE rc = sqlite3BtreeLockTable(pBt, iTable, !!wrFlag); #endif if( rc==SQLITE_OK ){ rc = sqlite3BtreeCursor(pBt, iTable, wrFlag, 0, pCur); } sqlite3BtreeLeave(pBt); if( rc ){ ckfree((char *)pCur); |
︙ | ︙ | |||
595 596 597 598 599 600 601 602 603 604 605 606 607 608 | sqlite3BtreeEnter(pBt); sqlite3BtreeSetCacheSize(pBt, nCache); sqlite3BtreeLeave(pBt); sqlite3_mutex_leave(pBt->db->mutex); return TCL_OK; } /* ** Register commands with the TCL interpreter. */ int Sqlitetest3_Init(Tcl_Interp *interp){ static struct { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 | sqlite3BtreeEnter(pBt); sqlite3BtreeSetCacheSize(pBt, nCache); sqlite3BtreeLeave(pBt); sqlite3_mutex_leave(pBt->db->mutex); return TCL_OK; } /* ** usage: btree_insert CSR ?KEY? VALUE ** ** Set the size of the cache used by btree $ID. */ static int btree_insert( ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ){ BtCursor *pCur; int rc; void *pKey = 0; int nKey = 0; void *pData = 0; int nData = 0; if( objc!=4 && objc!=3 ){ Tcl_WrongNumArgs(interp, 1, objv, "?-intkey? CSR KEY VALUE"); return TCL_ERROR; } if( objc==4 ){ if( Tcl_GetIntFromObj(interp, objv[2], &nKey) ) return TCL_ERROR; pData = (void*)Tcl_GetByteArrayFromObj(objv[3], &nData); }else{ pKey = (void*)Tcl_GetByteArrayFromObj(objv[2], &nKey); } pCur = (BtCursor*)sqlite3TestTextToPtr(Tcl_GetString(objv[1])); sqlite3BtreeEnter(pCur->pBtree); rc = sqlite3BtreeInsert(pCur, pKey, nKey, pData, nData, 0, 0, 0); sqlite3BtreeLeave(pCur->pBtree); Tcl_ResetResult(interp); if( rc ){ Tcl_AppendResult(interp, sqlite3ErrName(rc), 0); return TCL_ERROR; } return TCL_OK; } /* ** Register commands with the TCL interpreter. */ int Sqlitetest3_Init(Tcl_Interp *interp){ static struct { |
︙ | ︙ | |||
625 626 627 628 629 630 631 632 633 634 | { "btree_set_cache_size", (Tcl_CmdProc*)btree_set_cache_size } }; int i; for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){ Tcl_CreateCommand(interp, aCmd[i].zName, aCmd[i].xProc, 0, 0); } return TCL_OK; } | > > | 667 668 669 670 671 672 673 674 675 676 677 678 | { "btree_set_cache_size", (Tcl_CmdProc*)btree_set_cache_size } }; int i; for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){ Tcl_CreateCommand(interp, aCmd[i].zName, aCmd[i].xProc, 0, 0); } Tcl_CreateObjCommand(interp, "btree_insert", btree_insert, 0, 0); return TCL_OK; } |
Changes to test/fordelete.test.
︙ | ︙ | |||
72 73 74 75 76 77 78 | 2 { DELETE FROM t2 WHERE a=? AND +b=?} { t2 t2a t2b* t2c* } 3 { DELETE FROM t2 WHERE a=? OR b=?} { t2 t2a* t2b* t2c* } 4 { DELETE FROM t2 WHERE +a=? } { t2 t2a* t2b* t2c* } 5 { DELETE FROM t2 WHERE rowid=? } { t2 t2a* t2b* t2c* } } { do_adp_test 2.$tn $sql $res } | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | 2 { DELETE FROM t2 WHERE a=? AND +b=?} { t2 t2a t2b* t2c* } 3 { DELETE FROM t2 WHERE a=? OR b=?} { t2 t2a* t2b* t2c* } 4 { DELETE FROM t2 WHERE +a=? } { t2 t2a* t2b* t2c* } 5 { DELETE FROM t2 WHERE rowid=? } { t2 t2a* t2b* t2c* } } { do_adp_test 2.$tn $sql $res } #------------------------------------------------------------------------- # Test that a record that consists of the bytes: # # 0x01 0x00 # # is interpreted by OP_Column as a vector of NULL values (assuming the # default column values are NULL). Also test that: # # 0x00 # # is handled in the same way. # do_execsql_test 3.0 { CREATE TABLE x1(a INTEGER PRIMARY KEY, b, c, d); CREATE TABLE x2(a INTEGER PRIMARY KEY, b, c, d); } do_test 3.1 { set root [db one { SELECT rootpage FROM sqlite_master WHERE name = 'x1' }] db eval { BEGIN IMMEDIATE; } set bt [btree_from_db db] set csr [btree_cursor $bt $root 1] btree_insert $csr 5 "\000" btree_close_cursor $csr db eval { COMMIT } db eval { SELECT * FROM x1; } } {5 {} {} {}} do_test 3.2 { set root [db one { SELECT rootpage FROM sqlite_master WHERE name = 'x2' }] db eval { BEGIN IMMEDIATE; } set bt [btree_from_db db] set csr [btree_cursor $bt $root 1] btree_insert $csr 6 "\000" btree_close_cursor $csr db eval { COMMIT } db eval { SELECT * FROM x2; } } {6 {} {} {}} finish_test |