bk commit into 5.1 tree (tomas:1.2449) BUG#27512

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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-03-29 11:05:32+02:00, tomas@stripped +8 -0
  Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
  - increase var part reference from 32 to 64 bits on 64 bit systems
  - note current patch does not allow for online upgrade from 32 to 64 bit systems or vice
versa

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-03-29 11:05:30+02:00,
tomas@stripped +31 -4
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - increase var part reference from 32 to 64 bits on 64 bit systems
    - note current patch does not allow for online upgrade from 32 to 64 bit systems or
vice versa

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp@stripped, 2007-03-29 11:05:30+02:00,
tomas@stripped +5 -3
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - increase var part reference from 32 to 64 bits on 64 bit systems
    - note current patch does not allow for online upgrade from 32 to 64 bit systems or
vice versa

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@stripped, 2007-03-29 11:05:30+02:00,
tomas@stripped +5 -4
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - increase var part reference from 32 to 64 bits on 64 bit systems
    - note current patch does not allow for online upgrade from 32 to 64 bit systems or
vice versa

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-03-29 11:05:30+02:00,
tomas@stripped +6 -5
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - increase var part reference from 32 to 64 bits on 64 bit systems
    - note current patch does not allow for online upgrade from 32 to 64 bit systems or
vice versa

  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp@stripped, 2007-03-29 11:05:30+02:00,
tomas@stripped +1 -1
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - increase var part reference from 32 to 64 bits on 64 bit systems
    - note current patch does not allow for online upgrade from 32 to 64 bit systems or
vice versa

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@stripped, 2007-03-29 11:05:30+02:00,
tomas@stripped +1 -1
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - increase var part reference from 32 to 64 bits on 64 bit systems
    - note current patch does not allow for online upgrade from 32 to 64 bit systems or
vice versa

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2007-03-29 11:05:30+02:00,
tomas@stripped +1 -1
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - increase var part reference from 32 to 64 bits on 64 bit systems
    - note current patch does not allow for online upgrade from 32 to 64 bit systems or
vice versa

  storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp@stripped, 2007-03-29 11:05:30+02:00,
tomas@stripped +15 -10
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - increase var part reference from 32 to 64 bits on 64 bit systems
    - note current patch does not allow for online upgrade from 32 to 64 bit systems or
vice versa

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-gca

--- 1.5/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp	2006-12-23 20:33:30 +01:00
+++ 1.6/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp	2007-03-29 11:05:30 +02:00
@@ -71,9 +71,10 @@
   /**
    * TODO alloc fix+var part
    */
-  tabPtr->m_offsets[MM].m_fix_header_size += Tuple_header::HeaderSize + 1;
+  const Uint32 XXX = Tuple_header::HeaderSize + Var_part_ref::SZ32;
+  tabPtr->m_offsets[MM].m_fix_header_size += XXX;
   Uint32 *ptr = alloc_fix_rec(fragPtr, tabPtr, key, out_frag_page_id);
