From: Ole John Aske
Date: May 13 2011 8:36am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (ole.john.aske:4369)
List-Archive: http://lists.mysql.com/commits/137288
Message-Id: <20110513083641.765A3222@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0954619541980268262=="

--===============0954619541980268262==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0/ based on revid:ole.john.aske@stripped

 4369 Ole John Aske	2011-05-13
      Fixed a problem in SPJ block with 'bushy index scans' where condition
      for when to release or keep buffered rows and/or rangekeys 
      was incorrect.

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-05-04 11:45:33 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-05-13 08:36:37 +0000
@@ -1150,7 +1150,7 @@ Dbspj::batchComplete(Signal* signal, Ptr
 /**
  * Locate next TreeNode(s) to retrieve more rows from.
  *
- *   Calcule set of 'm_active_nodes' we will receive from in NEXTREQ.
+ *   Calculate set of the 'm_active_nodes' we will receive from in NEXTREQ.
  *   Add these TreeNodes to the cursor list to be iterated.
  */
 void
@@ -1168,7 +1168,7 @@ Dbspj::prepareNextBatch(Signal* signal, 
   if (requestPtr.p->m_bits & Request::RT_REPEAT_SCAN_RESULT)
   {
     /**
-     * If REPEAT_SCAN_RESULT we handle byshy scans by return more *new* rows
+     * If REPEAT_SCAN_RESULT we handle bushy scans by return more *new* rows
      * from only one of the active child scans. If there are multiple 
      * bushy scans not being able to return their current result set in 
      * a single batch, result sets from the other child scans are repeated
@@ -1239,7 +1239,7 @@ Dbspj::prepareNextBatch(Signal* signal, 
   {
     /**
      * If not REPEAT_SCAN_RESULT multiple active TreeNodes may return their 
-     * remaining result simultaneously. In case of byshy-scans, these
+     * remaining result simultaneously. In case of bushy-scans, these
      * concurrent result streams are cross joins of each other
      * in SQL terms. In order to produce the cross joined result, it is
      * the responsibility of the API-client to buffer these streams and
@@ -1415,7 +1415,13 @@ Dbspj::releaseScanBuffers(Ptr<Request> r
         releaseNodeRows(requestPtr, treeNodePtr);
       }
       
-      if (treeNodePtr.p->m_state == TreeNode::TN_ACTIVE)
+      /**
+       * Cleanup ACTIVE nodes fetching more rows in a NEXTREQ,
+       * or nodes being in 'm_active_nodes' as they will 'repeat'.
+       * (and then become active)
+       */
+      if (treeNodePtr.p->m_state == TreeNode::TN_ACTIVE ||
+          requestPtr.p->m_active_nodes.get(treeNodePtr.p->m_node_no))
       {
         jam();
         cleanupChildBranch(requestPtr, treeNodePtr);
@@ -1423,9 +1429,11 @@ Dbspj::releaseScanBuffers(Ptr<Request> r
     }
 
     /**
-      * Build Bitmask of all nodes having TN_ACTIVE childs
+      * Collect ancestors of all nodes which are, or will
+      * become active in NEXTREQ (possibly repeated)
       */
-    if (treeNodePtr.p->m_state == TreeNode::TN_ACTIVE)
+    if (treeNodePtr.p->m_state == TreeNode::TN_ACTIVE ||
+        requestPtr.p->m_active_nodes.get(treeNodePtr.p->m_node_no))
     {
       ancestors_of_active.bitOR(treeNodePtr.p->m_ancestors);
     }


--===============0954619541980268262==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   tjhtzrrp1oulursw
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0/
# testament_sha1: f780f079521a922667a403cb2f789b3d4eb2a17c
# timestamp: 2011-05-13 10:36:41 +0200
# base_revision_id: ole.john.aske@stripped\
#   ldyacfqrxouq124w
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWNofLQAAhffgH0QUPf/9383
/0C////0UAUPc7uNAAWwAAMqAanqbSaR6Rtommg1MCD1GgyMQGmjTTBolPU0GYhlGgmnqaGJk0DA
JgIaMmQEU9BMkbUDT1BoAAaAAAADQAOMmTRiGJpgIGBNMEYJiaaaADCCSIJoCaNCMIBR5NTMVP0Z
MpGJmk0bMo9UeIMc1f70Qlv5XuE00soY+G5VLkVwFQ1GriyCiDY/Oi68lyGNJR4BLWwhQQsX+l3B
pld4/sVz5v10MzJWfujq+0rc7gYSisaAgshzJAwrQCUqY7trcYlHNyGON0B6HAzjrr0FJs8Jpoxy
kF/6QH1E8AyB/SUTy6qaGowxLCErIl5lTYoAsOAn9RA8I3lLh304TSiB9zRZlkl6b8+wSDIQE6Ui
MGLzjnWpAt2kU0sMsq62nMqYKN0QoBGRsUQuAz2Iy6s2hJiBhnRKPbxvakZJDLIdI5hbt3Btqtq4
7JpGLZxA7cTrN3OI2Vu4vTgCCsplD4PaXATG8pdfnRClxmfutQtC7almyrTDFK6L4RI+qpI1F9wo
qlyrF+ZrUqc98AU+ygkA2TI7D5NvxCrRESk0oQSxMCg6eUjJCBREnCHi2KkVGbp8x1KVrS0sGzVI
aCTKxTjFPuF8hQwLiV7FHdSLWw3PMZGtkrqyeE5G4dD5XTEaCzNOLGF8M2ncHDdgSnErrxfOYije
+lKOGkkYWKSKGVmLNg5aLKEc8jhbNSxXXLTMm0n0CkozvwlXMpG5Z61Ei8L7IMw5iUKtu62roWa7
A1lb0Gqyu1NTByLInBNNpFgVVN4GjtMMLGznM0zR8PftFUkS9T/ffCODDM0Pr+qkrfRfWn2R9Vv8
1Qm3p1uoltYqr7+AiEFVUs48ProVZ6q2Zb9lRYq3WGGGxhQGDx85ES05oh2cWf28F8e9IrOEMOf7
sZh64rb32adL1fy+mMfksNU86PJ5S8UjB5p6z4xh8vjj2g+u34lt6Zfk9N/F6MR/Jl3ILy/z8jQP
xqrk+f9z5NO9aINthpg6Rt3JFDXfXFRJim6izZZsPLK7SVKpfiPpLCa0+Pk2QGLJUluHKo51n5+f
/PCS5xot7fc1CM48cozSRrjL+G1QOY9916RwSvZ0phbYDl4MSGhYYsJRvsoVWFvoSClpGG1YKMbz
Zx2+CAt+E2gw4mCp1kCxZQ9zx2XSZHF0BiKqiIJaIgS+U8yXx22iq3LMzd/S9zccxoXTea/Xmjqd
z3Yp3isEN7jgn0JjcFI0boGGlrBfiKpXATOXi3y4oZv0701Pt9N5sWdSLcha02ANjjjmn38Ouq20
OkL83RfMX91e7qZNETHEkb1IFlTx2hWH7xCYQcOVtW9e2fnvSOZIc+dLOizepjtspfNiphPh/iVj
JHgdwukj0qRfyYHFHYSkSaLnOwU7K3lJIknVKEGGRB2b+IA+x+RbwqTBJdliJsoOuqrYbsNn+hRQ
QuXpqSNIfM+Yz9fLS4SzIbwgWlMX9kjOG4iqQ9zJtvkLlXDcuh5rrFbIV+TMuJdHvUysviFnZir7
bXU86rKzjZaBQTpLpreDShjH8yoIkkdT+3s5h+DlfTcscrsZQqWYVW8TUFW/YmXB2tH72fKtoKIx
hruNsSZoixHHBVS5Qj9KJFi7aXbQxwzsrDMDjYit3R64OWRgGchyjzYnJRbLHIqycJYXXkrxVisV
LkXr/ouQHsZV5uwWrhNWG67m0Ctg61ahUUPNYJVLAP28LAg3LqJKDpb1Yp100qC7k+rNmeTRi2pP
HRusIZC9jMf/F3JFOFCQY2h8tA==


--===============0954619541980268262==--