Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Support scan queries on fast-insert data. Still some problems. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
0cd2ab7e9e4f18fd22e3a5a2ff2a9e16 |
| User & Date: | dan 2013-12-05 20:08:26 |
Context
|
2013-12-06
| ||
| 20:11 | Fix problems with delete markers and range scans. check-in: ccf5a6bb6a user: dan tags: trunk | |
|
2013-12-05
| ||
| 20:08 | Support scan queries on fast-insert data. Still some problems. check-in: 0cd2ab7e9e user: dan tags: trunk | |
|
2013-11-28
| ||
| 18:24 | Write a delete-key into the top level of the fast-insert tree when an item is deleted. Change the seek code so that if a delete-key is encountered SQLITE4_NOTFOUND is returned to the caller. check-in: d9fa045dd7 user: dan tags: trunk | |
Changes
Changes to lsm-test/lsmtest1.c.
159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 |
int nLookupTest, /* Number of lookup tests to run */
int nScanTest, /* Number of scan tests to run */
int *pRc /* IN/OUT: Error code */
){
int j;
int rc = *pRc;
if( 0 && rc==0 && nScanTest ){
TestDb *pDb2 = 0;
/* Open a control db (i.e. one that we assume works) */
rc = testControlDb(&pDb2);
for(j=iFirst; rc==0 && j<=iLast; j++){
void *pKey; int nKey; /* Database key to insert */
|
| |
159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 |
int nLookupTest, /* Number of lookup tests to run */
int nScanTest, /* Number of scan tests to run */
int *pRc /* IN/OUT: Error code */
){
int j;
int rc = *pRc;
if( rc==0 && nScanTest ){
TestDb *pDb2 = 0;
/* Open a control db (i.e. one that we assume works) */
rc = testControlDb(&pDb2);
for(j=iFirst; rc==0 && j<=iLast; j++){
void *pKey; int nKey; /* Database key to insert */
|
Changes to src/bt_log.c.
419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 |
){
#if BT_VAL_DEBUG
u8 aKBuf[40];
u8 aVBuf[40];
static int nCall = 0;
binToStr(pK, nK, aKBuf, sizeof(aKBuf));
binToStr(pV, nV, aVBuf, sizeof(aVBuf));
fprintf(stderr, "%d:%d: %s \"%s\" -> \"%s\" (%d bytes)\n",
pLock->iDebugId, nCall++, zStr, aKBuf, aVBuf, nV
);
fflush(stderr);
#endif
}
|
> > > | > |
419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 |
){
#if BT_VAL_DEBUG
u8 aKBuf[40];
u8 aVBuf[40];
static int nCall = 0;
binToStr(pK, nK, aKBuf, sizeof(aKBuf));
if( nV<0 ){
memcpy(aVBuf, "(delete)", 9);
}else{
binToStr(pV, nV, aVBuf, sizeof(aVBuf));
}
fprintf(stderr, "%d:%d: %s \"%s\" -> \"%s\" (%d bytes)\n",
pLock->iDebugId, nCall++, zStr, aKBuf, aVBuf, nV
);
fflush(stderr);
#endif
}
|
Changes to src/bt_main.c.
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 .. 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 ... 230 231 232 233 234 235 236 237 238 239 240 241 242 243 ... 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 ... 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 ... 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 ... 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 ... 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 .... 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 .... 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 .... 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 .... 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 .... 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 .... 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 .... 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 |
struct BtOvfl {
int nKey;
int nVal;
sqlite4_buffer buf;
};
/*
** Candidate values for bt_cursor.eType.
*/
#define CSR_TYPE_BT 0 /* Regular b-tree cursor */
#define CSR_TYPE_FAST 1 /* Fast-insert-tree cursor */
/*
** Base class for both cursor types (BtCursor and FiCursor).
*/
struct bt_cursor {
int eType; /* Cursor type */
void *pExtra; /* Extra allocated space */
bt_db *pDb; /* Database this cursor belongs to */
bt_cursor *pNextCsr; /* Next cursor opened by same db handle */
};
/*
** Database b-tree cursor handle.
................................................................................
#if !defined(NDEBUG)
static void btCheckPageRefs(bt_db *pDb){
int nActual = 0; /* Outstanding refs according to pager */
int nExpect = 0; /* According to the set of open cursors */
bt_cursor *pCsr; /* Iterator variable */
for(pCsr=pDb->pAllCsr; pCsr; pCsr=pCsr->pNextCsr){
if( pCsr->eType==CSR_TYPE_BT ){
BtCursor *p = (BtCursor*)pCsr;
if( p->nPg>0 ) nExpect += p->nPg;
}else{
FiCursor *p = (FiCursor*)pCsr;
int i;
for(i=0; i<p->nBt; i++){
if( p->aBt[i].nPg>0 ) nExpect += p->aBt[i].nPg;
................................................................................
int sqlite4BtTransactionLevel(bt_db *db){
return sqlite4BtPagerTransactionLevel(db->pPager);
}
static void btCsrSetup(bt_db *db, u32 iRoot, BtCursor *pCsr){
memset(pCsr, 0, sizeof(BtCursor));
pCsr->base.pExtra = (void*)&pCsr[1];
pCsr->base.pDb = db;
pCsr->iRoot = iRoot;
sqlite4_env_config(db->pEnv, SQLITE4_ENVCONFIG_GETMM, &pCsr->ovfl.buf.pMM);
}
int sqlite4BtCsrOpen(bt_db *db, int nExtra, bt_cursor **ppCsr){
................................................................................
FiCursor *pCsr;
pCsr = (FiCursor*)sqlite4_malloc(db->pEnv, nByte);
if( pCsr==0 ){
rc = btErrorBkpt(SQLITE4_NOMEM);
}else{
memset(pCsr, 0, nByte);
pCsr->base.eType = CSR_TYPE_FAST;
pCsr->base.pExtra = (void*)&pCsr[1];
pCsr->base.pDb = db;
pRet = (bt_cursor*)pCsr;
}
}else{
BtCursor *pCsr; /* New cursor object */
................................................................................
btCheckPageRefs(pDb);
/* Remove this cursor from the all-cursors list. */
for(pp=&pDb->pAllCsr; *pp!=pCsr; pp=&(*pp)->pNextCsr);
*pp = pCsr->pNextCsr;
if( pCsr->eType==CSR_TYPE_BT ){
/* A regular b-tree cursor */
BtCursor *p = (BtCursor*)pCsr;
btCsrReset(p, 1);
}else{
/* A fast-insert-tree cursor */
fiCsrReset((FiCursor*)pCsr);
}
................................................................................
*/
static int btCsrStep(BtCursor *pCsr, int bNext){
const int pgsz = sqlite4BtPagerPagesize(pCsr->base.pDb->pPager);
int rc = SQLITE4_OK;
int bRequireDescent = 0;
rc = btCsrReseek(pCsr);
if( rc==SQLITE4_OK && pCsr->nPg==0 ) rc = SQLITE4_NOTFOUND;
if( (pCsr->bSkipNext && bNext) || (pCsr->bSkipPrev && bNext==0) ){
pCsr->bSkipPrev = pCsr->bSkipNext = 0;
return rc;
}
pCsr->bSkipPrev = pCsr->bSkipNext = 0;
................................................................................
if( pCsr->aiCell[pCsr->nPg-1] ) pCsr->aiCell[pCsr->nPg-1]--;
return rc;
}
static int fiCsrAllocateSubs(bt_db *db, FiCursor *pCsr, int nBt){
int rc = SQLITE4_OK; /* Return code */
BtCursor *aNew; /* Allocated array */
int nByte; /* Bytes of space to allocate */
assert( pCsr->nBt==0 && nBt>0 );
nByte = sizeof(BtCursor) * nBt;
aNew = (BtCursor*)sqlite4_malloc(db->pEnv, nByte);
if( aNew ){
memset(aNew, 0, nByte);
pCsr->aBt = aNew;
pCsr->nBt = nBt;
}else{
rc = btErrorBkpt(SQLITE4_NOMEM);
}
return rc;
}
static u32 btBlockToRoot(BtDbHdr *pHdr, u32 iBlk){
assert( iBlk>0 );
................................................................................
bRet = (n==1);
}
return bRet;
}
/*
** Seek a fast-insert cursor.
*/
static int fiCsrSeek(FiCursor *pCsr, const void *pK, int nK, int eSeek){
int rc = SQLITE4_OK; /* Return code */
bt_db *db = pCsr->base.pDb; /* Database handle */
BtDbHdr *pHdr = sqlite4BtPagerDbhdr(db->pPager);
assert( eSeek==BT_SEEK_LE || eSeek==BT_SEEK_EQ || eSeek==BT_SEEK_GE );
fiCsrReset(pCsr);
if( pHdr->iMRoot ){
if( eSeek==BT_SEEK_EQ ){
/* A BT_SEEK_EQ is a special case. There is no need to set up a cursor
** that can be advanced (in either direction) in this case. All that
** is required is to search each level in order for the requested key
** (or a corresponding delete marker). Once a match is found, there
** is no need to search any further. */
rc = fiCsrAllocateSubs(db, pCsr, 1);
if( rc==SQLITE4_OK ){
BtCursor mcsr; /* Used to iterate through the meta-tree */
BtCursor *pSub = pCsr->aBt;
/* Loop through the set of f-tree levels */
btCsrSetup(db, pHdr->iMRoot, &mcsr);
for(rc=btCsrEnd(&mcsr, 0); rc==SQLITE4_OK; rc=btCsrStep(&mcsr, 1)){
const void *pV; int nV; /* Value associated with meta-tree entry */
u32 iBlk; /* Block containing sub-tree */
sqlite4BtCsrData(&mcsr.base, 0, 4, &pV, &nV);
iBlk = sqlite4BtGetU32((const u8*)pV);
btCsrReset(pSub, 1);
btCsrSetup(db, btBlockToRoot(pHdr, iBlk), pSub);
rc = btCsrSeek(pSub, pK, nK, BT_SEEK_EQ, BT_CSRSEEK_SEEK);
if( rc!=SQLITE4_NOTFOUND && rc!=SQLITE4_INEXACT ){
/* A hit on the requested key or an error has occurred. Either
** way, break out of the loop. If this is a hit, set iBt to
** zero so that the BtCsrKey() and BtCsrData() routines know
** to return data from the first (only) sub-cursor. */
assert( pCsr->iBt<0 );
if( rc==SQLITE4_OK ){
if( 0==fiCsrIsDelete(pSub) ){
pCsr->iBt = 0;
}else{
rc = SQLITE4_NOTFOUND;
}
}
break;
}
}
btCsrReset(&mcsr, 1);
}
}else{
/* Deal with this later... */
assert( 0 );
}
}else{
rc = SQLITE4_NOTFOUND;
}
return rc;
}
int sqlite4BtCsrSeek(
bt_cursor *pBase,
const void *pK, /* Key to seek for */
int nK, /* Size of key pK in bytes */
int eSeek /* Seek mode (a BT_SEEK_XXX constant) */
){
int rc;
btCheckPageRefs(pBase->pDb);
if( pBase->eType==CSR_TYPE_BT ){
BtCursor *pCsr = (BtCursor*)pBase;
rc = btCsrSeek(pCsr, pK, nK, eSeek, BT_CSRSEEK_SEEK);
}else{
rc = fiCsrSeek((FiCursor*)pBase, pK, nK, eSeek);
}
btCheckPageRefs(pBase->pDb);
return rc;
}
/*
** Position cursor pCsr to point to the smallest key in the database.
*/
int sqlite4BtCsrFirst(bt_cursor *pCsr){
int rc;
if( pCsr->eType==CSR_TYPE_BT ){
rc = btCsrEnd((BtCursor*)pCsr, 0);
}else{
assert( 0 );
}
return rc;
}
/*
** Position cursor pCsr to point to the largest key in the database.
*/
int sqlite4BtCsrLast(bt_cursor *pCsr){
int rc;
if( pCsr->eType==CSR_TYPE_BT ){
rc = btCsrEnd((BtCursor*)pCsr, 1);
}else{
assert( 0 );
}
return rc;
}
/*
** Advance to the next entry in the tree.
*/
int sqlite4BtCsrNext(bt_cursor *pCsr){
int rc;
if( pCsr->eType==CSR_TYPE_BT ){
rc = btCsrStep((BtCursor*)pCsr, 1);
}else{
assert( 0 );
}
return rc;
}
/*
** Retreat to the previous entry in the tree.
*/
int sqlite4BtCsrPrev(bt_cursor *pCsr){
int rc;
if( pCsr->eType==CSR_TYPE_BT ){
rc = btCsrStep((BtCursor*)pCsr, 0);
}else{
assert( 0 );
}
return rc;
}
static int btOverflowArrayRead(
bt_db *db,
u8 *pOvfl,
u8 *aOut,
int nOut
................................................................................
for(i=0; i<nDepth && rc==SQLITE4_OK; i++){
sqlite4BtPageRelease(apHier[i].pPg);
}
}
return rc;
}
/*
** Buffer the key and value belonging to the current cursor position
** in pCsr->ovfl.
*/
static int btCsrBuffer(BtCursor *pCsr, int bVal){
const int pgsz = sqlite4BtPagerPagesize(pCsr->base.pDb->pPager);
................................................................................
pCsr->base.pDb, pCell, &aOut[nKLocal + nVLocal], nKOvfl + nVOvfl
);
}
return rc;
}
/*
** Helper function for btOverflowDelete().
**
** TODO: This uses recursion. Which is almost certainly not a problem
** here, but makes some people nervous, so should probably be changed.
*/
................................................................................
rc = btOverflowTrimtree(pgsz, pPager, rootpgno, nDepth);
}
}
return rc;
}
static int btCsrKey(BtCursor *pCsr, const void **ppK, int *pnK){
int rc = SQLITE4_OK;
if( pCsr->bRequireReseek ){
*ppK = (const void*)pCsr->ovfl.buf.p;
*pnK = pCsr->ovfl.nKey;
}else{
const int pgsz = sqlite4BtPagerPagesize(pCsr->base.pDb->pPager);
u8 *aData;
u8 *pCell;
int nK;
int iCell = pCsr->aiCell[pCsr->nPg-1];
aData = (u8*)sqlite4BtPageData(pCsr->apPage[pCsr->nPg-1]);
assert( btCellCount(aData, pgsz)>iCell );
pCell = btCellFind(aData, pgsz, iCell);
pCell += sqlite4BtVarintGet32(pCell, &nK);
if( nK==0 ){
/* type (c) leaf cell */
rc = btCsrBuffer(pCsr, 0);
if( rc==SQLITE4_OK ){
*ppK = pCsr->ovfl.buf.p;
*pnK = pCsr->ovfl.nKey;
}
}else{
*ppK = pCell;
*pnK = nK;
}
}
return rc;
}
static int btCsrData(
BtCursor *pCsr, /* Cursor handle */
int iOffset, /* Offset of requested data */
int nByte, /* Bytes requested (or -ve for all avail.) */
const void **ppV, /* OUT: Pointer to data buffer */
int *pnV /* OUT: Size of data buffer in bytes */
){
................................................................................
return rc;
}
int sqlite4BtCsrKey(bt_cursor *pBase, const void **ppK, int *pnK){
int rc = SQLITE4_OK; /* Return code */
if( pBase->eType==CSR_TYPE_BT ){
rc = btCsrKey((BtCursor*)pBase, ppK, pnK);
}else{
FiCursor *pCsr = (FiCursor*)pBase;
assert( pCsr->iBt>=0 );
rc = btCsrKey(&pCsr->aBt[pCsr->iBt], ppK, pnK);
}
................................................................................
int iOffset, /* Offset of requested data */
int nByte, /* Bytes requested (or -ve for all avail.) */
const void **ppV, /* OUT: Pointer to data buffer */
int *pnV /* OUT: Size of data buffer in bytes */
){
int rc = SQLITE4_OK; /* Return code */
if( pBase->eType==CSR_TYPE_BT ){
rc = btCsrData((BtCursor*)pBase, iOffset, nByte, ppV, pnV);
}else{
FiCursor *pCsr = (FiCursor*)pBase;
assert( pCsr->iBt>=0 );
rc = btCsrData(&pCsr->aBt[pCsr->iBt], iOffset, nByte, ppV, pnV);
}
................................................................................
}
static int btSaveAllCursor(bt_db *pDb, BtCursor *pCsr){
int rc = SQLITE4_OK; /* Return code */
bt_cursor *pIter; /* Used to iterate through cursors */
for(pIter=pDb->pAllCsr; rc==SQLITE4_OK && pIter; pIter=pIter->pNextCsr){
if( pIter->eType==CSR_TYPE_BT ){
BtCursor *p = (BtCursor*)pIter;
if( p->nPg>0 ){
assert( p->bRequireReseek==0 );
rc = btCsrBuffer(p, 0);
if( rc==SQLITE4_OK ){
assert( p->ovfl.buf.p );
p->bRequireReseek = 1;
................................................................................
}
/*
** Delete the entry that the cursor currently points to.
*/
int sqlite4BtDelete(bt_cursor *pBase){
int rc;
if( pBase->eType==CSR_TYPE_BT ){
BtCursor *pCsr = (BtCursor*)pBase;
rc = btCsrReseek(pCsr);
if( rc==SQLITE4_OK ){
rc = btSaveAllCursor(pBase->pDb, pCsr);
}
if( rc==SQLITE4_OK ){
rc = btOverflowDelete(pCsr);
}
if( rc==SQLITE4_OK ){
rc = btDeleteFromPage(pCsr, 1);
}
if( rc==SQLITE4_OK ){
rc = btBalanceIfUnderfull(pCsr);
}
btCsrReleaseAll(pCsr);
}else{
/* Fast-insert cursors do not support BtDelete(). */
rc = btErrorBkpt(SQLITE4_MISUSE);
}
return rc;
}
int sqlite4BtSetCookie(bt_db *db, unsigned int iVal){
return sqlite4BtPagerSetCookie(db->pPager, iVal);
}
|
| > > > > > | | > > > > | | > | | | > > > > | < < < | | < > | | | | > | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > | < < < < < < | < < > > > | < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | > < > | | | > > > > > > > > |
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 ... 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 ... 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 ... 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 ... 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 ... 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 ... 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 ... 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 .... 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 .... 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 .... 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 .... 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 .... 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 .... 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 .... 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 |
struct BtOvfl {
int nKey;
int nVal;
sqlite4_buffer buf;
};
/*
** Values that make up the bt_cursor.flags mask.
**
** CSR_NEXT_OK, CSR_PREV_OK:
** These are only used by fast-insert cursors. The CSR_NEXT_OK flag is
** set if xNext() may be safely called on the cursor. CSR_PREV_OK is
** true if xPrev() is Ok.
*/
#define CSR_TYPE_BT 0x0001
#define CSR_TYPE_FAST 0x0002
#define CSR_NEXT_OK 0x0004
#define CSR_PREV_OK 0x0008
#define IsBtCsr(pCsr) (((pCsr)->flags & CSR_TYPE_BT)!=0)
/*
** Base class for both cursor types (BtCursor and FiCursor).
*/
struct bt_cursor {
int flags; /* Cursor flags */
void *pExtra; /* Extra allocated space */
bt_db *pDb; /* Database this cursor belongs to */
bt_cursor *pNextCsr; /* Next cursor opened by same db handle */
};
/*
** Database b-tree cursor handle.
................................................................................
#if !defined(NDEBUG)
static void btCheckPageRefs(bt_db *pDb){
int nActual = 0; /* Outstanding refs according to pager */
int nExpect = 0; /* According to the set of open cursors */
bt_cursor *pCsr; /* Iterator variable */
for(pCsr=pDb->pAllCsr; pCsr; pCsr=pCsr->pNextCsr){
if( IsBtCsr(pCsr) ){
BtCursor *p = (BtCursor*)pCsr;
if( p->nPg>0 ) nExpect += p->nPg;
}else{
FiCursor *p = (FiCursor*)pCsr;
int i;
for(i=0; i<p->nBt; i++){
if( p->aBt[i].nPg>0 ) nExpect += p->aBt[i].nPg;
................................................................................
int sqlite4BtTransactionLevel(bt_db *db){
return sqlite4BtPagerTransactionLevel(db->pPager);
}
static void btCsrSetup(bt_db *db, u32 iRoot, BtCursor *pCsr){
memset(pCsr, 0, sizeof(BtCursor));
pCsr->base.flags = CSR_TYPE_BT;
pCsr->base.pExtra = (void*)&pCsr[1];
pCsr->base.pDb = db;
pCsr->iRoot = iRoot;
sqlite4_env_config(db->pEnv, SQLITE4_ENVCONFIG_GETMM, &pCsr->ovfl.buf.pMM);
}
int sqlite4BtCsrOpen(bt_db *db, int nExtra, bt_cursor **ppCsr){
................................................................................
FiCursor *pCsr;
pCsr = (FiCursor*)sqlite4_malloc(db->pEnv, nByte);
if( pCsr==0 ){
rc = btErrorBkpt(SQLITE4_NOMEM);
}else{
memset(pCsr, 0, nByte);
pCsr->base.flags = CSR_TYPE_FAST;
pCsr->base.pExtra = (void*)&pCsr[1];
pCsr->base.pDb = db;
pRet = (bt_cursor*)pCsr;
}
}else{
BtCursor *pCsr; /* New cursor object */
................................................................................
btCheckPageRefs(pDb);
/* Remove this cursor from the all-cursors list. */
for(pp=&pDb->pAllCsr; *pp!=pCsr; pp=&(*pp)->pNextCsr);
*pp = pCsr->pNextCsr;
if( IsBtCsr(pCsr) ){
/* A regular b-tree cursor */
BtCursor *p = (BtCursor*)pCsr;
btCsrReset(p, 1);
}else{
/* A fast-insert-tree cursor */
fiCsrReset((FiCursor*)pCsr);
}
................................................................................
*/
static int btCsrStep(BtCursor *pCsr, int bNext){
const int pgsz = sqlite4BtPagerPagesize(pCsr->base.pDb->pPager);
int rc = SQLITE4_OK;
int bRequireDescent = 0;
rc = btCsrReseek(pCsr);
if( rc==SQLITE4_OK && pCsr->nPg==0 ){
rc = SQLITE4_NOTFOUND;
}
if( (pCsr->bSkipNext && bNext) || (pCsr->bSkipPrev && bNext==0) ){
pCsr->bSkipPrev = pCsr->bSkipNext = 0;
return rc;
}
pCsr->bSkipPrev = pCsr->bSkipNext = 0;
................................................................................
if( pCsr->aiCell[pCsr->nPg-1] ) pCsr->aiCell[pCsr->nPg-1]--;
return rc;
}
static int fiCsrAllocateSubs(bt_db *db, FiCursor *pCsr, int nBt){
int rc = SQLITE4_OK; /* Return code */
if( nBt>pCsr->nBt ){
int nByte = sizeof(BtCursor) * nBt;
BtCursor *aNew; /* Allocated array */
aNew = (BtCursor*)sqlite4_realloc(db->pEnv, pCsr->aBt, nByte);
if( aNew ){
memset(&aNew[pCsr->nBt], 0, sizeof(BtCursor)*(nBt-pCsr->nBt));
pCsr->aBt = aNew;
pCsr->nBt = nBt;
}else{
rc = btErrorBkpt(SQLITE4_NOMEM);
}
}
return rc;
}
static u32 btBlockToRoot(BtDbHdr *pHdr, u32 iBlk){
assert( iBlk>0 );
................................................................................
bRet = (n==1);
}
return bRet;
}
/*
** Return an integer representing the result of (K1 - K2).
*/
static int btKeyCompare(
const void *pKey1, int nKey1,
const void *pKey2, int nKey2
){
int nCmp = MIN(nKey1, nKey2);
int res;
res = memcmp(pKey1, pKey2, nCmp);
if( res==0 ){
res = nKey1 - nKey2;
}
return res;
}
static int btOverflowArrayRead(
bt_db *db,
u8 *pOvfl,
u8 *aOut,
int nOut
................................................................................
for(i=0; i<nDepth && rc==SQLITE4_OK; i++){
sqlite4BtPageRelease(apHier[i].pPg);
}
}
return rc;
}
/*
** Buffer the key and value belonging to the current cursor position
** in pCsr->ovfl.
*/
static int btCsrBuffer(BtCursor *pCsr, int bVal){
const int pgsz = sqlite4BtPagerPagesize(pCsr->base.pDb->pPager);
................................................................................
pCsr->base.pDb, pCell, &aOut[nKLocal + nVLocal], nKOvfl + nVOvfl
);
}
return rc;
}
static int btCsrKey(BtCursor *pCsr, const void **ppK, int *pnK){
int rc = SQLITE4_OK;
if( pCsr->bRequireReseek ){
*ppK = (const void*)pCsr->ovfl.buf.p;
*pnK = pCsr->ovfl.nKey;
}else{
const int pgsz = sqlite4BtPagerPagesize(pCsr->base.pDb->pPager);
u8 *aData;
u8 *pCell;
int nK;
int iCell = pCsr->aiCell[pCsr->nPg-1];
aData = (u8*)sqlite4BtPageData(pCsr->apPage[pCsr->nPg-1]);
assert( btCellCount(aData, pgsz)>iCell );
pCell = btCellFind(aData, pgsz, iCell);
pCell += sqlite4BtVarintGet32(pCell, &nK);
if( nK==0 ){
/* type (c) leaf cell */
rc = btCsrBuffer(pCsr, 0);
if( rc==SQLITE4_OK ){
*ppK = pCsr->ovfl.buf.p;
*pnK = pCsr->ovfl.nKey;
}
}else{
*ppK = pCell;
*pnK = nK;
}
}
return rc;
}
static int fiCsrSetCurrent(FiCursor *pCsr){
const void *pMin = 0;
int nMin = 0;
int iMin = -1;
int i;
int rc = SQLITE4_OK;
int mul;
assert( pCsr->base.flags & (CSR_NEXT_OK | CSR_PREV_OK) );
mul = ((pCsr->base.flags & CSR_NEXT_OK) ? 1 : -1);
for(i=0; i<pCsr->nBt && rc==SQLITE4_OK; i++){
BtCursor *pSub = &pCsr->aBt[i];
if( pSub->nPg>0 ){
int nKey;
const void *pKey;
rc = btCsrKey(pSub, &pKey, &nKey);
if( rc==SQLITE4_OK
&& (iMin<0 || (mul * btKeyCompare(pKey, nKey, pMin, nMin))<0)
){
pMin = pKey;
nMin = nKey;
iMin = i;
}
}
}
if( iMin<0 && rc==SQLITE4_OK ) rc = SQLITE4_NOTFOUND;
pCsr->iBt = iMin;
return rc;
}
/*
** Advance the cursor. The direction (xPrev or xNext) is implied by the
** cursor itself - as fast-insert cursors may only be advanced in one
** direction.
*/
static int fiCsrStep(FiCursor *pCsr){
int rc = SQLITE4_OK;
int bNext = (0!=(pCsr->base.flags & CSR_NEXT_OK));
const void *pKey; int nKey; /* Current key that cursor points to */
int i;
assert( pCsr->base.flags & (CSR_NEXT_OK | CSR_PREV_OK) );
assert( pCsr->iBt>=0 );
do{
/* Advance all bt cursors that share a key with the current bt cursor. */
rc = btCsrKey(&pCsr->aBt[pCsr->iBt], &pKey, &nKey);
for(i=0; rc==SQLITE4_OK && i<pCsr->nBt; i++){
BtCursor *pSub = &pCsr->aBt[i];
if( i!=pCsr->iBt && pSub->nPg>0 ){
const void *p; int n; /* Key that this sub-cursor points to */
rc = btCsrKey(&pCsr->aBt[i], &p, &n);
if( rc==SQLITE4_OK && btKeyCompare(p, n, pKey, nKey)==0 ){
rc = btCsrStep(pSub, bNext);
if( rc==SQLITE4_NOTFOUND ){
assert( pSub->nPg==0 );
rc = SQLITE4_OK;
}
}
}
}
/* Advance the current bt cursor */
if( rc==SQLITE4_OK ){
rc = btCsrStep(&pCsr->aBt[pCsr->iBt], bNext);
if( rc==SQLITE4_NOTFOUND ){
assert( pCsr->aBt[pCsr->iBt].nPg==0 );
rc = SQLITE4_OK;
}
}
/* Figure out a new current bt cursor */
if( rc==SQLITE4_OK ){
rc = fiCsrSetCurrent(pCsr);
}
}while( rc==SQLITE4_OK && fiCsrIsDelete(&pCsr->aBt[pCsr->iBt]) );
return rc;
}
/*
** Seek a fast-insert cursor.
*/
static int fiCsrSeek(FiCursor *pCsr, const void *pK, int nK, int eSeek){
int rc = SQLITE4_OK; /* Return code */
bt_db *db = pCsr->base.pDb; /* Database handle */
BtDbHdr *pHdr = sqlite4BtPagerDbhdr(db->pPager);
assert( eSeek==BT_SEEK_LE || eSeek==BT_SEEK_EQ || eSeek==BT_SEEK_GE );
fiCsrReset(pCsr);
if( pHdr->iMRoot ){
if( eSeek==BT_SEEK_EQ ){
/* A BT_SEEK_EQ is a special case. There is no need to set up a cursor
** that can be advanced (in either direction) in this case. All that
** is required is to search each level in order for the requested key
** (or a corresponding delete marker). Once a match is found, there
** is no need to search any further. */
rc = fiCsrAllocateSubs(db, pCsr, 1);
if( rc==SQLITE4_OK ){
BtCursor mcsr; /* Used to iterate through the meta-tree */
BtCursor *pSub = pCsr->aBt;
/* Loop through the set of f-tree levels */
btCsrSetup(db, pHdr->iMRoot, &mcsr);
for(rc=btCsrEnd(&mcsr, 0); rc==SQLITE4_OK; rc=btCsrStep(&mcsr, 1)){
const void *pV; int nV; /* Value associated with meta-tree entry */
u32 iBlk; /* Block containing sub-tree */
sqlite4BtCsrData(&mcsr.base, 0, 4, &pV, &nV);
iBlk = sqlite4BtGetU32((const u8*)pV);
btCsrReset(pSub, 1);
btCsrSetup(db, btBlockToRoot(pHdr, iBlk), pSub);
rc = btCsrSeek(pSub, pK, nK, BT_SEEK_EQ, BT_CSRSEEK_SEEK);
if( rc!=SQLITE4_NOTFOUND && rc!=SQLITE4_INEXACT ){
/* A hit on the requested key or an error has occurred. Either
** way, break out of the loop. If this is a hit, set iBt to
** zero so that the BtCsrKey() and BtCsrData() routines know
** to return data from the first (only) sub-cursor. */
assert( pCsr->iBt<0 );
if( rc==SQLITE4_OK ){
if( 0==fiCsrIsDelete(pSub) ){
pCsr->iBt = 0;
}else{
rc = SQLITE4_NOTFOUND;
}
}
break;
}
}
btCsrReset(&mcsr, 1);
}
}else{
int bMatch = 0; /* Found an exact match */
int bHit = 0; /* Found at least one entry */
int iSub = 0;
BtCursor mcsr; /* Used to iterate through the meta-tree */
/* Loop through the set of f-tree levels. Open a cursor on each. */
btCsrSetup(db, pHdr->iMRoot, &mcsr);
for(rc=btCsrEnd(&mcsr, 0); rc==SQLITE4_OK; rc=btCsrStep(&mcsr, 1)){
const void *pV; int nV; /* Value associated with meta-tree entry */
u32 iBlk; /* Block containing sub-tree */
BtCursor *pSub; /* Sub-cursor for this block */
rc = fiCsrAllocateSubs(db, pCsr, iSub+1);
if( rc!=SQLITE4_OK ) break;
pSub = &pCsr->aBt[iSub];
iSub++;
sqlite4BtCsrData(&mcsr.base, 0, 4, &pV, &nV);
iBlk = sqlite4BtGetU32((const u8*)pV);
btCsrReset(pSub, 1);
btCsrSetup(db, btBlockToRoot(pHdr, iBlk), pSub);
rc = btCsrSeek(pSub, pK, nK, eSeek, BT_CSRSEEK_SEEK);
if( rc==SQLITE4_OK ){
bMatch = 1;
}else if( rc==SQLITE4_INEXACT ){
bHit = 1;
}else if( rc!=SQLITE4_NOTFOUND ){
break;
}
}
assert( rc!=SQLITE4_OK && rc!=SQLITE4_INEXACT );
if( rc==SQLITE4_NOTFOUND ){
pCsr->base.flags |= (eSeek==BT_SEEK_GE ? CSR_NEXT_OK : CSR_PREV_OK);
rc = fiCsrSetCurrent(pCsr);
if( rc==SQLITE4_OK ){
BtCursor *pSub = &pCsr->aBt[pCsr->iBt];
if( fiCsrIsDelete(pSub) ){
rc = fiCsrStep(pCsr);
if( rc==SQLITE4_OK ) rc = SQLITE4_INEXACT;
}else if( bMatch==0 ){
rc = (bHit ? SQLITE4_INEXACT : SQLITE4_NOTFOUND);
}
}
}
}
}else{
rc = SQLITE4_NOTFOUND;
}
return rc;
}
static int fiCsrEnd(FiCursor *pCsr, int bLast){
bt_db *db = pCsr->base.pDb;
BtDbHdr *pHdr = sqlite4BtPagerDbhdr(db->pPager);
int bHit = 0; /* Found at least one entry */
int iSub = 0; /* Index of sub-cursor to seek */
BtCursor mcsr; /* Used to iterate through the meta-tree */
int rc; /* Return code */
fiCsrReset(pCsr);
/* Loop through the set of f-tree levels. Open a cursor on each. */
btCsrSetup(db, pHdr->iMRoot, &mcsr);
for(rc=btCsrEnd(&mcsr, 0); rc==SQLITE4_OK; rc=btCsrStep(&mcsr, 1)){
const void *pV; int nV; /* Value associated with meta-tree entry */
u32 iBlk; /* Block containing sub-tree */
BtCursor *pSub; /* Sub-cursor for this block */
rc = fiCsrAllocateSubs(db, pCsr, iSub+1);
if( rc!=SQLITE4_OK ) break;
pSub = &pCsr->aBt[iSub];
iSub++;
sqlite4BtCsrData(&mcsr.base, 0, 4, &pV, &nV);
iBlk = sqlite4BtGetU32((const u8*)pV);
btCsrSetup(db, btBlockToRoot(pHdr, iBlk), pSub);
rc = btCsrEnd(pSub, bLast);
if( rc!=SQLITE4_OK && rc!=SQLITE4_NOTFOUND ) break;
}
if( rc==SQLITE4_NOTFOUND ){
pCsr->base.flags &= ~(CSR_NEXT_OK | CSR_PREV_OK);
pCsr->base.flags |= (bLast ? CSR_PREV_OK : CSR_NEXT_OK);
rc = fiCsrSetCurrent(pCsr);
if( rc==SQLITE4_OK && fiCsrIsDelete(&pCsr->aBt[pCsr->iBt]) ){
rc = fiCsrStep(pCsr);
}
}
return rc;
}
int sqlite4BtCsrSeek(
bt_cursor *pBase,
const void *pK, /* Key to seek for */
int nK, /* Size of key pK in bytes */
int eSeek /* Seek mode (a BT_SEEK_XXX constant) */
){
int rc;
btCheckPageRefs(pBase->pDb);
if( IsBtCsr(pBase) ){
BtCursor *pCsr = (BtCursor*)pBase;
rc = btCsrSeek(pCsr, pK, nK, eSeek, BT_CSRSEEK_SEEK);
}else{
rc = fiCsrSeek((FiCursor*)pBase, pK, nK, eSeek);
}
btCheckPageRefs(pBase->pDb);
return rc;
}
/*
** Position cursor pCsr to point to the smallest key in the database.
*/
int sqlite4BtCsrFirst(bt_cursor *pBase){
int rc;
if( IsBtCsr(pBase) ){
rc = btCsrEnd((BtCursor*)pBase, 0);
}else{
rc = fiCsrEnd((FiCursor*)pBase, 0);
}
return rc;
}
/*
** Position cursor pCsr to point to the largest key in the database.
*/
int sqlite4BtCsrLast(bt_cursor *pBase){
int rc;
if( IsBtCsr(pBase) ){
rc = btCsrEnd((BtCursor*)pBase, 1);
}else{
rc = fiCsrEnd((FiCursor*)pBase, 1);
}
return rc;
}
/*
** Advance to the next entry in the tree.
*/
int sqlite4BtCsrNext(bt_cursor *pBase){
int rc;
if( IsBtCsr(pBase) ){
rc = btCsrStep((BtCursor*)pBase, 1);
}else{
rc = fiCsrStep((FiCursor*)pBase);
}
return rc;
}
/*
** Retreat to the previous entry in the tree.
*/
int sqlite4BtCsrPrev(bt_cursor *pBase){
int rc;
if( IsBtCsr(pBase) ){
rc = btCsrStep((BtCursor*)pBase, 0);
}else{
rc = fiCsrStep((FiCursor*)pBase);
}
return rc;
}
/*
** Helper function for btOverflowDelete().
**
** TODO: This uses recursion. Which is almost certainly not a problem
** here, but makes some people nervous, so should probably be changed.
*/
................................................................................
rc = btOverflowTrimtree(pgsz, pPager, rootpgno, nDepth);
}
}
return rc;
}
static int btCsrData(
BtCursor *pCsr, /* Cursor handle */
int iOffset, /* Offset of requested data */
int nByte, /* Bytes requested (or -ve for all avail.) */
const void **ppV, /* OUT: Pointer to data buffer */
int *pnV /* OUT: Size of data buffer in bytes */
){
................................................................................
return rc;
}
int sqlite4BtCsrKey(bt_cursor *pBase, const void **ppK, int *pnK){
int rc = SQLITE4_OK; /* Return code */
if( IsBtCsr(pBase) ){
rc = btCsrKey((BtCursor*)pBase, ppK, pnK);
}else{
FiCursor *pCsr = (FiCursor*)pBase;
assert( pCsr->iBt>=0 );
rc = btCsrKey(&pCsr->aBt[pCsr->iBt], ppK, pnK);
}
................................................................................
int iOffset, /* Offset of requested data */
int nByte, /* Bytes requested (or -ve for all avail.) */
const void **ppV, /* OUT: Pointer to data buffer */
int *pnV /* OUT: Size of data buffer in bytes */
){
int rc = SQLITE4_OK; /* Return code */
if( IsBtCsr(pBase) ){
rc = btCsrData((BtCursor*)pBase, iOffset, nByte, ppV, pnV);
}else{
FiCursor *pCsr = (FiCursor*)pBase;
assert( pCsr->iBt>=0 );
rc = btCsrData(&pCsr->aBt[pCsr->iBt], iOffset, nByte, ppV, pnV);
}
................................................................................
}
static int btSaveAllCursor(bt_db *pDb, BtCursor *pCsr){
int rc = SQLITE4_OK; /* Return code */
bt_cursor *pIter; /* Used to iterate through cursors */
for(pIter=pDb->pAllCsr; rc==SQLITE4_OK && pIter; pIter=pIter->pNextCsr){
if( IsBtCsr(pIter) ){
BtCursor *p = (BtCursor*)pIter;
if( p->nPg>0 ){
assert( p->bRequireReseek==0 );
rc = btCsrBuffer(p, 0);
if( rc==SQLITE4_OK ){
assert( p->ovfl.buf.p );
p->bRequireReseek = 1;
................................................................................
}
/*
** Delete the entry that the cursor currently points to.
*/
int sqlite4BtDelete(bt_cursor *pBase){
bt_db *db = pBase->pDb;
int rc;
if( IsBtCsr(pBase) ){
BtCursor *pCsr = (BtCursor*)pBase;
rc = btCsrReseek(pCsr);
if( rc==SQLITE4_OK ){
rc = btSaveAllCursor(db, pCsr);
}
if( rc==SQLITE4_OK ){
rc = btOverflowDelete(pCsr);
}
if( rc==SQLITE4_OK ){
rc = btDeleteFromPage(pCsr, 1);
}
if( rc==SQLITE4_OK ){
rc = btBalanceIfUnderfull(pCsr);
}
btCsrReleaseAll(pCsr);
}else{
void *pKey;
int nKey;
rc = sqlite4BtCsrKey(pBase, &pKey, &nKey);
if( rc==SQLITE4_OK ){
int bFastInsertOp = db->bFastInsertOp;
db->bFastInsertOp = 1;
rc = sqlite4BtReplace(db, pKey, nKey, 0, -1);
db->bFastInsertOp = bFastInsertOp;
}
}
return rc;
}
int sqlite4BtSetCookie(bt_db *db, unsigned int iVal){
return sqlite4BtPagerSetCookie(db->pPager, iVal);
}
|