-  tabPtr->m_offsets[MM].m_fix_header_size -= Tuple_header::HeaderSize + 1;
+  tabPtr->m_offsets[MM].m_fix_header_size -= XXX;
   if (unlikely(ptr == 0))
   {
     return 0;
@@ -90,7 +91,8 @@
   if (likely(alloc_var_part(fragPtr, tabPtr, alloc_size, &varref) != 0))
   {
     Tuple_header* tuple = (Tuple_header*)ptr;
-    * tuple->get_var_part_ptr(tabPtr) = varref.ref();
+    Var_part_ref* dst = (Var_part_ref*)tuple->get_var_part_ptr(tabPtr);
+    dst->assign(&varref);
     return ptr;
   }
   
@@ -168,7 +170,8 @@
   Tuple_header* tuple = (Tuple_header*)ptr;
 
   Local_key ref;
-  ref.assref(* tuple->get_var_part_ptr(tabPtr));
+  Var_part_ref * varref = (Var_part_ref*)tuple->get_var_part_ptr(tabPtr);
+  varref->copyout(&ref);
 
   free_fix_rec(fragPtr, tabPtr, key, (Fix_page*)pagePtr.p);
 
@@ -194,12 +197,12 @@
 
 int
 Dbtup::realloc_var_part(Fragrecord* fragPtr, Tablerec* tabPtr, PagePtr pagePtr,
-			Var_part_ref* ref, Uint32 oldsz, Uint32 newsz)
+			Var_part_ref* refptr, Uint32 oldsz, Uint32 newsz)
 {
   Uint32 add = newsz - oldsz;
   Var_page* pageP = (Var_page*)pagePtr.p;
   Local_key oldref;
-  oldref.assref(*(Uint32*)ref);
+  refptr->copyout(&oldref);
   
   if (pageP->free_space >= add)
   {
@@ -238,7 +241,7 @@
     ndbassert(oldref.m_page_no != newref.m_page_no);
     ndbassert(pageP->get_entry_len(oldref.m_page_idx) == oldsz);
     memcpy(dst, src, 4*oldsz);
-    * ((Uint32*)ref) = newref.ref();
+    refptr->assign(&newref);
     
     pageP->free_record(oldref.m_page_idx, Var_page::CHAIN);
     update_free_page_list(fragPtr, pagePtr);    
@@ -399,9 +402,10 @@
 		       Local_key* key,
 		       Uint32 * out_frag_page_id)
 {
-  tabPtr->m_offsets[MM].m_fix_header_size += Tuple_header::HeaderSize + 1;
+  const Uint32 XXX = Tuple_header::HeaderSize + Var_part_ref::SZ32;
+  tabPtr->m_offsets[MM].m_fix_header_size += XXX;
   Uint32 *ptr = alloc_fix_rowid(fragPtr, tabPtr, key, out_frag_page_id);
-  tabPtr->m_offsets[MM].m_fix_header_size -= Tuple_header::HeaderSize + 1;
+  tabPtr->m_offsets[MM].m_fix_header_size -= XXX;
   if (unlikely(ptr == 0))
   {
     return 0;
@@ -417,7 +421,8 @@
   if (likely(alloc_var_part(fragPtr, tabPtr, alloc_size, &varref) != 0))
   {
     Tuple_header* tuple = (Tuple_header*)ptr;
-    * tuple->get_var_part_ptr(tabPtr) = varref.ref();
+    Var_part_ref* dst = (Var_part_ref*)tuple->get_var_part_ptr(tabPtr);
+    dst->assign(&varref);
     return ptr;
   }
   

--- 1.55/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-01-15 21:05:11 +01:00
+++ 1.56/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-03-29 11:05:30 +02:00
@@ -1206,9 +1206,35 @@
    */
   struct Var_part_ref 
   {
+#if NDB_SIZEOF_CHARP == 4
     Uint32 m_ref;
-  };
+    STATIC_CONST( SZ32 = 1 );
+
+    void copyout(Local_key* dst) const {
+      dst->m_page_no = m_ref >> MAX_TUPLES_BITS;
+      dst->m_page_idx = m_ref & MAX_TUPLES_PER_PAGE;
+    }
+
+    void assign(const Local_key* src) {
+      m_ref = (src->m_page_no << MAX_TUPLES_BITS) | src->m_page_idx;
+    }
+#else
+    Uint32 m_page_no;
+    Uint32 m_page_idx;
+    STATIC_CONST( SZ32 = 2 );
+
+    void copyout(Local_key* dst) const {
+      dst->m_page_no = m_page_no;
+      dst->m_page_idx = m_page_idx;
+    }
 
+    void assign(const Local_key* src) {
+      m_page_no = src->m_page_no;
+      m_page_idx = src->m_page_idx;
+    }
+#endif    
+  };
+  
   struct Tuple_header
   {
     union {
@@ -2847,12 +2873,13 @@
 Dbtup::get_ptr(Ptr<Page>* pagePtr, Var_part_ref ref)
 {
   PagePtr tmp;
-  Uint32 page_idx= ref.m_ref & MAX_TUPLES_PER_PAGE;
-  tmp.i= ref.m_ref >> MAX_TUPLES_BITS;
+  Local_key key;
+  ref.copyout(&key);
+  tmp.i = key.m_page_no;
   
   c_page_pool.getPtr(tmp);
   memcpy(pagePtr, &tmp, sizeof(tmp));
-  return ((Var_page*)tmp.p)->get_ptr(page_idx);
+  return ((Var_page*)tmp.p)->get_ptr(key.m_page_idx);
 }
 
 inline

--- 1.14/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2006-12-23 20:20:16 +01:00
+++ 1.15/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2007-03-29 11:05:30 +02:00
@@ -153,12 +153,14 @@
 
 	ndbassert(tuple_ptr->m_header_bits & Tuple_header::CHAINED_ROW);
 	
-	Uint32 ref= * tuple_ptr->get_var_part_ptr(regTabPtr.p);
+	Var_part_ref *ref = 
+	  (Var_part_ref*)tuple_ptr->get_var_part_ptr(regTabPtr.p);
+
 	Local_key tmp; 
-	tmp.assref(ref); 
+	ref->copyout(&tmp);
 	
 	idx= tmp.m_page_idx;
-	var_part= get_ptr(&vpage, *(Var_part_ref*)&ref);
+	var_part= get_ptr(&vpage, *ref);
 	Var_page* pageP = (Var_page*)vpage.p;
 	Uint32 len= pageP->get_entry_len(idx) & ~Var_page::CHAIN;
 	Uint32 sz = ((((mm_vars + 1) << 1) + (((Uint16*)var_part)[mm_vars]) + 3)>>
2);

--- 1.21/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2006-12-27 10:58:04 +01:00
+++ 1.22/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-03-29 11:05:30 +02:00
@@ -236,13 +236,14 @@
   }
   else
   {
-    Uint32 *ref= tuple_ptr->get_var_part_ptr(regTabPtr);
+    Var_part_ref *ref= (Var_part_ref*)tuple_ptr->get_var_part_ptr(regTabPtr);
     memcpy(tuple_ptr, copy, 4*(Tuple_header::HeaderSize+fixsize));
     
-    Local_key tmp; tmp.assref(*ref);
-    
+    Local_key tmp; 
+    ref->copyout(&tmp);
+
     PagePtr vpagePtr;
-    Uint32 *dst= get_ptr(&vpagePtr, *(Var_part_ref*)ref);
+    Uint32 *dst= get_ptr(&vpagePtr, *ref);
     Var_page* vpagePtrP = (Var_page*)vpagePtr.p;
     Uint32 *src= copy->get_var_part_ptr(regTabPtr);
     Uint32 sz= ((mm_vars + 1) << 1) + (((Uint16*)src)[mm_vars]);

--- 1.51/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-03-13 12:07:31 +01:00
+++ 1.52/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-03-29 11:05:30 +02:00
@@ -2851,11 +2851,11 @@
     Ptr<Page> pagePtr = req_struct->m_varpart_page_ptr;
     Var_page* pageP= (Var_page*)pagePtr.p;
     Uint32 idx, alloc, needed;
-    Uint32 *refptr = org->get_var_part_ptr(regTabPtr);
+    Var_part_ref *refptr = (Var_part_ref*)org->get_var_part_ptr(regTabPtr);
     ndbassert(bits & Tuple_header::CHAINED_ROW);
 
     Local_key ref;
-    ref.assref(*refptr);
+    refptr->copyout(&ref);
     idx= ref.m_page_idx;
     if (! (copy_bits & Tuple_header::CHAINED_ROW))
     {
@@ -2878,7 +2878,7 @@
     }
     copy_bits |= Tuple_header::MM_GROWN;
     if (unlikely(realloc_var_part(regFragPtr, regTabPtr, pagePtr, 
-				  (Var_part_ref*)refptr, alloc, needed)))
+				  refptr, alloc, needed)))
       return -1;
   }
   req_struct->m_tuple_ptr->m_header_bits = copy_bits;
