bzr commit into mysql-5.1-telco-7.0-wl4163 branch (pekka:4354) WL#4163

[Pekka Nousiainen]

#At file:///export/space/pekka/ms/ms-wl4163-70/ based on revid:pekka@stripped

 4354 Pekka Nousiainen	2011-05-04
      wl#4163 g01_ops.diff
      temporarily remove node prefix

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp	2011-05-04 10:52:28 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp	2011-05-04 11:57:39 +0000
@@ -283,6 +283,7 @@ Dbtux::printNode(TuxCtx & ctx,
   }
 #endif
   // check inline prefix
+#if wl4163_todo // temp disable prefix
   { ConstData data1 = node.getPref();
     Uint32 data2[MaxPrefSize];
     memset(data2, DataFillByte, MaxPrefSize << 2);
@@ -299,6 +300,7 @@ Dbtux::printNode(TuxCtx & ctx,
       }
     }
   }
+#endif
   // check ordering within node
   for (unsigned j = 1; j < node.getOccup(); j++) {
     const TreeEnt ent1 = node.getEnt(j - 1);

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp	2011-05-04 10:52:28 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp	2011-05-04 11:57:39 +0000
@@ -319,7 +319,7 @@ Dbtux::execTUXFRAGREQ(Signal* signal)
     new (&tree) TreeHead();
     // make these configurable later
     tree.m_nodeSize = MAX_TTREE_NODE_SIZE;
-    tree.m_prefSize = MAX_TTREE_PREF_SIZE;
+    tree.m_prefSize = 0; // wl4163_todo temp disable prefix
     const unsigned maxSlack = MAX_TTREE_NODE_SLACK;
     // size of header and min prefix
     const unsigned fixedSize = NodeHeadSize + tree.m_prefSize;

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp	2011-04-24 16:20:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp	2011-05-04 11:57:39 +0000
@@ -156,8 +156,10 @@ Dbtux::setNodePref(TuxCtx & ctx, NodeHan
 {
   const Frag& frag = node.m_frag;
   const TreeHead& tree = frag.m_tree;
+#if wl4163_todo // temp disable prefix
   readKeyAttrs(ctx, frag, node.getEnt(0), 0, ctx.c_entryKey);
   copyAttrs(ctx, frag, ctx.c_entryKey, node.getPref(), tree.m_prefSize);
+#endif
 }
 
 // node operations

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp	2011-05-04 10:51:37 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp	2011-05-04 11:57:39 +0000
@@ -35,17 +35,15 @@ void
 Dbtux::findNodeToUpdate(TuxCtx& ctx, Frag& frag, ConstData searchKey, TreeEnt searchEnt, NodeHandle& currNode)
 {
   const Index& index = *c_indexPool.getPtr(frag.m_indexId);
-  const TreeHead& tree = frag.m_tree;
   const Uint32 numAttrs = index.m_numAttrs;
   NodeHandle glbNode(frag);     // potential g.l.b of final node
   while (true) {
     thrjam(ctx.jamBuffer);
     selectNode(currNode, currNode.m_loc);
     int ret;
-    // compare prefix
     unsigned start = 0;
-    ret = cmpSearchKey(ctx, frag, start, searchKey, currNode.getPref(), tree.m_prefSize);
-    if (ret == NdbSqlUtil::CmpUnknown) {
+    // wl4163_todo temp disable prefix
+    if (true) {
       thrjam(ctx.jamBuffer);
       // read and compare remaining attributes
       ndbrequire(start < numAttrs);
@@ -211,15 +209,13 @@ Dbtux::searchToRemove(TuxCtx& ctx, Frag&
 void
 Dbtux::findNodeToScan(Frag& frag, unsigned idir, ConstData boundInfo, unsigned boundCount, NodeHandle& currNode)
 {
-  const TreeHead& tree = frag.m_tree;
   NodeHandle glbNode(frag);     // potential g.l.b of final node
   while (true) {
     jam();
     selectNode(currNode, currNode.m_loc);
     int ret;
-    // compare prefix
-    ret = cmpScanBound(frag, idir, boundInfo, boundCount, currNode.getPref(), tree.m_prefSize);
-    if (ret == NdbSqlUtil::CmpUnknown) {
+    // wl4163_todo temp disable prefix
+    if (true) {
       jam();
       // read and compare all attributes
       readKeyAttrs(c_ctx, frag, currNode.getEnt(0), 0, c_ctx.c_entryKey);


Attachment: [text/bzr-bundle] bzr/[e-mail]