removed unused functions from test3.c (test code only); (CVS 6867)
FossilOrigin-Name: 0eb69e8dda13e2d52a06f66a71480f59fd766271
This commit is contained in:
shane
parent
df35a08cb7
commit
20a35fd826
20
manifest
20
manifest
@ -1,5 +1,5 @@
|
||||
C Simplifications\sand\sadditional\stestcase()\smacros\sfor\sbtree.c.\s(CVS\s6866)
|
||||
D 2009-07-09T02:24:35
|
||||
C removed\sunused\sfunctions\sfrom\stest3.c\s(test\scode\sonly);\s(CVS\s6867)
|
||||
D 2009-07-09T02:48:24
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -106,7 +106,7 @@ F src/auth.c 802a9439dfa0b8c208b10055cba400e82ef18025
|
||||
F src/backup.c 6f1c2d9862c8a3feb7739dfcca02c1f5352e37f3
|
||||
F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119
|
||||
F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
|
||||
F src/btree.c 3a97e228379449fcba6a18e88e425bcf433b1fe5
|
||||
F src/btree.c c9775946b5f4d974e6271621d7cc620d2c42027a
|
||||
F src/btree.h e761619e76a1125d2d82bd3613b5a7ac7d1ee6f7
|
||||
F src/btreeInt.h b31e5ac04181c7e2892c33ab06228c551df6233c
|
||||
F src/build.c 867028ee9f63f7bc8eb8d4a720bb98cf9b9a12b4
|
||||
@ -170,7 +170,7 @@ F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
|
||||
F src/tclsqlite.c e18e5013dc6bca9f25e6022fbe17ba3ccb821f95
|
||||
F src/test1.c c8f9358879876660b721369f576bf6e4ac5b9210
|
||||
F src/test2.c d73e4a490349245fb196b990b80684513e0ceaee
|
||||
F src/test3.c ec1592b2660c0e0a353659fe3f7538fbbbce50ec
|
||||
F src/test3.c 30db0ba4952e90f6a2df898ae76194f038baa35d
|
||||
F src/test4.c f79ab52d27ff49b784b631a42e2ccd52cfd5c84c
|
||||
F src/test5.c 162a1cea2105a2c460a3f39fa6919617b562a288
|
||||
F src/test6.c 1a0a7a1f179469044b065b4a88aab9faee114101
|
||||
@ -180,7 +180,7 @@ F src/test9.c 963d380922f25c1c323712d05db01b19197ee6f7
|
||||
F src/test_async.c 731d23f953ece5bf40ce87810cfb7607218953c5
|
||||
F src/test_autoext.c f53b0cdf7bf5f08100009572a5d65cdb540bd0ad
|
||||
F src/test_backup.c 1384a18985a5a2d275c2662e48473bf1542ebd08
|
||||
F src/test_btree.c d7b8716544611c323860370ee364e897c861f1b0
|
||||
F src/test_btree.c 5adbba9b138988a3cf4d3b5424dbc7c85651da02
|
||||
F src/test_config.c 63d1b08809ca182ee75429573111b44735861c64
|
||||
F src/test_devsym.c 9f4bc2551e267ce7aeda195f3897d0f30c5228f4
|
||||
F src/test_func.c b8140bc4ed0d290d5e22972eb2a3bfd40aa798dc
|
||||
@ -553,7 +553,7 @@ F test/speed1.test f2974a91d79f58507ada01864c0e323093065452
|
||||
F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
|
||||
F test/speed1p.test c4a469f29f135f4d76c55b1f2a52f36e209466cc
|
||||
F test/speed2.test 53177056baf6556dcbdcf032bbdfc41c1aa74ded
|
||||
F test/speed3.test e312d7e442a5047d730569fdae2ba99bc94e1a13
|
||||
F test/speed3.test 5a419039e9da95d906adb2298af2849600c81c11
|
||||
F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
|
||||
F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
|
||||
F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
|
||||
@ -740,7 +740,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
|
||||
P 890dbab28c3a1af4a1e01221318c9200574139e7
|
||||
R ecc6dc57b5c33bedd235ae3d99ecd320
|
||||
U drh
|
||||
Z 320c447326253cde8031c4d1800cda60
|
||||
P 1b8c3a8246a5d8b8f5607014f68483735a403249
|
||||
R ccb8347dc72fa638b9b09275bc5d246a
|
||||
U shane
|
||||
Z 91fc93570d27b2dc2dec0d52c39bbb91
|
||||
|
||||
@ -1 +1 @@
|
||||
1b8c3a8246a5d8b8f5607014f68483735a403249
|
||||
0eb69e8dda13e2d52a06f66a71480f59fd766271
|
||||
35
src/btree.c
35
src/btree.c
@ -9,7 +9,7 @@
|
||||
** May you share freely, never taking more than you give.
|
||||
**
|
||||
*************************************************************************
|
||||
** $Id: btree.c,v 1.666 2009/07/09 02:24:35 drh Exp $
|
||||
** $Id: btree.c,v 1.667 2009/07/09 02:48:24 shane Exp $
|
||||
**
|
||||
** This file implements a external (disk-based) database using BTrees.
|
||||
** See the header comment on "btreeInt.h" for additional information.
|
||||
@ -3381,39 +3381,6 @@ int sqlite3BtreeCloseCursor(BtCursor *pCur){
|
||||
return SQLITE_OK;
|
||||
}
|
||||
|
||||
#ifdef SQLITE_TEST
|
||||
/*
|
||||
** Make a temporary cursor by filling in the fields of pTempCur.
|
||||
** The temporary cursor is not on the cursor list for the Btree.
|
||||
*/
|
||||
void sqlite3BtreeGetTempCursor(BtCursor *pCur, BtCursor *pTempCur){
|
||||
int i;
|
||||
assert( cursorHoldsMutex(pCur) );
|
||||
memcpy(pTempCur, pCur, sizeof(BtCursor));
|
||||
pTempCur->pNext = 0;
|
||||
pTempCur->pPrev = 0;
|
||||
for(i=0; i<=pTempCur->iPage; i++){
|
||||
sqlite3PagerRef(pTempCur->apPage[i]->pDbPage);
|
||||
}
|
||||
assert( pTempCur->pKey==0 );
|
||||
}
|
||||
#endif /* SQLITE_TEST */
|
||||
|
||||
#ifdef SQLITE_TEST
|
||||
/*
|
||||
** Delete a temporary cursor such as was made by the CreateTemporaryCursor()
|
||||
** function above.
|
||||
*/
|
||||
void sqlite3BtreeReleaseTempCursor(BtCursor *pCur){
|
||||
int i;
|
||||
assert( cursorHoldsMutex(pCur) );
|
||||
for(i=0; i<=pCur->iPage; i++){
|
||||
sqlite3PagerUnref(pCur->apPage[i]->pDbPage);
|
||||
}
|
||||
sqlite3_free(pCur->pKey);
|
||||
}
|
||||
#endif /* SQLITE_TEST */
|
||||
|
||||
/*
|
||||
** Make sure the BtCursor* given in the argument has a valid
|
||||
** BtCursor.info structure. If it is not already valid, call
|
||||
|
||||
1002
src/test3.c
1002
src/test3.c
File diff suppressed because it is too large
Load Diff
@ -13,7 +13,7 @@
|
||||
** is not included in the SQLite library. It is used for automated
|
||||
** testing of the SQLite library.
|
||||
**
|
||||
** $Id: test_btree.c,v 1.8 2008/09/29 11:49:48 danielk1977 Exp $
|
||||
** $Id: test_btree.c,v 1.9 2009/07/09 02:48:24 shane Exp $
|
||||
*/
|
||||
#include "btreeInt.h"
|
||||
#include <tcl.h>
|
||||
@ -62,81 +62,3 @@ void sqlite3BtreeCursorList(Btree *p){
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
** Fill aResult[] with information about the entry and page that the
|
||||
** cursor is pointing to.
|
||||
**
|
||||
** aResult[0] = The page number
|
||||
** aResult[1] = The entry number
|
||||
** aResult[2] = Total number of entries on this page
|
||||
** aResult[3] = Cell size (local payload + header)
|
||||
** aResult[4] = Number of free bytes on this page
|
||||
** aResult[5] = Number of free blocks on the page
|
||||
** aResult[6] = Total payload size (local + overflow)
|
||||
** aResult[7] = Header size in bytes
|
||||
** aResult[8] = Local payload size
|
||||
** aResult[9] = Parent page number
|
||||
** aResult[10]= Page number of the first overflow page
|
||||
**
|
||||
** This routine is used for testing and debugging only.
|
||||
*/
|
||||
int sqlite3BtreeCursorInfo(BtCursor *pCur, int *aResult, int upCnt){
|
||||
#if 0
|
||||
int cnt, idx;
|
||||
MemPage *pPage = pCur->apPage[pCur->iPage];
|
||||
BtCursor tmpCur;
|
||||
int rc;
|
||||
|
||||
if( pCur->eState==CURSOR_REQUIRESEEK ){
|
||||
rc = sqlite3BtreeRestoreCursorPosition(pCur);
|
||||
if( rc!=SQLITE_OK ){
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
|
||||
assert( pPage->isInit );
|
||||
sqlite3BtreeGetTempCursor(pCur, &tmpCur);
|
||||
while( upCnt-- ){
|
||||
sqlite3BtreeMoveToParent(&tmpCur);
|
||||
}
|
||||
pPage = tmpCur.pPage;
|
||||
aResult[0] = sqlite3PagerPagenumber(pPage->pDbPage);
|
||||
assert( aResult[0]==pPage->pgno );
|
||||
aResult[1] = tmpCur.idx;
|
||||
aResult[2] = pPage->nCell;
|
||||
if( tmpCur.idx>=0 && tmpCur.idx<pPage->nCell ){
|
||||
sqlite3BtreeParseCell(tmpCur.pPage, tmpCur.idx, &tmpCur.info);
|
||||
aResult[3] = tmpCur.info.nSize;
|
||||
aResult[6] = tmpCur.info.nData;
|
||||
aResult[7] = tmpCur.info.nHeader;
|
||||
aResult[8] = tmpCur.info.nLocal;
|
||||
}else{
|
||||
aResult[3] = 0;
|
||||
aResult[6] = 0;
|
||||
aResult[7] = 0;
|
||||
aResult[8] = 0;
|
||||
}
|
||||
aResult[4] = pPage->nFree;
|
||||
cnt = 0;
|
||||
idx = get2byte(&pPage->aData[pPage->hdrOffset+1]);
|
||||
while( idx>0 && idx<pPage->pBt->usableSize ){
|
||||
cnt++;
|
||||
idx = get2byte(&pPage->aData[idx]);
|
||||
}
|
||||
aResult[5] = cnt;
|
||||
if( pPage->pParent==0 || sqlite3BtreeIsRootPage(pPage) ){
|
||||
aResult[9] = 0;
|
||||
}else{
|
||||
aResult[9] = pPage->pParent->pgno;
|
||||
}
|
||||
if( tmpCur.info.iOverflow ){
|
||||
aResult[10] = get4byte(&tmpCur.info.pCell[tmpCur.info.iOverflow]);
|
||||
}else{
|
||||
aResult[10] = 0;
|
||||
}
|
||||
sqlite3BtreeReleaseTempCursor(&tmpCur);
|
||||
#endif
|
||||
return SQLITE_OK;
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# focus of this script is testing that the overflow-page related
|
||||
# enhancements added after version 3.3.17 speed things up.
|
||||
#
|
||||
# $Id: speed3.test,v 1.5 2007/10/09 08:29:33 danielk1977 Exp $
|
||||
# $Id: speed3.test,v 1.6 2009/07/09 02:48:24 shane Exp $
|
||||
#
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
@ -105,18 +105,6 @@ proc io_log {db} {
|
||||
puts "Normal : Read $stats2(read), wrote $stats2(write)"
|
||||
}
|
||||
|
||||
proc overflow_report {db} {
|
||||
set bt [btree_from_db db]
|
||||
set csr [btree_cursor $bt 3 0]
|
||||
|
||||
for {btree_first $csr} {![btree_eof $csr]} {btree_next $csr} {
|
||||
puts "[btree_ovfl_info $bt $csr]"
|
||||
}
|
||||
|
||||
btree_close_cursor $csr
|
||||
|
||||
}
|
||||
|
||||
proc reset_db {} {
|
||||
db close
|
||||
sqlite3 db test.db
|
||||
@ -166,7 +154,6 @@ do_test speed3-0.4 {
|
||||
# Delete all content in a table, one row at a time.
|
||||
#
|
||||
#io_log db
|
||||
#overflow_report db
|
||||
reset_db
|
||||
speed_trial speed3-1.incrvacuum $::NROW row {DELETE FROM main.t1 WHERE 1}
|
||||
speed_trial speed3-1.normal $::NROW row {DELETE FROM aux.t1 WHERE 1}
|
||||
@ -177,7 +164,6 @@ io_log db
|
||||
#
|
||||
#db eval {PRAGMA incremental_vacuum(500000)}
|
||||
populate_t1 db
|
||||
#overflow_report db
|
||||
reset_db
|
||||
speed_trial speed3-2.incrvacuum $::NROW row {SELECT c FROM main.t1}
|
||||
speed_trial speed3-2.normal $::NROW row {SELECT c FROM aux.t1}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user