From 67eff35d781e37b650311e421d9d64212adf26b5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 27 May 2004 21:54:35 +0200 Subject: [PATCH] Fix bank ndb/test/ndbapi/Makefile.am: Removed flexScan (-noscan) ndb/test/ndbapi/bank/Bank.cpp: Fixed no scan api ndb/test/ndbapi/bank/BankLoad.cpp: Fixed no scan api ndb/test/ndbapi/testBackup.cpp: Reenable bank ndb/test/ndbapi/testGrep.cpp: Reenable bank --- ndb/test/ndbapi/Makefile.am | 2 - ndb/test/ndbapi/bank/Bank.cpp | 102 +++++++++++++++--------------- ndb/test/ndbapi/bank/BankLoad.cpp | 12 ++-- ndb/test/ndbapi/testBackup.cpp | 5 -- ndb/test/ndbapi/testGrep.cpp | 8 +-- 5 files changed, 58 insertions(+), 71 deletions(-) diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am index f583823c87f..c79a613f32b 100644 --- a/ndb/test/ndbapi/Makefile.am +++ b/ndb/test/ndbapi/Makefile.am @@ -9,7 +9,6 @@ create_tab \ flexAsynch \ flexBench \ flexHammer \ -flexScan \ flexTT \ testBackup \ testBasic \ @@ -40,7 +39,6 @@ drop_all_tabs_SOURCES = drop_all_tabs.cpp flexAsynch_SOURCES = flexAsynch.cpp flexBench_SOURCES = flexBench.cpp flexHammer_SOURCES = flexHammer.cpp -flexScan_SOURCES = flexScan.cpp flexTT_SOURCES = flexTT.cpp #flexTimedAsynch_SOURCES = flexTimedAsynch.cpp #flex_bench_mysql_SOURCES = flex_bench_mysql.cpp diff --git a/ndb/test/ndbapi/bank/Bank.cpp b/ndb/test/ndbapi/bank/Bank.cpp index 14883205693..7a2c5b057a1 100644 --- a/ndb/test/ndbapi/bank/Bank.cpp +++ b/ndb/test/ndbapi/bank/Bank.cpp @@ -670,15 +670,15 @@ int Bank::findLastGL(Uint64 &lastTime){ return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("GL"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("GL"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanRead(64); - if( check == -1 ) { + NdbResultSet * rs = pOp->readTuples(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -698,7 +698,7 @@ int Bank::findLastGL(Uint64 &lastTime){ return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -707,7 +707,7 @@ int Bank::findLastGL(Uint64 &lastTime){ int eof; int rows = 0; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); lastTime = 0; while(eof == 0){ @@ -717,7 +717,7 @@ int Bank::findLastGL(Uint64 &lastTime){ if (t > lastTime) lastTime = t; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); } if (eof == -1) { ERR(pScanTrans->getNdbError()); @@ -1002,15 +1002,15 @@ int Bank::sumTransactionsForGL(const Uint64 glTime, return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("TRANSACTION"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("TRANSACTION"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanExclusive(64); - if( check == -1 ) { + NdbResultSet * rs = pOp->readTuplesExclusive(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -1051,7 +1051,7 @@ int Bank::sumTransactionsForGL(const Uint64 glTime, return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -1061,7 +1061,7 @@ int Bank::sumTransactionsForGL(const Uint64 glTime, int eof; int rows = 0; int rowsFound = 0; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); while(eof == 0){ rows++; @@ -1085,7 +1085,7 @@ int Bank::sumTransactionsForGL(const Uint64 glTime, } } - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); if ((rows % 100) == 0){ // "refresh" ownner transaction every 100th row @@ -1162,15 +1162,15 @@ int Bank::performValidateGL(Uint64 glTime){ return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("GL"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("GL"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanRead(64); - if( check == -1 ) { + NdbResultSet * rs = pOp->readTuples(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -1238,7 +1238,7 @@ int Bank::performValidateGL(Uint64 glTime){ return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -1249,7 +1249,7 @@ int Bank::performValidateGL(Uint64 glTime){ int rows = 0; int countGlRecords = 0; int result = NDBT_OK; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); while(eof == 0){ rows++; @@ -1336,7 +1336,7 @@ int Bank::performValidateGL(Uint64 glTime){ } } - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); } if (eof == -1) { ERR(pScanTrans->getNdbError()); @@ -1426,15 +1426,15 @@ int Bank::getOldestPurgedGL(const Uint32 accountType, return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("GL"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("GL"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanRead(64); - if( check == -1 ) { + NdbResultSet * rs = pOp->readTuples(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -1468,7 +1468,7 @@ int Bank::getOldestPurgedGL(const Uint32 accountType, return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -1477,7 +1477,7 @@ int Bank::getOldestPurgedGL(const Uint32 accountType, int eof; int rows = 0; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); oldest = 0; while(eof == 0){ @@ -1491,7 +1491,7 @@ int Bank::getOldestPurgedGL(const Uint32 accountType, if (t > oldest) oldest = t; } - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); } if (eof == -1) { ERR(pScanTrans->getNdbError()); @@ -1518,15 +1518,15 @@ int Bank::getOldestNotPurgedGL(Uint64 &oldest, return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("GL"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("GL"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanRead(64); - if( check == -1 ) { + NdbResultSet * rs = pOp->readTuples(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -1560,7 +1560,7 @@ int Bank::getOldestNotPurgedGL(Uint64 &oldest, return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -1569,7 +1569,7 @@ int Bank::getOldestNotPurgedGL(Uint64 &oldest, int eof; int rows = 0; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); oldest = (Uint64)-1; found = false; @@ -1586,7 +1586,7 @@ int Bank::getOldestNotPurgedGL(Uint64 &oldest, accountTypeId = a; } } - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); } if (eof == -1) { ERR(pScanTrans->getNdbError()); @@ -1615,15 +1615,15 @@ int Bank::checkNoTransactionsOlderThan(const Uint32 accountType, return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("TRANSACTION"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("TRANSACTION"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanRead(64); - if( check == -1 ) { + NdbResultSet * rs = pOp->readTuples(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -1657,7 +1657,7 @@ int Bank::checkNoTransactionsOlderThan(const Uint32 accountType, return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -1667,7 +1667,7 @@ int Bank::checkNoTransactionsOlderThan(const Uint32 accountType, int eof; int rows = 0; int found = 0; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); while(eof == 0){ rows++; @@ -1683,7 +1683,7 @@ int Bank::checkNoTransactionsOlderThan(const Uint32 accountType, << " ti = " << ti << endl; found++; } - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); } if (eof == -1) { ERR(pScanTrans->getNdbError()); @@ -1859,15 +1859,15 @@ int Bank::findTransactionsToPurge(const Uint64 glTime, return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("TRANSACTION"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("TRANSACTION"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanExclusive(64); - if( check == -1 ) { + NdbResultSet * rs = pOp->readTuplesExclusive(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -1894,7 +1894,7 @@ int Bank::findTransactionsToPurge(const Uint64 glTime, return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -1904,7 +1904,7 @@ int Bank::findTransactionsToPurge(const Uint64 glTime, int eof; int rows = 0; int rowsFound = 0; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); while(eof == 0){ rows++; @@ -1914,8 +1914,8 @@ int Bank::findTransactionsToPurge(const Uint64 glTime, if (a == accountType && t == glTime){ rowsFound++; // One record found - NdbOperation* pDelOp = pOp->takeOverForDelete(pTrans); - if (pDelOp == NULL){ + check = rs->deleteTuple(pTrans); + if (check == -1){ ERR(m_ndb.getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -1929,7 +1929,7 @@ int Bank::findTransactionsToPurge(const Uint64 glTime, return NDBT_FAILED; } } - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); } if (eof == -1) { ERR(pScanTrans->getNdbError()); @@ -2348,15 +2348,15 @@ int Bank::getSumAccounts(Uint32 &sumAccounts, return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("ACCOUNT"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("ACCOUNT"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanExclusive(64); - if( check == -1 ) { + NdbResultSet * rs = pOp->readTuplesExclusive(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -2376,7 +2376,7 @@ int Bank::getSumAccounts(Uint32 &sumAccounts, return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -2391,7 +2391,7 @@ int Bank::getSumAccounts(Uint32 &sumAccounts, } int eof; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); while(eof == 0){ Uint32 b = balanceRec->u_32_value(); @@ -2403,7 +2403,7 @@ int Bank::getSumAccounts(Uint32 &sumAccounts, // << ", sum="<< sumAccounts << endl; // Take over the operation so that the lock is kept in db - NdbOperation* pLockOp = pOp->takeOverForUpdate(pTrans); + NdbOperation* pLockOp = rs->updateTuple(pTrans); if (pLockOp == NULL){ ERR(m_ndb.getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -2429,7 +2429,7 @@ int Bank::getSumAccounts(Uint32 &sumAccounts, return NDBT_FAILED; } - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); } if (eof == -1) { ERR(pScanTrans->getNdbError()); diff --git a/ndb/test/ndbapi/bank/BankLoad.cpp b/ndb/test/ndbapi/bank/BankLoad.cpp index 76261b664a6..bbaac27735b 100644 --- a/ndb/test/ndbapi/bank/BankLoad.cpp +++ b/ndb/test/ndbapi/bank/BankLoad.cpp @@ -335,15 +335,15 @@ int Bank::getBalanceForAccountType(const Uint32 accountType, return NDBT_FAILED; } - NdbOperation* pOp = pScanTrans->getNdbOperation("ACCOUNT"); + NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("ACCOUNT"); if (pOp == NULL) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; } - check = pOp->openScanRead(64); - if( check == -1 ) { + NdbResultSet* rs = pOp->readTuples(); + if( rs == 0 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); return NDBT_FAILED; @@ -370,7 +370,7 @@ int Bank::getBalanceForAccountType(const Uint32 accountType, return NDBT_FAILED; } - check = pScanTrans->executeScan(); + check = pScanTrans->execute(NoCommit); if( check == -1 ) { ERR(pScanTrans->getNdbError()); m_ndb.closeTransaction(pScanTrans); @@ -379,7 +379,7 @@ int Bank::getBalanceForAccountType(const Uint32 accountType, int eof; int rows = 0; - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); while(eof == 0){ rows++; @@ -391,7 +391,7 @@ int Bank::getBalanceForAccountType(const Uint32 accountType, balance += b; } - eof = pScanTrans->nextScanResult(); + eof = rs->nextResult(); } if (eof == -1) { ERR(pScanTrans->getNdbError()); diff --git a/ndb/test/ndbapi/testBackup.cpp b/ndb/test/ndbapi/testBackup.cpp index 6641045942c..07355de2623 100644 --- a/ndb/test/ndbapi/testBackup.cpp +++ b/ndb/test/ndbapi/testBackup.cpp @@ -205,8 +205,6 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){ return NDBT_OK; } -#if 0 - #include "bank/Bank.hpp" int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){ @@ -395,7 +393,6 @@ int runRestoreBankAndVerify(NDBT_Context* ctx, NDBT_Step* step){ return result; } -#endif NDBT_TESTSUITE(testBackup); TESTCASE("BackupOne", @@ -413,7 +410,6 @@ TESTCASE("BackupOne", FINALIZER(runClearTable); } -#if 0 TESTCASE("BackupBank", "Test that backup and restore works during transaction load\n" " by backing up the bank" @@ -433,7 +429,6 @@ TESTCASE("BackupBank", VERIFIER(runRestoreBankAndVerify); // FINALIZER(runDropBank); } -#endif TESTCASE("NFMaster", "Test that backup behaves during node failiure\n"){ INITIALIZER(setMaster); diff --git a/ndb/test/ndbapi/testGrep.cpp b/ndb/test/ndbapi/testGrep.cpp index b8966d15c5e..0bf84cb4ec8 100644 --- a/ndb/test/ndbapi/testGrep.cpp +++ b/ndb/test/ndbapi/testGrep.cpp @@ -254,9 +254,7 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){ return NDBT_OK; } -#if 0 - -#include "../bank/Bank.hpp" +#include "bank/Bank.hpp" int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){ Bank bank; @@ -445,7 +443,6 @@ int runRestoreBankAndVerify(NDBT_Context* ctx, NDBT_Step* step){ return result; } */ -#endif NDBT_TESTSUITE(testGrep); TESTCASE("GrepBasic", @@ -476,8 +473,6 @@ TESTCASE("GrepNodeRestart", } -#if 0 - TESTCASE("GrepBank", "Test that grep and restore works during transaction load\n" " by backing up the bank" @@ -498,7 +493,6 @@ TESTCASE("GrepBank", // FINALIZER(runDropBank); } -#endif TESTCASE("NFMaster", "Test that grep behaves during node failiure\n"){