mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Bug #27205 Occational 899 if delete+insert during LCP

Browse source 
- put page of deleted row last in list
This commit is contained in:
unknown 2007-04-26 13:41:33 +02:00
commit 10d2d90063
4 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
View file

@ -610,7 +610,7 @@ struct Fragrecord {
Uint32 noOfPagesToGrow;
DLList<Page>::Head emptyPrimPage; // allocated pages (not init)
DLList<Page>::Head thFreeFirst; // pages with atleast 1 free record
DLFifoList<Page>::Head thFreeFirst; // pages with atleast 1 free record
SLList<Page>::Head m_empty_pages; // Empty pages not in logical/physical map
Uint32 m_lcp_scan_op;

16
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
View file

@ -92,8 +92,8 @@ Dbtup::alloc_fix_rec(Fragrecord* const regFragPtr,
pagePtr.p->page_state = ZTH_MM_FREE;
LocalDLList<Page> free_pages(c_page_pool, regFragPtr->thFreeFirst);
free_pages.add(pagePtr);
LocalDLFifoList<Page> free_pages(c_page_pool, regFragPtr->thFreeFirst);
free_pages.addFirst(pagePtr);
} else {
ljam();
/* ---------------------------------------------------------------- */
@ -176,7 +176,7 @@ Dbtup::alloc_tuple_from_page(Fragrecord* const regFragPtr,
/* ARE MAINTAINED EVEN AFTER A SYSTEM CRASH. */
/* ---------------------------------------------------------------- */
ndbrequire(regPagePtr->page_state == ZTH_MM_FREE);
LocalDLList<Page> free_pages(c_page_pool, regFragPtr->thFreeFirst);
LocalDLFifoList<Page> free_pages(c_page_pool, regFragPtr->thFreeFirst);
free_pages.remove((Page*)regPagePtr);
regPagePtr->page_state = ZTH_MM_FULL;
}
@ -196,10 +196,10 @@ void Dbtup::free_fix_rec(Fragrecord* regFragPtr,
{
ljam();
PagePtr pagePtr = { (Page*)regPagePtr, key->m_page_no };
LocalDLList<Page> free_pages(c_page_pool, regFragPtr->thFreeFirst);
LocalDLFifoList<Page> free_pages(c_page_pool, regFragPtr->thFreeFirst);
ndbrequire(regPagePtr->page_state == ZTH_MM_FULL);
regPagePtr->page_state = ZTH_MM_FREE;
free_pages.add(pagePtr);
free_pages.addLast(pagePtr);
}
}//Dbtup::freeTh()
@ -227,13 +227,13 @@ Dbtup::alloc_page(Tablerec* tabPtrP, Fragrecord* fragPtrP,
c_page_pool.getPtr(pagePtr, getRealpid(fragPtrP, page_no));
LocalDLList<Page> alloc_pages(c_page_pool, fragPtrP->emptyPrimPage);
LocalDLList<Page> free_pages(c_page_pool, fragPtrP->thFreeFirst);
LocalDLFifoList<Page> free_pages(c_page_pool, fragPtrP->thFreeFirst);
if (pagePtr.p->page_state == ZEMPTY_MM)
{
convertThPage((Fix_page*)pagePtr.p, tabPtrP, MM);
pagePtr.p->page_state = ZTH_MM_FREE;
alloc_pages.remove(pagePtr);
free_pages.add(pagePtr);
free_pages.addFirst(pagePtr);
}
*ret = pagePtr;
@ -257,7 +257,7 @@ Dbtup::alloc_fix_rowid(Fragrecord* regFragPtr,
}
Uint32 state = pagePtr.p->page_state;
LocalDLList<Page> free_pages(c_page_pool, regFragPtr->thFreeFirst);
LocalDLFifoList<Page> free_pages(c_page_pool, regFragPtr->thFreeFirst);
switch(state){
case ZTH_MM_FREE:
if (((Fix_page*)pagePtr.p)->alloc_record(idx) != idx)

2
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
View file

@ -295,7 +295,7 @@ void Dbtup::releaseFragPages(Fragrecord* regFragPtr)
}
{
LocalDLList<Page> tmp(c_page_pool, regFragPtr->thFreeFirst);
LocalDLFifoList<Page> tmp(c_page_pool, regFragPtr->thFreeFirst);
tmp.remove();
}

23
storage/ndb/src/kernel/vm/DLFifoList.hpp
View file

@ -62,8 +62,9 @@ public:
*/
void insert(Ptr<T> & ptr, Ptr<T>& loc);
void remove();
void remove(Ptr<T> &);
void remove(T*);
/**
* Update i & p value according to <b>i</b>
*/
@ -274,12 +275,28 @@ DLFifoListImpl<P,T,U>::insert(Ptr<T> & ptr, Ptr<T> & loc)
ptr.p->U::nextList = loc.i;
}
template <typename P, typename T, typename U>
inline
void
DLFifoListImpl<P,T,U>::remove()
{
head.firstItem = RNIL;
head.lastItem = RNIL;
}
template <typename P, typename T, typename U>
inline
void
DLFifoListImpl<P,T,U>::remove(Ptr<T> & p)
{
T * t = p.p;
remove(p.p);
}
template <typename P, typename T, typename U>
inline
void
DLFifoListImpl<P,T,U>::remove(T * t)
{
Uint32 ni = t->U::nextList;
Uint32 pi = t->U::prevList;
@ -328,7 +345,7 @@ inline
void
DLFifoListImpl<P,T,U>::release(Ptr<T> & p)
{
remove(p);
remove(p.p);
thePool.release(p);
}