ndb -

  ndbapi test of bug#20252
parent 7f307660
...@@ -1150,6 +1150,8 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step) ...@@ -1150,6 +1150,8 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step)
for(int lm = 0; lm <= NdbOperation::LM_CommittedRead; lm++) for(int lm = 0; lm <= NdbOperation::LM_CommittedRead; lm++)
{ {
for(int flags = 0; flags < 4; flags++) for(int flags = 0; flags < 4; flags++)
{
for (int batch = 0; batch < 100; batch += (1 + batch + (batch >> 3)))
{ {
for (int par = 0; par < 16; par += 1 + (rand() % 3)) for (int par = 0; par < 16; par += 1 + (rand() % 3))
{ {
...@@ -1159,6 +1161,7 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step) ...@@ -1159,6 +1161,7 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step)
<< " disk: " << disk << " disk: " << disk
<< " tup scan: " << tups << " tup scan: " << tups
<< " par: " << par << " par: " << par
<< " batch: " << batch
<< endl; << endl;
NdbConnection* pCon = pNdb->startTransaction(); NdbConnection* pCon = pNdb->startTransaction();
...@@ -1170,7 +1173,8 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step) ...@@ -1170,7 +1173,8 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step)
if( pOp->readTuples((NdbOperation::LockMode)lm, if( pOp->readTuples((NdbOperation::LockMode)lm,
tups ? NdbScanOperation::SF_TupScan : 0, tups ? NdbScanOperation::SF_TupScan : 0,
par) != 0) par,
batch) != 0)
{ {
ERR(pCon->getNdbError()); ERR(pCon->getNdbError());
return NDBT_FAILED; return NDBT_FAILED;
...@@ -1185,7 +1189,8 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step) ...@@ -1185,7 +1189,8 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step)
// Define attributes to read // Define attributes to read
bool found_disk = false; bool found_disk = false;
for(int a = 0; a<pTab->getNoOfColumns(); a++){ for(int a = 0; a<pTab->getNoOfColumns(); a++){
if (pTab->getColumn(a)->getStorageType() == NdbDictionary::Column::StorageTypeDisk) if (pTab->getColumn(a)->getStorageType() ==
NdbDictionary::Column::StorageTypeDisk)
{ {
found_disk = true; found_disk = true;
if (!disk) if (!disk)
...@@ -1214,6 +1219,7 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step) ...@@ -1214,6 +1219,7 @@ runScanVariants(NDBT_Context* ctx, NDBT_Step* step)
} }
} }
} }
}
return NDBT_OK; return NDBT_OK;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment