mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
wl2126 - ndb - fix last unhandled part of read_multi_range
reading sorted multi_range with several range-scans BitKeeper/deleted/.del-NdbResultSet.hpp~e0042f4c18088ff6: Delete: ndb/include/ndbapi/NdbResultSet.hpp BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d: Delete: ndb/src/ndbapi/NdbResultSet.cpp ndb/include/ndbapi/NdbApi.hpp: Remove NdbResultSet ndb/include/ndbapi/NdbIndexScanOperation.hpp: Remove NdbResultSet ndb/include/ndbapi/NdbScanOperation.hpp: Remove NdbResultSet ndb/src/ndbapi/Makefile.am: Remove NdbResultSet ndb/src/ndbapi/NdbConnection.cpp: Remove NdbResultSet ndb/src/ndbapi/NdbIndexOperation.cpp: Remove NdbResultSet ndb/src/ndbapi/NdbScanOperation.cpp: Remove NdbResultSet ndb/test/include/HugoOperations.hpp: Remove NdbResultSet ndb/test/ndbapi/ScanFunctions.hpp: Remove NdbResultSet ndb/test/ndbapi/ScanInterpretTest.hpp: Remove NdbResultSet ndb/test/ndbapi/bank/Bank.cpp: Remove NdbResultSet ndb/test/ndbapi/bank/BankLoad.cpp: Remove NdbResultSet ndb/test/ndbapi/slow_select.cpp: Remove NdbResultSet ndb/test/ndbapi/testBlobs.cpp: Remove NdbResultSet ndb/test/ndbapi/testDataBuffers.cpp: Remove NdbResultSet ndb/test/ndbapi/testDeadlock.cpp: Remove NdbResultSet ndb/test/ndbapi/testIndex.cpp: Remove NdbResultSet ndb/test/ndbapi/testOIBasic.cpp: Remove NdbResultSet ndb/test/ndbapi/testReadPerf.cpp: Remove NdbResultSet ndb/test/ndbapi/testScan.cpp: Remove NdbResultSet ndb/test/ndbapi/testScanPerf.cpp: Remove NdbResultSet ndb/test/src/HugoOperations.cpp: Remove NdbResultSet ndb/test/src/HugoTransactions.cpp: Remove NdbResultSet ndb/test/src/UtilTransactions.cpp: Remove NdbResultSet ndb/tools/delete_all.cpp: Remove NdbResultSet ndb/tools/select_all.cpp: Remove NdbResultSet ndb/tools/select_count.cpp: Remove NdbResultSet sql/ha_ndbcluster.cc: 1) Fix a = 3 -> a= 3 2) Impl. last part of wl2126 ordered "multi ordered scan"
This commit is contained in:
@ -227,10 +227,7 @@ ScanInterpretTest::scanRead(Ndb* pNdb,
|
||||
return NDBT_FAILED;
|
||||
}
|
||||
|
||||
NdbResultSet * rs = pOp->readTuples(NdbScanOperation::LM_Read,
|
||||
0, parallelism);
|
||||
|
||||
if( rs == 0 ) {
|
||||
if( pOp->readTuples(NdbScanOperation::LM_Read, 0, parallelism) ) {
|
||||
ERR(pTrans->getNdbError());
|
||||
pNdb->closeTransaction(pTrans);
|
||||
return NDBT_FAILED;
|
||||
@ -262,14 +259,14 @@ ScanInterpretTest::scanRead(Ndb* pNdb,
|
||||
int rows = 0;
|
||||
NdbConnection* pInsTrans;
|
||||
|
||||
while((eof = rs->nextResult(true)) == 0){
|
||||
while((eof = pOp->nextResult(true)) == 0){
|
||||
do {
|
||||
rows++;
|
||||
if (addRowToInsert(pNdb, pTrans) != 0){
|
||||
pNdb->closeTransaction(pTrans);
|
||||
return NDBT_FAILED;
|
||||
}
|
||||
} while((eof = rs->nextResult(false)) == 0);
|
||||
} while((eof = pOp->nextResult(false)) == 0);
|
||||
|
||||
check = pTrans->execute(Commit);
|
||||
if( check == -1 ) {
|
||||
@ -349,9 +346,7 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
|
||||
return NDBT_FAILED;
|
||||
}
|
||||
|
||||
NdbResultSet * rs = pOp->readTuples(NdbScanOperation::LM_Read,
|
||||
0, parallelism);
|
||||
if( rs == 0 ) {
|
||||
if( pOp->readTuples(NdbScanOperation::LM_Read, 0, parallelism) ) {
|
||||
ERR(pTrans->getNdbError());
|
||||
pNdb->closeTransaction(pTrans);
|
||||
return NDBT_FAILED;
|
||||
@ -392,7 +387,7 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
|
||||
NdbConnection* pExistTrans;
|
||||
NdbConnection* pNoExistTrans;
|
||||
|
||||
while((eof = rs->nextResult(true)) == 0){
|
||||
while((eof = pOp->nextResult(true)) == 0){
|
||||
pExistTrans = pNdb->startTransaction();
|
||||
if (pExistTrans == NULL) {
|
||||
const NdbError err = pNdb->getNdbError();
|
||||
@ -424,7 +419,7 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
|
||||
return NDBT_FAILED;
|
||||
}
|
||||
}
|
||||
} while((eof = rs->nextResult(false)) == 0);
|
||||
} while((eof = pOp->nextResult(false)) == 0);
|
||||
|
||||
|
||||
// Execute the transaction containing reads of
|
||||
|
Reference in New Issue
Block a user