bk commit into 5.1 tree (jonas:1.2534)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-23 14:55:37+02:00, jonas@stripped +4 -0
  ndb - dynarr256
    allow sparse page-maps

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-04-23 14:55:34+02:00, jonas@stripped +2 -0
    add getRealpidCheck, which can return RNIL
    add init_page, which inits page just after alloc

  storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp@stripped, 2007-04-23 14:55:34+02:00, jonas@stripped +37 -12
    Alloc pages sparsely (i.e no guarantee that all pages exist)

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@stripped, 2007-04-23 14:55:34+02:00, jonas@stripped +23 -6
    add getRealpidCheck, which can return RNIL
    add init_page, which inits page just after alloc

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2007-04-23 14:55:34+02:00, jonas@stripped +8 -1
    Use getRealpidCheck, so that page map can be sparse

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-wl1190-merge

--- 1.73/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-04-23 14:55:42 +02:00
+++ 1.74/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-04-23 14:55:42 +02:00
@@ -2841,11 +2841,13 @@
 //
 // Public methods
   Uint32 getRealpid(Fragrecord* regFragPtr, Uint32 logicalPageId);
+  Uint32 getRealpidCheck(Fragrecord* regFragPtr, Uint32 logicalPageId);
   Uint32 getNoOfPages(Fragrecord* regFragPtr);
   Uint32 getEmptyPage(Fragrecord* regFragPtr);
   Uint32 allocFragPage(Fragrecord* regFragPtr);
   void releaseFragPages(Fragrecord* regFragPtr);
   Uint32 get_empty_var_page(Fragrecord* frag_ptr);
+  void init_page(Fragrecord*, PagePtr, Uint32 page_no);
   
 // Private methods
   void errorHandler(Uint32 errorCode);

--- 1.10/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp	2007-04-23 14:55:42 +02:00
+++ 1.11/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp	2007-04-23 14:55:42 +02:00
@@ -207,24 +207,49 @@
 {
   Uint32 pages = fragPtrP->noOfPages;
   
-  if (page_no >= pages)
+  DynArr256 map(c_page_map_pool, fragPtrP->m_page_map);
+  Uint32 * ptr = map.set(page_no);
+  if (unlikely(ptr == 0))
   {
-    do 
-    {
-      if (allocFragPage(fragPtrP) == 0)
-      {
-	jam();
-	terrorCode = ZMEM_NOMEM_ERROR;
-	return 1;
-      }
-    } while (page_no >= (pages = fragPtrP->noOfPages));
+    jam();
+    terrorCode = ZMEM_NOMEM_ERROR;
+    return 1;
   }
   
   PagePtr pagePtr;
-  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);
+  
+  pagePtr.i = * ptr;
+  if (likely(pagePtr.i != RNIL))
+  {
+    jam();
+    c_page_pool.getPtr(pagePtr);
+  }
+  else
+  {
+    jam();
+    Uint32 noOfPagesAllocated = 0;
+    allocConsPages(1, noOfPagesAllocated, pagePtr.i);
+    if (unlikely(noOfPagesAllocated == 0))
+    {
+      jam();
+      terrorCode = ZMEM_NOMEM_ERROR;
+      return 1;
+    }
+    * ptr = pagePtr.i; // Save in map
+    c_page_pool.getPtr(pagePtr);
+    init_page(fragPtrP, pagePtr, page_no);
+    
+    if (page_no >= pages)
+    {
+      jam();
+      fragPtrP->noOfPages = page_no + 1;
+    }
+    alloc_pages.add(pagePtr);
+  }
+  
+  
   if (pagePtr.p->page_state == ZEMPTY_MM)
   {
     convertThPage((Fix_page*)pagePtr.p, tabPtrP, MM);

--- 1.14/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2007-04-23 14:55:42 +02:00
+++ 1.15/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2007-04-23 14:55:42 +02:00
@@ -117,11 +117,33 @@
   return RNIL;
 }
 
+Uint32 
+Dbtup::getRealpidCheck(Fragrecord* regFragPtr, Uint32 logicalPageId) 
+{
+  DynArr256 map(c_page_map_pool, regFragPtr->m_page_map);
+  Uint32 * ptr = map.get(logicalPageId);
+  if (likely(ptr != 0))
+  {
+    return * ptr;
+  }
+  return RNIL;
+}
+
 Uint32 Dbtup::getNoOfPages(Fragrecord* const regFragPtr)
 {
   return regFragPtr->noOfPages;
 }//Dbtup::getNoOfPages()
 
+void
+Dbtup::init_page(Fragrecord* regFragPtr, PagePtr pagePtr, Uint32 pageId)
+{
+  pagePtr.p->page_state = ZEMPTY_MM;
+  pagePtr.p->frag_page_id = pageId;
+  pagePtr.p->physical_page_id = pagePtr.i;
+  pagePtr.p->nextList = RNIL;
+  pagePtr.p->prevList = RNIL;
+}
+
 Uint32 
 Dbtup::allocFragPage(Fragrecord* regFragPtr) 
 {
@@ -147,12 +169,7 @@
     Ptr<Page> pagePtr;
     pagePtr.i = retPageRef;
     c_page_pool.getPtr(pagePtr);
-    pagePtr.p->page_state = ZEMPTY_MM;
-    pagePtr.p->frag_page_id = pageId;
-    pagePtr.p->physical_page_id = retPageRef;
-    pagePtr.p->nextList = RNIL;
-    pagePtr.p->prevList = RNIL;
-
+    init_page(regFragPtr, pagePtr, pageId);
     LocalDLList<Page> alloc(c_page_pool, regFragPtr->emptyPrimPage);
     alloc.add(pagePtr);
     return 1;

--- 1.23/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2007-04-23 14:55:42 +02:00
+++ 1.24/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2007-04-23 14:55:42 +02:00
@@ -651,7 +651,14 @@
       {
         if (pos.m_realpid_mm == RNIL) {
           jam();
-          pos.m_realpid_mm = getRealpid(fragPtr.p, key.m_page_no);
+          pos.m_realpid_mm = getRealpidCheck(fragPtr.p, key.m_page_no);
+          
+          if (pos.m_realpid_mm == RNIL)
+          {
+            jam();
+            pos.m_get = ScanPos::Get_next_page_mm;
+            break; // incr loop count
+          }
         }
         PagePtr pagePtr;
 	c_page_pool.getPtr(pagePtr, pos.m_realpid_mm);