Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a problem in kvmemRemoveNode() causing a pUp (parent node) pointer to be set incorrectly. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | primary-keys |
| Files: | files | file ages | folders |
| SHA1: |
7faa762755df75a4aa5352222ddc73d5 |
| User & Date: | dan 2012-04-13 16:45:56.395 |
Context
|
2012-04-13
| ||
| 19:17 | Fix sub-transaction commit in kvmem.c. Also various aspects of constraint handling. check-in: 365eb3c6de user: dan tags: primary-keys | |
| 16:45 | Fix a problem in kvmemRemoveNode() causing a pUp (parent node) pointer to be set incorrectly. check-in: 7faa762755 user: dan tags: primary-keys | |
| 10:35 | Add placeholder code to make ROLLBACK (and OR ROLLBACK constraints) work a bit. check-in: 367fdc8463 user: dan tags: primary-keys | |
Changes
Changes to src/kvmem.c.
| ︙ | ︙ | |||
146 147 148 149 150 151 152 153 154 155 156 157 158 159 |
/*
** Return a pointer to the pBefore or pAfter pointer in the parent
** of p that points to p. Or if p is the root node, return pp.
*/
static KVMemNode **kvmemFromPtr(KVMemNode *p, KVMemNode **pp){
KVMemNode *pUp = p->pUp;
if( pUp==0 ) return pp;
if( pUp->pAfter==p ) return &pUp->pAfter;
return &pUp->pBefore;
}
/*
** Rebalance all nodes starting with p and working up to the root.
** Return the new root.
| > | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 |
/*
** Return a pointer to the pBefore or pAfter pointer in the parent
** of p that points to p. Or if p is the root node, return pp.
*/
static KVMemNode **kvmemFromPtr(KVMemNode *p, KVMemNode **pp){
KVMemNode *pUp = p->pUp;
if( pUp==0 ) return pp;
assert( pUp->pAfter==p || pUp->pBefore==p );
if( pUp->pAfter==p ) return &pUp->pAfter;
return &pUp->pBefore;
}
/*
** Rebalance all nodes starting with p and working up to the root.
** Return the new root.
|
| ︙ | ︙ | |||
338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 |
pNode = 0;
}else{
pChng->pData = 0;
}
}
return pNode;
}
/* Remove node pOld from the tree. pOld must be an element of the tree.
*/
static void kvmemRemoveNode(KVMem *p, KVMemNode *pOld){
KVMemNode **ppParent; /* Location of pointer to pOld */
KVMemNode *pBalance; /* Node to run kvmemBalance() on */
kvmemDataUnref(pOld->pData);
pOld->pData = 0;
ppParent = kvmemFromPtr(pOld, &p->pRoot);
if( pOld->pBefore==0 && pOld->pAfter==0 ){
*ppParent = 0;
pBalance = pOld->pUp;
}else if( pOld->pBefore && pOld->pAfter ){
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 |
pNode = 0;
}else{
pChng->pData = 0;
}
}
return pNode;
}
#ifdef SQLITE_DEBUG
/*
** Return the number of times that node pNode occurs in the sub-tree
** headed by node pSub. This is used to assert() that no node structure
** is linked into the tree more than once.
*/
static int countNodeOccurences(KVMemNode *pSub, KVMemNode *pNode){
int iRet = (pSub==pNode);
if( pSub ){
iRet += countNodeOccurences(pSub->pBefore, pNode);
iRet += countNodeOccurences(pSub->pAfter, pNode);
}
return iRet;
}
/*
** Check that all the pUp pointers in the sub-tree headed by pSub are
** correct. Fail an assert if this is not the case.
*/
static void assertUpPointers(KVMemNode *pSub){
if( pSub ){
assert( pSub->pBefore==0 || pSub->pBefore->pUp==pSub );
assert( pSub->pAfter==0 || pSub->pAfter->pUp==pSub );
assertUpPointers(pSub->pBefore);
assertUpPointers(pSub->pAfter);
}
}
#else
#define assertUpPointers(x)
#endif
/* Remove node pOld from the tree. pOld must be an element of the tree.
*/
static void kvmemRemoveNode(KVMem *p, KVMemNode *pOld){
KVMemNode **ppParent; /* Location of pointer to pOld */
KVMemNode *pBalance; /* Node to run kvmemBalance() on */
kvmemDataUnref(pOld->pData);
pOld->pData = 0;
ppParent = kvmemFromPtr(pOld, &p->pRoot);
if( pOld->pBefore==0 && pOld->pAfter==0 ){
*ppParent = 0;
pBalance = pOld->pUp;
}else if( pOld->pBefore && pOld->pAfter ){
KVMemNode *pX; /* Smallest node that is larger than pOld */
KVMemNode *pY; /* Left-hand child of pOld */
pX = kvmemFirst(pOld->pAfter);
assert( pX->pBefore==0 );
*kvmemFromPtr(pX, 0) = pX->pAfter;
if( pX->pAfter ) pX->pAfter->pUp = pX->pUp;
pBalance = pX->pUp;
pX->pAfter = pOld->pAfter;
if( pX->pAfter ){
pX->pAfter->pUp = pX;
}else{
assert( pBalance==pOld );
pBalance = pX;
|
| ︙ | ︙ | |||
436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 |
return SQLITE_OK;
}
static int kvmemCommitPhaseTwo(KVStore *pKVStore, int iLevel){
KVMem *p = (KVMem*)pKVStore;
assert( p->iMagicKVMemBase==SQLITE_KVMEMBASE_MAGIC );
assert( iLevel>=0 );
assert( iLevel<p->base.iTransLevel );
while( p->base.iTransLevel>iLevel && p->base.iTransLevel>1 ){
KVMemChng *pChng, *pNext;
for(pChng=p->apLog[p->base.iTransLevel-2]; pChng; pChng=pNext){
KVMemNode *pNode = pChng->pNode;
if( pNode->pData ){
pNode->mxTrans = pChng->oldTrans;
}else{
kvmemRemoveNode(p, pNode);
}
kvmemDataUnref(pChng->pData);
pNext = pChng->pNext;
sqlite4_free(pChng);
}
p->apLog[p->base.iTransLevel-2] = 0;
p->base.iTransLevel--;
}
p->base.iTransLevel = iLevel;
return SQLITE_OK;
}
/*
** Rollback a transaction or subtransaction.
**
| > > | 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 |
return SQLITE_OK;
}
static int kvmemCommitPhaseTwo(KVStore *pKVStore, int iLevel){
KVMem *p = (KVMem*)pKVStore;
assert( p->iMagicKVMemBase==SQLITE_KVMEMBASE_MAGIC );
assert( iLevel>=0 );
assert( iLevel<p->base.iTransLevel );
assertUpPointers(p->pRoot);
while( p->base.iTransLevel>iLevel && p->base.iTransLevel>1 ){
KVMemChng *pChng, *pNext;
for(pChng=p->apLog[p->base.iTransLevel-2]; pChng; pChng=pNext){
KVMemNode *pNode = pChng->pNode;
if( pNode->pData ){
pNode->mxTrans = pChng->oldTrans;
}else{
kvmemRemoveNode(p, pNode);
}
kvmemDataUnref(pChng->pData);
pNext = pChng->pNext;
sqlite4_free(pChng);
}
p->apLog[p->base.iTransLevel-2] = 0;
p->base.iTransLevel--;
}
assertUpPointers(p->pRoot);
p->base.iTransLevel = iLevel;
return SQLITE_OK;
}
/*
** Rollback a transaction or subtransaction.
**
|
| ︙ | ︙ |