3827 Jonas Oreland 2012-03-05 [merge]
ndb - merge 70-spj-spj into 7.2 (improved out-of-memory handling incl. error insert test-cases)
modified:
storage/ndb/include/kernel/signaldata/DbspjErr.hpp
storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
storage/ndb/src/ndbapi/ndberror.c
storage/ndb/test/include/HugoQueryBuilder.hpp
storage/ndb/test/ndbapi/testSpj.cpp
storage/ndb/test/src/HugoQueryBuilder.cpp
3826 jonas oreland 2012-02-23 [merge]
ndb - merge spj error handling to 7.2
modified:
mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
mysql-test/suite/ndb/t/ndb_join_pushdown.inc
storage/ndb/include/ndb_version.h.in
storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
storage/ndb/src/ndbapi/NdbQueryOperation.cpp
storage/ndb/src/ndbapi/Ndbif.cpp
storage/ndb/src/ndbapi/ndberror.c
storage/ndb/test/ndbapi/testSpj.cpp
=== modified file 'storage/ndb/include/kernel/signaldata/DbspjErr.hpp'
--- a/storage/ndb/include/kernel/signaldata/DbspjErr.hpp 2011-02-23 19:28:26 +0000
+++ b/storage/ndb/include/kernel/signaldata/DbspjErr.hpp 2012-03-01 15:13:54 +0000
@@ -1,3 +1,4 @@
+
/*
Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -39,6 +40,7 @@ struct DbspjErr
,OutOfRowMemory = 20015
,NodeFailure = 20016
,InvalidTreeNodeCount = 20017
+ ,IndexFragNotFound = 20018
};
};
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp 2012-02-23 15:41:31 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp 2012-03-05 09:38:49 +0000
@@ -545,7 +545,6 @@ Dbspj::handle_early_lqhkey_ref(Signal* s
const LqhKeyReq * lqhKeyReq,
Uint32 err)
{
- CLEAR_ERROR_INSERT_VALUE; // clear injected error if any
/**
* Error path...
*/
@@ -825,8 +824,6 @@ Dbspj::handle_early_scanfrag_ref(Signal*
const ScanFragReq * _req,
Uint32 err)
{
- CLEAR_ERROR_INSERT_VALUE; // clear any injected error
-
ScanFragReq req = *_req;
Uint32 senderRef = signal->getSendersBlockRef();
@@ -925,7 +922,7 @@ Dbspj::build(Build_context& ctx,
jam();
goto error;
}
- if (ERROR_INSERTED(17006))
+ if (ERROR_INSERTED_CLEAR(17006))
{
ndbout_c("Injecting UnknowQueryOperation error 17006 at line %d file %s",
__LINE__, __FILE__);
@@ -956,9 +953,6 @@ Dbspj::build(Build_context& ctx,
*/
ctx.m_start_signal = 0;
- /**
- * TODO handle error, by aborting request
- */
ndbrequire(ctx.m_cnt < NDB_ARRAY_SIZE(ctx.m_node_list));
ctx.m_cnt++;
}
@@ -1833,6 +1827,7 @@ Dbspj::complete(Signal* signal, Ptr<Requ
void
Dbspj::cleanup(Ptr<Request> requestPtr)
{
+ CLEAR_ERROR_INSERT_VALUE; // clear any injected error
ndbrequire(requestPtr.p->m_cnt_active == 0);
{
Ptr<TreeNode> nodePtr;
@@ -2167,7 +2162,7 @@ Dbspj::execTRANSID_AI(Signal* signal)
Ptr<Request> requestPtr;
m_request_pool.getPtr(requestPtr, treeNodePtr.p->m_requestPtrI);
- ndbrequire(signal->getNoOfSections() != 0); // TODO check if this can happen
+ ndbrequire(signal->getNoOfSections() != 0);
SegmentedSectionPtr dataPtr;
{
@@ -3813,9 +3808,14 @@ Dbspj::computePartitionHash(Signal* sign
const KeyDescriptor::KeyAttr& keyAttr = desc->keyAttr[i];
if (AttributeDescriptor::getDKey(keyAttr.attributeDescriptor))
{
+ Uint32 attrLen =
xfrm_attr(keyAttr.attributeDescriptor, keyAttr.charsetInfo,
src, srcPos, dst, dstPos,
NDB_ARRAY_SIZE(signal->theData) - 24);
+ if (unlikely(attrLen == 0))
+ {
+ return 290; // 'Corrupt key in TC, unable to xfrm'
+ }
}
}
tmp64 = (Uint64*)dst;
@@ -3865,10 +3865,6 @@ Dbspj::getNodes(Signal* signal, BuildKey
return 0;
error:
- /**
- * TODO handle error
- */
- ndbrequire(false);
return err;
}
@@ -4780,128 +4776,153 @@ Dbspj::execDIH_SCAN_TAB_CONF(Signal* sig
// the same subset of frags fram all SPJ requests in case of
// the scan not being ' T_SCAN_PARALLEL'
Uint16 fragNoOffs = requestPtr.p->m_rootFragId % fragCount;
+ Uint32 err = 0;
- Ptr<ScanFragHandle> fragPtr;
- Local_ScanFragHandle_list list(m_scanfraghandle_pool, data.m_fragments);
- if (likely(m_scanfraghandle_pool.seize(requestPtr.p->m_arena, fragPtr)))
- {
- jam();
- fragPtr.p->init(fragNoOffs);
- fragPtr.p->m_treeNodePtrI = treeNodePtr.i;
- list.addLast(fragPtr);
- }
- else
+ do
{
- jam();
- goto error1;
- }
+ Ptr<ScanFragHandle> fragPtr;
+ Local_ScanFragHandle_list list(m_scanfraghandle_pool, data.m_fragments);
- if (treeNodePtr.p->m_bits & TreeNode::T_CONST_PRUNE)
- {
- jam();
+ if (ERROR_INSERTED_CLEAR(17012))
+ {
+ jam();
+ ndbout_c("Injecting OutOfQueryMemory error 17012 at line %d file %s",
+ __LINE__, __FILE__);
+ err = DbspjErr::OutOfQueryMemory;
+ break;
+ }
- // TODO we need a different variant of computeHash here,
- // since m_constPrunePtrI does not contain full primary key
- // but only parts in distribution key
+ if (likely(m_scanfraghandle_pool.seize(requestPtr.p->m_arena, fragPtr)))
+ {
+ jam();
+ fragPtr.p->init(fragNoOffs);
+ fragPtr.p->m_treeNodePtrI = treeNodePtr.i;
+ list.addLast(fragPtr);
+ }
+ else
+ {
+ jam();
+ err = DbspjErr::OutOfQueryMemory;
+ break;
+ }
- BuildKeyReq tmp;
- Uint32 indexId = dst->tableId;
- Uint32 tableId = g_key_descriptor_pool.getPtr(indexId)->primaryTableId;
- Uint32 err = computePartitionHash(signal, tmp, tableId, data.m_constPrunePtrI);
- if (unlikely(err != 0))
- goto error;
+ if (treeNodePtr.p->m_bits & TreeNode::T_CONST_PRUNE)
+ {
+ jam();
- releaseSection(data.m_constPrunePtrI);
- data.m_constPrunePtrI = RNIL;
+ // TODO we need a different variant of computeHash here,
+ // since m_constPrunePtrI does not contain full primary key
+ // but only parts in distribution key
- err = getNodes(signal, tmp, tableId);
- if (unlikely(err != 0))
- goto error;
+ BuildKeyReq tmp;
+ Uint32 indexId = dst->tableId;
+ Uint32 tableId = g_key_descriptor_pool.getPtr(indexId)->primaryTableId;
+ err = computePartitionHash(signal, tmp, tableId, data.m_constPrunePtrI);
+ if (unlikely(err != 0))
+ {
+ jam();
+ break;
+ }
- fragPtr.p->m_fragId = tmp.fragId;
- fragPtr.p->m_ref = tmp.receiverRef;
- data.m_fragCount = 1;
- }
- else if (fragCount == 1)
- {
- jam();
- /**
- * This is roughly equivalent to T_CONST_PRUNE
- * pretend that it is const-pruned
- */
- if (treeNodePtr.p->m_bits & TreeNode::T_PRUNE_PATTERN)
- {
- jam();
- LocalArenaPoolImpl pool(requestPtr.p->m_arena, m_dependency_map_pool);
- Local_pattern_store pattern(pool, data.m_prunePattern);
- pattern.release();
- }
- data.m_constPrunePtrI = RNIL;
- Uint32 clear = TreeNode::T_PRUNE_PATTERN | TreeNode::T_SCAN_PARALLEL;
- treeNodePtr.p->m_bits &= ~clear;
- treeNodePtr.p->m_bits |= TreeNode::T_CONST_PRUNE;
+ releaseSection(data.m_constPrunePtrI);
+ data.m_constPrunePtrI = RNIL;
- /**
- * We must get fragPtr.p->m_ref...so set pruned=false
- */
- pruned = false;
- }
- else
- {
- for (Uint32 i = 1; i<fragCount; i++)
+ err = getNodes(signal, tmp, tableId);
+ if (unlikely(err != 0))
+ {
+ jam();
+ break;
+ }
+
+ fragPtr.p->m_fragId = tmp.fragId;
+ fragPtr.p->m_ref = tmp.receiverRef;
+ data.m_fragCount = 1;
+ }
+ else if (fragCount == 1)
{
jam();
- Ptr<ScanFragHandle> fragPtr;
- Uint16 fragNo = (fragNoOffs+i) % fragCount;
- if (likely(m_scanfraghandle_pool.seize(requestPtr.p->m_arena, fragPtr)))
+ /**
+ * This is roughly equivalent to T_CONST_PRUNE
+ * pretend that it is const-pruned
+ */
+ if (treeNodePtr.p->m_bits & TreeNode::T_PRUNE_PATTERN)
{
jam();
- fragPtr.p->init(fragNo);
- fragPtr.p->m_treeNodePtrI = treeNodePtr.i;
- list.addLast(fragPtr);
+ LocalArenaPoolImpl pool(requestPtr.p->m_arena, m_dependency_map_pool);
+ Local_pattern_store pattern(pool, data.m_prunePattern);
+ pattern.release();
}
- else
+ data.m_constPrunePtrI = RNIL;
+ Uint32 clear = TreeNode::T_PRUNE_PATTERN | TreeNode::T_SCAN_PARALLEL;
+ treeNodePtr.p->m_bits &= ~clear;
+ treeNodePtr.p->m_bits |= TreeNode::T_CONST_PRUNE;
+
+ /**
+ * We must get fragPtr.p->m_ref...so set pruned=false
+ */
+ pruned = false;
+ }
+ else
+ {
+ for (Uint32 i = 1; i<fragCount; i++)
{
- goto error1;
+ jam();
+ Ptr<ScanFragHandle> fragPtr;
+ Uint16 fragNo = (fragNoOffs+i) % fragCount;
+ if (likely(m_scanfraghandle_pool.seize(requestPtr.p->m_arena, fragPtr)))
+ {
+ jam();
+ fragPtr.p->init(fragNo);
+ fragPtr.p->m_treeNodePtrI = treeNodePtr.i;
+ list.addLast(fragPtr);
+ }
+ else
+ {
+ jam();
+ err = DbspjErr::OutOfQueryMemory;
+ goto error;
+ }
}
}
- }
- data.m_frags_complete = data.m_fragCount;
+ data.m_frags_complete = data.m_fragCount;
- if (!pruned)
- {
- jam();
- Uint32 tableId = ((ScanFragReq*)data.m_scanFragReq)->tableId;
- DihScanGetNodesReq * req = (DihScanGetNodesReq*)signal->getDataPtrSend();
- req->senderRef = reference();
- req->tableId = tableId;
- req->scanCookie = cookie;
+ if (!pruned)
+ {
+ jam();
+ Uint32 tableId = ((ScanFragReq*)data.m_scanFragReq)->tableId;
+ DihScanGetNodesReq * req = (DihScanGetNodesReq*)signal->getDataPtrSend();
+ req->senderRef = reference();
+ req->tableId = tableId;
+ req->scanCookie = cookie;
- Uint32 cnt = 0;
- for (list.first(fragPtr); !fragPtr.isNull(); list.next(fragPtr))
+ Uint32 cnt = 0;
+ for (list.first(fragPtr); !fragPtr.isNull(); list.next(fragPtr))
+ {
+ jam();
+ req->senderData = fragPtr.i;
+ req->fragId = fragPtr.p->m_fragId;
+ sendSignal(DBDIH_REF, GSN_DIH_SCAN_GET_NODES_REQ, signal,
+ DihScanGetNodesReq::SignalLength, JBB);
+ cnt++;
+ }
+ data.m_frags_outstanding = cnt;
+ requestPtr.p->m_outstanding++;
+ }
+ else
{
jam();
- req->senderData = fragPtr.i;
- req->fragId = fragPtr.p->m_fragId;
- sendSignal(DBDIH_REF, GSN_DIH_SCAN_GET_NODES_REQ, signal,
- DihScanGetNodesReq::SignalLength, JBB);
- cnt++;
+ treeNodePtr.p->m_state = TreeNode::TN_INACTIVE;
}
- data.m_frags_outstanding = cnt;
- requestPtr.p->m_outstanding++;
- }
- else
- {
- jam();
- treeNodePtr.p->m_state = TreeNode::TN_INACTIVE;
- }
- checkPrepareComplete(signal, requestPtr, 1);
+ checkPrepareComplete(signal, requestPtr, 1);
- return;
+ return;
+ } while (0);
-error1:
error:
- ndbrequire(false);
+ ndbrequire(requestPtr.p->isScan());
+ ndbrequire(requestPtr.p->m_outstanding >= 1);
+ requestPtr.p->m_outstanding -= 1;
+ abort(signal, requestPtr, err);
}
void
@@ -4959,7 +4980,7 @@ Dbspj::scanIndex_findFrag(Local_ScanFrag
}
}
- return 99; // TODO
+ return DbspjErr::IndexFragNotFound;
}
void
@@ -5015,16 +5036,12 @@ Dbspj::scanIndex_parent_row(Signal* sign
return; // Bailout, SCANREQ would have returned 0 rows anyway
}
- // TODO we need a different variant of computeHash here,
- // since pruneKeyPtrI does not contain full primary key
- // but only parts in distribution key
-
BuildKeyReq tmp;
ScanFragReq * dst = (ScanFragReq*)data.m_scanFragReq;
Uint32 indexId = dst->tableId;
Uint32 tableId = g_key_descriptor_pool.getPtr(indexId)->primaryTableId;
err = computePartitionHash(signal, tmp, tableId, pruneKeyPtrI);
- releaseSection(pruneKeyPtrI); // see ^ TODO
+ releaseSection(pruneKeyPtrI);
if (unlikely(err != 0))
{
DEBUG_CRASH();
@@ -5072,6 +5089,27 @@ Dbspj::scanIndex_parent_row(Signal* sign
{
jam();
Local_pattern_store pattern(pool, treeNodePtr.p->m_keyPattern);
+
+ /**
+ * Test execution terminated due to 'OutOfSectionMemory':
+ * - 17060: Fail on scanIndex_parent_row at first call
+ * - 17061: Fail on scanIndex_parent_row if 'isLeaf'
+ * - 17062: Fail on scanIndex_parent_row if treeNode not root
+ * - 17063: Fail on scanIndex_parent_row at a random node of the query tree
+ * -
+ */
+
+ if (ERROR_INSERTED(17060) ||
+ (rand() % 7) == 0 && ERROR_INSERTED(17061) ||
+ (treeNodePtr.p->isLeaf() && ERROR_INSERTED(17062)) ||
+ (treeNodePtr.p->m_parentPtrI != RNIL && ERROR_INSERTED(17063)))
+ {
+ ndbout_c("Injecting OutOfSectionMemory error at line %d file %s",
+ __LINE__, __FILE__);
+ err = DbspjErr::OutOfSectionMemory;
+ break;
+ }
+
err = expand(ptrI, pattern, rowRef, hasNull);
if (unlikely(err != 0))
{
@@ -5102,7 +5140,9 @@ Dbspj::scanIndex_parent_row(Signal* sign
return;
} while (0);
- ndbrequire(false);
+ ndbrequire(err);
+ jam();
+ abort(signal, requestPtr, err);
}
@@ -6199,7 +6239,8 @@ Dbspj::scanIndex_release_rangekeys(Ptr<R
else
{
jam();
- list.first(fragPtr);
+ if (!list.first(fragPtr))
+ return;
if (fragPtr.p->m_rangePtrI != RNIL)
{
releaseSection(fragPtr.p->m_rangePtrI);
@@ -6465,16 +6506,16 @@ Dbspj::appendTreeToSection(Uint32 & ptrI
{
jam();
tree.getWords(tmp, SZ);
- ndbrequire(appendToSection(ptrI, tmp, SZ));
+ if (!appendToSection(ptrI, tmp, SZ))
+ return DbspjErr::OutOfSectionMemory;
len -= SZ;
}
tree.getWords(tmp, len);
- return appendToSection(ptrI, tmp, len) ? 0 : /** todo error code */ 1;
-#if TODO
-err:
- return 1;
-#endif
+ if (!appendToSection(ptrI, tmp, len))
+ return DbspjErr::OutOfSectionMemory;
+
+ return 0;
}
void
@@ -6542,9 +6583,6 @@ Dbspj::appendColToSection(Uint32 & dst,
Uint32 col, bool& hasNull)
{
jam();
- /**
- * TODO handle errors
- */
Uint32 offset = row.m_header->m_offset[col];
const Uint32 * ptr = row.m_data + offset;
Uint32 len = AttributeHeader::getDataSize(* ptr ++);
@@ -6554,7 +6592,7 @@ Dbspj::appendColToSection(Uint32 & dst,
hasNull = true; // NULL-value in key
return 0;
}
- return appendToSection(dst, ptr, len) ? 0 : DbspjErr::InvalidPattern;
+ return appendToSection(dst, ptr, len) ? 0 : DbspjErr::OutOfSectionMemory;
}
Uint32
@@ -6562,9 +6600,6 @@ Dbspj::appendAttrinfoToSection(Uint32 &
Uint32 col, bool& hasNull)
{
jam();
- /**
- * TODO handle errors
- */
Uint32 offset = row.m_header->m_offset[col];
const Uint32 * ptr = row.m_data + offset;
Uint32 len = AttributeHeader::getDataSize(* ptr);
@@ -6573,7 +6608,7 @@ Dbspj::appendAttrinfoToSection(Uint32 &
jam();
hasNull = true; // NULL-value in key
}
- return appendToSection(dst, ptr, 1 + len) ? 0 : DbspjErr::InvalidPattern;
+ return appendToSection(dst, ptr, 1 + len) ? 0 : DbspjErr::OutOfSectionMemory;
}
Uint32
@@ -6797,7 +6832,7 @@ Dbspj::appendDataToSection(Uint32 & ptrI
if (!appendToSection(ptrI, tmp, dstIdx))
{
DEBUG_CRASH();
- return DbspjErr::InvalidPattern;
+ return DbspjErr::OutOfSectionMemory;
}
dstIdx = 0;
}
@@ -6805,7 +6840,7 @@ Dbspj::appendDataToSection(Uint32 & ptrI
if (remaining > 0)
{
DEBUG_CRASH();
- return DbspjErr::InvalidPattern;
+ return DbspjErr::OutOfSectionMemory;
}
else
{
@@ -7145,9 +7180,22 @@ Dbspj::parseDA(Build_context& ctx,
do
{
- if (ERROR_INSERTED(17007))
+ /**
+ * Test execution terminated due to 'OutOfSectionMemory' which
+ * may happen multiple places (eg. appendtosection, expand) below:
+ * - 17050: Fail on parseDA at first call
+ * - 17051: Fail on parseDA if 'isLeaf'
+ * - 17052: Fail on parseDA if treeNode not root
+ * - 17053: Fail on parseDA at a random node of the query tree
+ * -
+ */
+
+ if (ERROR_INSERTED(17050) ||
+ (treeNodePtr.p->isLeaf() && ERROR_INSERTED(17051)) ||
+ (treeNodePtr.p->m_parentPtrI != RNIL && ERROR_INSERTED(17052)) ||
+ (rand() % 7) == 0 && ERROR_INSERTED(17053))
{
- ndbout_c("Injecting OutOfSectionMemory error 17007 at line %d file %s",
+ ndbout_c("Injecting OutOfSectionMemory error at line %d file %s",
__LINE__, __FILE__);
jam();
err = DbspjErr::OutOfSectionMemory;
=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c 2012-02-23 15:41:31 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c 2012-03-05 09:38:49 +0000
@@ -164,6 +164,7 @@ ErrorBundle ErrorCodes[] = {
{ 20015, DMEC, IS, "Query aborted due to out of row memory" },
{ 20016, DMEC, NR, "Query aborted due to node failure" },
{ 20017, DMEC, IE, "Query aborted due to invalid node count" },
+ { 20018, DMEC, IE, "Query aborted due to index fragment not found" },
/**
* Node shutdown
=== modified file 'storage/ndb/test/include/HugoQueryBuilder.hpp'
--- a/storage/ndb/test/include/HugoQueryBuilder.hpp 2011-10-20 19:52:11 +0000
+++ b/storage/ndb/test/include/HugoQueryBuilder.hpp 2012-03-05 09:38:49 +0000
@@ -60,9 +60,15 @@ public:
/**
* Query might table scan
*/
- O_TABLE_SCAN = 0x20
+ O_TABLE_SCAN = 0x20,
+
+ /**
+ * Column referrences may also include grandparents (Default 'on')
+ */
+ O_GRANDPARENT = 0x100
};
- static const OptionMask OM_RANDOM_OPTIONS = (OptionMask)(O_PK_INDEX | O_UNIQUE_INDEX | O_ORDERED_INDEX | O_TABLE_SCAN);
+ static const OptionMask OM_RANDOM_OPTIONS =
+ (OptionMask)(O_PK_INDEX | O_UNIQUE_INDEX | O_ORDERED_INDEX | O_TABLE_SCAN | O_GRANDPARENT);
HugoQueryBuilder(Ndb* ndb, const NdbDictionary::Table**tabptr,
OptionMask om = OM_RANDOM_OPTIONS){
=== modified file 'storage/ndb/test/ndbapi/testSpj.cpp'
--- a/storage/ndb/test/ndbapi/testSpj.cpp 2012-02-22 14:03:58 +0000
+++ b/storage/ndb/test/ndbapi/testSpj.cpp 2012-03-01 15:13:54 +0000
@@ -31,7 +31,7 @@ static int faultToInject = 0;
enum faultsToInject {
FI_START = 17001,
- FI_END = 17042
+ FI_END = 17063
};
int
@@ -114,10 +114,13 @@ runLookupJoinError(NDBT_Context* ctx, ND
NdbRestarter restarter;
int lookupFaults[] = {
- 17001, 17005, 17006, 17007, 17008,
+ 17001, 17005, 17006, 17008,
+ 17012, // testing abort in :execDIH_SCAN_TAB_CONF
17020, 17021, 17022, // lookup_send() encounter dead node -> NodeFailure
17030, 17031, 17032, // LQHKEYREQ reply is LQHKEYREF('Invalid..')
- 17040, 17041, 17042 // lookup_parent_row -> OutOfQueryMemory
+ 17040, 17041, 17042, // lookup_parent_row -> OutOfQueryMemory
+ 17050, 17051, 17052, 17053, // parseDA -> outOfSectionMem
+ 17060, 17061, 17062, 17063 // scanIndex_parent_row -> outOfSectionMem
};
loops = faultToInject ? 1 : sizeof(lookupFaults)/sizeof(int);
@@ -197,10 +200,13 @@ runScanJoinError(NDBT_Context* ctx, NDBT
NdbRestarter restarter;
int scanFaults[] = {
- 17002, 17004, 17005, 17006, 17007, 17008,
+ 17002, 17004, 17005, 17006, 17008,
+ 17012, // testing abort in :execDIH_SCAN_TAB_CONF
17020, 17021, 17022, // lookup_send() encounter dead node -> NodeFailure
17030, 17031, 17032, // LQHKEYREQ reply is LQHKEYREF('Invalid..')
- 17040, 17041, 17042 // lookup_parent_row -> OutOfQueryMemory
+ 17040, 17041, 17042, // lookup_parent_row -> OutOfQueryMemory
+ 17050, 17051, 17052, 17053, // parseDA -> outOfSectionMem
+ 17060, 17061, 17062, 17063 // scanIndex_parent_row -> outOfSectionMem
};
loops = faultToInject ? 1 : sizeof(scanFaults)/sizeof(int);
=== modified file 'storage/ndb/test/src/HugoQueryBuilder.cpp'
--- a/storage/ndb/test/src/HugoQueryBuilder.cpp 2011-11-16 08:17:17 +0000
+++ b/storage/ndb/test/src/HugoQueryBuilder.cpp 2012-03-05 09:38:49 +0000
@@ -66,6 +66,7 @@ HugoQueryBuilder::fixOptions()
setOption(O_UNIQUE_INDEX);
setOption(O_TABLE_SCAN);
setOption(O_ORDERED_INDEX);
+ setOption(O_GRANDPARENT);
if (testOption(O_LOOKUP))
{
clearOption(O_TABLE_SCAN);
@@ -326,11 +327,10 @@ HugoQueryBuilder::getParents(OpIdx oi)
continue;
set.push_back(op);
-#if 0
/**
- * add parents
+ * Also add grandparents
*/
- if (testOption(O_MULTI_PARENT))
+ if (testOption(O_GRANDPARENT))
{
while (op.m_parent != -1)
{
@@ -338,7 +338,6 @@ HugoQueryBuilder::getParents(OpIdx oi)
set.push_back(op);
}
}
-#endif
if (checkBindable(cols, set, allow_bind_nullable))
return set;
@@ -477,11 +476,17 @@ HugoQueryBuilder::createOp(NdbQueryBuild
loop:
OpIdx oi = getOp();
Vector<Op> parents = getParents(oi);
+ NdbQueryOptions options;
if (parents.size() == 0)
{
// no possible parents found for pTab...try another
goto loop;
}
+ if (parents.size() > 1)
+ {
+ // We have grandparents, 'parents[0]' is real parent
+ options.setParent(parents[0].m_op);
+ }
switch(oi.m_type){
case NdbQueryOperationDef::PrimaryKeyAccess:{
int opNo = 0;
@@ -497,7 +502,7 @@ loop:
operands[opNo] = 0;
op.m_parent = parents[0].m_idx;
- op.m_op = builder.readTuple(oi.m_table, operands);
+ op.m_op = builder.readTuple(oi.m_table, operands, &options);
break;
}
case NdbQueryOperationDef::UniqueIndexAccess: {
@@ -513,7 +518,7 @@ loop:
operands[opNo] = 0;
op.m_parent = parents[0].m_idx;
- op.m_op = builder.readTuple(oi.m_index, oi.m_table, operands);
+ op.m_op = builder.readTuple(oi.m_index, oi.m_table, operands, &options);
break;
}
case NdbQueryOperationDef::TableScan:
@@ -533,7 +538,7 @@ loop:
op.m_parent = parents[0].m_idx;
NdbQueryIndexBound bounds(operands); // Only EQ for now
- op.m_op = builder.scanIndex(oi.m_index, oi.m_table, &bounds);
+ op.m_op = builder.scanIndex(oi.m_index, oi.m_table, &bounds, &options);
if (op.m_op == 0)
{
ndbout << "Failed to add to " << endl;
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (jonas.oreland:3826 to 3827) | Jonas Oreland | 5 Mar |
