mirror of
https://github.com/sqlite/sqlite.git
synced 2026-01-06 08:01:16 +03:00
Make the pager accessible from the btree structure always, not just during
debugging. (CVS 1219) FossilOrigin-Name: 9c6b4758a4b13a91f71be17751a76c0c14b4d4c3
This commit is contained in:
drh
18
manifest
18
manifest
@@ -1,5 +1,5 @@
|
||||
C Move\sthe\sfile-format-2\sto\sfile-format-3\sconversion\sinto\ssqliteInit().\s(CVS\s1218)
|
||||
D 2004-02-10T02:27:04
|
||||
C Make\sthe\spager\saccessible\sfrom\sthe\sbtree\sstructure\salways,\snot\sjust\sduring\ndebugging.\s(CVS\s1219)
|
||||
D 2004-02-10T02:57:59
|
||||
F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
|
||||
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
|
||||
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
|
||||
@@ -23,9 +23,9 @@ F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
|
||||
F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
|
||||
F src/attach.c 4a0a3c0885fec11a0a199a8031694d08925d0a27
|
||||
F src/auth.c c59ad0dab501888f8b1fccc25e2f5965d2265116
|
||||
F src/btree.c 26d10f3149311665b2373273ca1cce29c3bc042f
|
||||
F src/btree.h 9b7c09f1e64274d7bb74a57bbfc63778f67b1048
|
||||
F src/btree_rb.c 50210dfd2a5f410c8624ef8fde8e82babd376d9f
|
||||
F src/btree.c c325d46f0aa815d73358bf2e044dab23f645c214
|
||||
F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f
|
||||
F src/btree_rb.c 9a22056a94ef3253dbcf58849b05dfc3284d8fac
|
||||
F src/build.c 0fdb0ce4bd87419b3930d0279e8277c4f9f69c1f
|
||||
F src/copy.c 9e47975ea96751c658bcf1a0c4f0bb7c6ee61e73
|
||||
F src/date.c c6b7e3fa5364d50fe19641882194f3c75364a5af
|
||||
@@ -47,7 +47,7 @@ F src/pragma.c 89d62c31c6f0a43376fe8d20549b87a6d30c467a
|
||||
F src/printf.c 84e4ea4ba49cbbf930e95e82295127ad5843ae1f
|
||||
F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
|
||||
F src/select.c a0211d1a6a94f6c3e611096e77f2d689a641495e
|
||||
F src/shell.c a069d35277983d54348105aa3c73be3c45eb9c38
|
||||
F src/shell.c 77b1d34a21b61cb8b0a2efa0152156f805c51897
|
||||
F src/sqlite.h.in 1798588cab21ebf9fac3aad7fc1539b396c1f91d
|
||||
F src/sqliteInt.h c5b727d5d07b88654c204c0fc1ae79c9f635a008
|
||||
F src/table.c d845cb101b5afc1f7fea083c99e3d2fa7998d895
|
||||
@@ -183,7 +183,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
|
||||
F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
|
||||
F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
|
||||
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
|
||||
P 4c7bf714b5f3d2bb7366367ddf906141a7e36407
|
||||
R f85f80413b9f3d1ec6ff32e333e954ad
|
||||
P dcbe2800be2f805818724a7b9e468c4fd4f02529
|
||||
R 85e858a1093e6b36bad94c1bcb34e5e5
|
||||
U drh
|
||||
Z a139fd450dfe5d0adfcdd504d2d2ab73
|
||||
Z 57ec882d2b4f4ece7049887110b9b4b3
|
||||
|
||||
@@ -1 +1 @@
|
||||
dcbe2800be2f805818724a7b9e468c4fd4f02529
|
||||
9c6b4758a4b13a91f71be17751a76c0c14b4d4c3
|
||||
@@ -9,7 +9,7 @@
|
||||
** May you share freely, never taking more than you give.
|
||||
**
|
||||
*************************************************************************
|
||||
** $Id: btree.c,v 1.99 2004/02/10 01:54:28 drh Exp $
|
||||
** $Id: btree.c,v 1.100 2004/02/10 02:57:59 drh Exp $
|
||||
**
|
||||
** This file implements a external (disk-based) database using BTrees.
|
||||
** For a detailed discussion of BTrees, refer to
|
||||
@@ -3139,7 +3139,6 @@ static int fileBtreeCursorDump(BtCursor *pCur, int *aResult){
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef SQLITE_TEST
|
||||
/*
|
||||
** Return the pager associated with a BTree. This routine is used for
|
||||
** testing and debugging only.
|
||||
@@ -3147,7 +3146,6 @@ static int fileBtreeCursorDump(BtCursor *pCur, int *aResult){
|
||||
static Pager *fileBtreePager(Btree *pBt){
|
||||
return pBt->pPager;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
** This structure is passed around through all the sanity checking routines
|
||||
@@ -3555,9 +3553,9 @@ static BtOps sqliteBtreeOps = {
|
||||
fileBtreeIntegrityCheck,
|
||||
fileBtreeGetFilename,
|
||||
fileBtreeCopyFile,
|
||||
fileBtreePager,
|
||||
#ifdef SQLITE_TEST
|
||||
fileBtreePageDump,
|
||||
fileBtreePager
|
||||
#endif
|
||||
};
|
||||
static BtCursorOps sqliteBtreeCursorOps = {
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
** subsystem. See comments in the source code for a detailed description
|
||||
** of what each interface routine does.
|
||||
**
|
||||
** @(#) $Id: btree.h,v 1.35 2003/06/01 01:10:33 drh Exp $
|
||||
** @(#) $Id: btree.h,v 1.36 2004/02/10 02:57:59 drh Exp $
|
||||
*/
|
||||
#ifndef _BTREE_H_
|
||||
#define _BTREE_H_
|
||||
@@ -57,9 +57,9 @@ struct BtOps {
|
||||
char *(*IntegrityCheck)(Btree*, int*, int);
|
||||
const char *(*GetFilename)(Btree*);
|
||||
int (*Copyfile)(Btree*,Btree*);
|
||||
struct Pager *(*Pager)(Btree*);
|
||||
#ifdef SQLITE_TEST
|
||||
int (*PageDump)(Btree*, int, int);
|
||||
struct Pager *(*Pager)(Btree*);
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -142,13 +142,13 @@ int sqliteRbtreeOpen(const char *zFilename, int mode, int nPg, Btree **ppBtree);
|
||||
(btOps(pBt)->IntegrityCheck(pBt, aRoot, nRoot))
|
||||
#define sqliteBtreeGetFilename(pBt) (btOps(pBt)->GetFilename(pBt))
|
||||
#define sqliteBtreeCopyFile(pBt1, pBt2) (btOps(pBt1)->Copyfile(pBt1, pBt2))
|
||||
#define sqliteBtreePager(pBt) (btOps(pBt)->Pager(pBt))
|
||||
|
||||
#ifdef SQLITE_TEST
|
||||
#define sqliteBtreePageDump(pBt, pgno, recursive)\
|
||||
(btOps(pBt)->PageDump(pBt, pgno, recursive))
|
||||
#define sqliteBtreeCursorDump(pCur, aResult)\
|
||||
(btCOps(pCur)->CursorDump(pCur, aResult))
|
||||
#define sqliteBtreePager(pBt) (btOps(pBt)->Pager(pBt))
|
||||
int btree_native_byte_order;
|
||||
#endif /* SQLITE_TEST */
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
** May you share freely, never taking more than you give.
|
||||
**
|
||||
*************************************************************************
|
||||
** $Id: btree_rb.c,v 1.20 2004/01/12 00:38:18 drh Exp $
|
||||
** $Id: btree_rb.c,v 1.21 2004/02/10 02:57:59 drh Exp $
|
||||
**
|
||||
** This file implements an in-core database using Red-Black balanced
|
||||
** binary trees.
|
||||
@@ -1421,13 +1421,13 @@ static int memRbtreeCursorDump(RbtCursor* pCur, int* aRes)
|
||||
assert(!"Cannot call sqliteRbtreeCursorDump");
|
||||
return SQLITE_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct Pager *memRbtreePager(Rbtree* tree)
|
||||
{
|
||||
assert(!"Cannot call sqliteRbtreePager");
|
||||
return SQLITE_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
** Return the full pathname of the underlying database file.
|
||||
@@ -1463,10 +1463,9 @@ static BtOps sqliteRbtreeOps = {
|
||||
(char*(*)(Btree*,int*,int)) memRbtreeIntegrityCheck,
|
||||
(const char*(*)(Btree*)) memRbtreeGetFilename,
|
||||
(int(*)(Btree*,Btree*)) memRbtreeCopyFile,
|
||||
|
||||
(struct Pager*(*)(Btree*)) memRbtreePager,
|
||||
#ifdef SQLITE_TEST
|
||||
(int(*)(Btree*,int,int)) memRbtreePageDump,
|
||||
(struct Pager*(*)(Btree*)) memRbtreePager
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
** This file contains code to implement the "sqlite" command line
|
||||
** utility for accessing SQLite databases.
|
||||
**
|
||||
** $Id: shell.c,v 1.84 2004/02/01 01:22:51 drh Exp $
|
||||
** $Id: shell.c,v 1.85 2004/02/10 02:57:59 drh Exp $
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -1170,6 +1170,9 @@ static const char zOptions[] =
|
||||
" -[no]header turn headers on or off\n"
|
||||
" -column set output mode to 'column'\n"
|
||||
" -html set output mode to HTML\n"
|
||||
#ifdef SQLITE_HAS_CRYPTO
|
||||
" -key KEY encryption key\n"
|
||||
#endif
|
||||
" -line set output mode to 'line'\n"
|
||||
" -list set output mode to 'list'\n"
|
||||
" -separator 'x' set output field separator (|)\n"
|
||||
|
||||
Reference in New Issue
Block a user