From: Jan Wedvik Date: June 24 2011 12:01pm Subject: bzr commit into mysql-5.1-telco-7.0 branch (jan.wedvik:4476) List-Archive: http://lists.mysql.com/commits/139818 Message-Id: <20110624120144.0929B225@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5692097174737402557==" --===============5692097174737402557== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///net/atum17/export/home/tmp/jw159207/mysql/repo/mysql-5.1-telco-7.0/ based on revid:jonas@stripped 4476 Jan Wedvik 2011-06-24 This is a refactoring, replacing m_frags_not_complete with m_frags_complete to improve readability. modified: storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp === modified file 'storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp' --- a/storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp 2011-05-04 11:45:33 +0000 +++ b/storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp 2011-06-24 12:01:37 +0000 @@ -532,7 +532,7 @@ public: struct ScanIndexData { - Uint16 m_frags_not_complete; + Uint16 m_frags_complete; Uint16 m_frags_outstanding; Uint32 m_rows_received; // #execTRANSID_AI Uint32 m_rows_expecting; // Sum(ScanFragConf) === modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp' --- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp 2011-06-16 08:37:10 +0000 +++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp 2011-06-24 12:01:37 +0000 @@ -4449,7 +4449,7 @@ Dbspj::parseScanIndex(Build_context& ctx ScanIndexData& data = treeNodePtr.p->m_scanindex_data; data.m_fragments.init(); data.m_frags_outstanding = 0; - data.m_frags_not_complete = 0; + data.m_frags_complete = 0; data.m_batch_chunks = 0; err = parseDA(ctx, requestPtr, treeNodePtr, @@ -4679,6 +4679,7 @@ Dbspj::execDIH_SCAN_TAB_CONF(Signal* sig } } } + data.m_frags_complete = data.m_fragCount; if (!pruned) { @@ -4966,7 +4967,8 @@ Dbspj::scanIndex_parent_batch_complete(S data.m_rows_received = 0; data.m_rows_expecting = 0; ndbassert(data.m_frags_outstanding == 0); - ndbassert(data.m_frags_not_complete == 0); + ndbassert(data.m_frags_complete == data.m_fragCount); + data.m_frags_complete = 0; Ptr fragPtr; { @@ -4975,32 +4977,33 @@ Dbspj::scanIndex_parent_batch_complete(S if ((treeNodePtr.p->m_bits & TreeNode::T_PRUNE_PATTERN) == 0) { - if (fragPtr.p->m_rangePtrI != RNIL) + if (fragPtr.p->m_rangePtrI == RNIL) { - // No pruning, so we must scan all fragments. + // No keys found jam(); - data.m_frags_not_complete = data.m_fragCount; + data.m_frags_complete = data.m_fragCount; } } else { while(!fragPtr.isNull()) { - if (fragPtr.p->m_rangePtrI != RNIL) + if (fragPtr.p->m_rangePtrI == RNIL) { jam(); /** * This is a pruned scan, so we must scan those fragments that * some distribution key hashed to. */ - data.m_frags_not_complete++; + fragPtr.p->m_state = ScanFragHandle::SFH_COMPLETE; + data.m_frags_complete++; } list.next(fragPtr); } } } - if (data.m_frags_not_complete == 0) + if (data.m_frags_complete == data.m_fragCount) { jam(); /** @@ -5058,7 +5061,7 @@ Dbspj::scanIndex_send(Signal* signal, if (treeNodePtr.p->m_bits & TreeNode::T_SCAN_PARALLEL) { jam(); - cnt = data.m_frags_not_complete; + cnt = data.m_fragCount - data.m_frags_complete; ndbrequire(cnt > 0); bs_rows /= cnt; @@ -5194,7 +5197,8 @@ Dbspj::scanIndex_send(Signal* signal, if (treeNodePtr.p->m_bits & TreeNode::T_SCAN_PARALLEL) { - ndbrequire(data.m_frags_outstanding == data.m_frags_not_complete); + ndbrequire(data.m_frags_outstanding == + data.m_fragCount - data.m_frags_complete); } else { @@ -5295,10 +5299,10 @@ Dbspj::scanIndex_execSCAN_FRAGCONF(Signa { jam(); fragPtr.p->m_state = ScanFragHandle::SFH_COMPLETE; - ndbrequire(data.m_frags_not_complete>0); - data.m_frags_not_complete--; + ndbrequire(data.m_frags_complete < data.m_fragCount); + data.m_frags_complete++; - if (data.m_frags_not_complete == 0) + if (data.m_frags_complete == data.m_fragCount) { jam(); ndbrequire(requestPtr.p->m_cnt_active); @@ -5355,12 +5359,12 @@ Dbspj::scanIndex_execSCAN_FRAGREF(Signal fragPtr.p->m_state = ScanFragHandle::SFH_COMPLETE; ScanIndexData& data = treeNodePtr.p->m_scanindex_data; - ndbrequire(data.m_frags_not_complete > 0); - data.m_frags_not_complete--; + ndbrequire(data.m_frags_complete < data.m_fragCount); + data.m_frags_complete++; ndbrequire(data.m_frags_outstanding > 0); data.m_frags_outstanding--; - if (data.m_frags_not_complete == 0) + if (data.m_frags_complete == data.m_fragCount) { jam(); ndbrequire(requestPtr.p->m_cnt_active); @@ -5391,8 +5395,8 @@ Dbspj::scanIndex_execSCAN_NEXTREQ(Signal data.m_rows_expecting = 0; ndbassert(data.m_frags_outstanding == 0); - ndbrequire(data.m_frags_not_complete>0); - Uint32 cnt = data.m_frags_not_complete; + ndbrequire(data.m_frags_complete < data.m_fragCount); + Uint32 cnt = data.m_fragCount - data.m_frags_complete; if ((treeNodePtr.p->m_bits & TreeNode::T_SCAN_PARALLEL) == 0) { jam(); @@ -5581,7 +5585,7 @@ Dbspj::scanIndex_execNODE_FAILREP(Signal Ptr fragPtr; Uint32 save0 = data.m_frags_outstanding; - Uint32 save1 = data.m_frags_not_complete; + Uint32 save1 = data.m_frags_complete; for (list.first(fragPtr); !fragPtr.isNull(); list.next(fragPtr)) { @@ -5597,8 +5601,8 @@ Dbspj::scanIndex_execNODE_FAILREP(Signal switch(fragPtr.p->m_state){ case ScanFragHandle::SFH_NOT_STARTED: jam(); - ndbrequire(data.m_frags_not_complete > 0); - data.m_frags_not_complete--; + ndbrequire(data.m_frags_complete < data.m_fragCount); + data.m_frags_complete++; // fall through case ScanFragHandle::SFH_COMPLETE: jam(); @@ -5618,8 +5622,8 @@ Dbspj::scanIndex_execNODE_FAILREP(Signal case ScanFragHandle::SFH_WAIT_NEXTREQ: jam(); sum++; - ndbrequire(data.m_frags_not_complete > 0); - data.m_frags_not_complete--; + ndbrequire(data.m_frags_complete < data.m_fragCount); + data.m_frags_complete++; break; } fragPtr.p->m_ref = 0; @@ -5633,7 +5637,8 @@ Dbspj::scanIndex_execNODE_FAILREP(Signal requestPtr.p->m_outstanding--; } - if (save1 != 0 && data.m_frags_not_complete == 0) + if (save1 != data.m_fragCount + && data.m_frags_complete == data.m_fragCount) { jam(); ndbrequire(requestPtr.p->m_cnt_active); --===============5692097174737402557== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jan.wedvik@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jan.wedvik@stripped # target_branch: file:///net/atum17/export/home/tmp/jw159207/mysql\ # /repo/mysql-5.1-telco-7.0/ # testament_sha1: 25937f1e1879e7484def9cf72f32e8f649d1b6bf # timestamp: 2011-06-24 14:01:43 +0200 # base_revision_id: jonas@stripped # # Begin bundle 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 OuhHSLXoMGdDeGFOpPA2x/8XckU4UJC3vZH0 --===============5692097174737402557==--