@@ -2945,9 +2945,10 @@
   PagePtr page_ptr;
   if (tablePtr.p->m_attributes[MM].m_no_of_varsize)
   {
-    tablePtr.p->m_offsets[MM].m_fix_header_size += Tuple_header::HeaderSize+1;
+    const Uint32 XXX = Tuple_header::HeaderSize+Var_part_ref::SZ32;
+    tablePtr.p->m_offsets[MM].m_fix_header_size += XXX;
     ret = alloc_page(tablePtr.p, fragPtr.p, &page_ptr, tmp.m_page_no);
-    tablePtr.p->m_offsets[MM].m_fix_header_size -= Tuple_header::HeaderSize+1;
+    tablePtr.p->m_offsets[MM].m_fix_header_size -= XXX;
   } 
   else
   {

--- 1.21/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2006-12-23 20:20:17 +01:00
+++ 1.22/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2007-03-29 11:05:30 +02:00
@@ -479,7 +479,7 @@
 
   const Uint32 firstTupleNo = 0;
   const Uint32 tupheadsize = tablePtr.p->m_offsets[MM].m_fix_header_size +
-    (buildPtr.p->m_build_vs ? Tuple_header::HeaderSize + 1: 0);
+    (buildPtr.p->m_build_vs? Tuple_header::HeaderSize + Var_part_ref::SZ32: 0);
 
 #ifdef TIME_MEASUREMENT
   MicroSecondTimer start;

--- 1.33/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2006-12-27 10:58:04 +01:00
+++ 1.34/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2007-03-29 11:05:30 +02:00
@@ -542,7 +542,7 @@
   {
     Uint32 fix_tupheader = regTabPtr.p->m_offsets[MM].m_fix_header_size;
     if(regTabPtr.p->m_attributes[MM].m_no_of_varsize != 0)
-      fix_tupheader += Tuple_header::HeaderSize + 1;
+      fix_tupheader += Tuple_header::HeaderSize + Var_part_ref::SZ32;
     ndbassert(fix_tupheader > 0);
     Uint32 noRowsPerPage = ZWORDS_ON_PAGE / fix_tupheader;
     Uint32 noAllocatedPages =

--- 1.18/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2006-12-27 10:58:04 +01:00
+++ 1.19/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2007-03-29 11:05:30 +02:00
@@ -597,7 +597,7 @@
   
   Uint32 lcp_list = fragPtr.p->m_lcp_keep_list;
   Uint32 size = table.m_offsets[mm].m_fix_header_size +
-    (bits & ScanOp::SCAN_VS ? Tuple_header::HeaderSize + 1: 0);
+    (bits&ScanOp::SCAN_VS ? Tuple_header::HeaderSize + Var_part_ref::SZ32 : 0);
 
   if (lcp && lcp_list != RNIL)
     goto found_lcp_keep;