mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
ndb make updates
ndb/src/common/portlib/NdbCondition.c: Rename: ndb/src/common/portlib/unix/NdbCondition.c -> ndb/src/common/portlib/NdbCondition.c ndb/src/common/portlib/NdbDaemon.c: Rename: ndb/src/common/portlib/unix/NdbDaemon.c -> ndb/src/common/portlib/NdbDaemon.c ndb/src/common/portlib/NdbEnv.c: Rename: ndb/src/common/portlib/unix/NdbEnv.c -> ndb/src/common/portlib/NdbEnv.c ndb/src/common/portlib/NdbHost.c: Rename: ndb/src/common/portlib/unix/NdbHost.c -> ndb/src/common/portlib/NdbHost.c ndb/src/common/portlib/NdbMem.c: Rename: ndb/src/common/portlib/unix/NdbMem.c -> ndb/src/common/portlib/NdbMem.c ndb/src/common/portlib/NdbMutex.c: Rename: ndb/src/common/portlib/unix/NdbMutex.c -> ndb/src/common/portlib/NdbMutex.c ndb/src/common/portlib/NdbSleep.c: Rename: ndb/src/common/portlib/unix/NdbSleep.c -> ndb/src/common/portlib/NdbSleep.c ndb/src/common/portlib/NdbTCP.c: Rename: ndb/src/common/portlib/unix/NdbTCP.c -> ndb/src/common/portlib/NdbTCP.c ndb/src/common/portlib/NdbThread.c: Rename: ndb/src/common/portlib/unix/NdbThread.c -> ndb/src/common/portlib/NdbThread.c ndb/src/common/portlib/NdbTick.c: Rename: ndb/src/common/portlib/unix/NdbTick.c -> ndb/src/common/portlib/NdbTick.c BitKeeper/deleted/.del-Makefile.am~4d9c81a4353f3ee8: Delete: ndb/src/common/portlib/unix/Makefile.am ndb/src/common/portlib/old_dirs/unix/Makefile_old: mvdir ndb/src/common/portlib/old_dirs/win32/Makefile: mvdir ndb/src/common/portlib/old_dirs/win32/NdbCondition.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbEnv.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbHost.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbMem.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbMutex.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbSleep.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbTCP.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbThread.c: mvdir ndb/src/common/portlib/old_dirs/win32/NdbTick.c: mvdir ndb/src/common/portlib/old_dirs/ose/Makefile: mvdir ndb/src/common/portlib/old_dirs/ose/NdbCondition.c: mvdir ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h: mvdir ndb/src/common/portlib/old_dirs/ose/NdbEnv.c: mvdir ndb/src/common/portlib/old_dirs/ose/NdbHost.c: mvdir ndb/src/common/portlib/old_dirs/ose/NdbMem.c: mvdir ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp: mvdir ndb/src/common/portlib/old_dirs/ose/NdbMutex.c: mvdir ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp: mvdir ndb/src/common/portlib/old_dirs/ose/NdbSleep.c: mvdir ndb/src/common/portlib/old_dirs/ose/NdbTCP.c: mvdir ndb/src/common/portlib/old_dirs/ose/NdbThread.c: mvdir ndb/src/common/portlib/old_dirs/ose/NdbTick.c: mvdir ndb/src/common/portlib/memtest.c: Rename: ndb/src/common/portlib/memtest/memtest.c -> ndb/src/common/portlib/memtest.c ndb/src/common/portlib/munmaptest.cpp: Rename: ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp -> ndb/src/common/portlib/munmaptest.cpp ndb/src/common/portlib/mmslist.cpp: Rename: ndb/src/common/portlib/mmstest/mmslist.cpp -> ndb/src/common/portlib/mmslist.cpp ndb/src/common/portlib/mmstest.cpp: Rename: ndb/src/common/portlib/mmstest/mmstest.cpp -> ndb/src/common/portlib/mmstest.cpp ndb/src/common/portlib/old_dirs/memtest/Makefile: mvdir ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile: mvdir ndb/src/common/portlib/NdbPortLibTest.cpp: Rename: ndb/src/common/portlib/test/NdbPortLibTest.cpp -> ndb/src/common/portlib/NdbPortLibTest.cpp ndb/src/common/portlib/old_dirs/test/Makefile: mvdir
This commit is contained in:
unknown
@ -23,19 +23,16 @@
|
||||
|
||||
#include <getarg.h>
|
||||
|
||||
#include <UtilTransactions.hpp>
|
||||
static int clear_table(Ndb* pNdb, const NdbDictionary::Table* pTab, int parallelism=240);
|
||||
|
||||
int main(int argc, const char** argv){
|
||||
|
||||
const char* _tabname = NULL;
|
||||
const char* _dbname = "TEST_DB";
|
||||
int _help = 0;
|
||||
int _ver2 = 1;
|
||||
|
||||
struct getargs args[] = {
|
||||
{ "usage", '?', arg_flag, &_help, "Print help", "" },
|
||||
{ "ver2", '2', arg_flag, &_ver2, "Use version 2 of clearTable (default)", "" },
|
||||
{ "ver2", '1', arg_negative_flag, &_ver2, "Use version 1 of clearTable", "" },
|
||||
{ "database", 'd', arg_string, &_dbname, "dbname",
|
||||
"Name of database table is in"}
|
||||
};
|
||||
@ -74,20 +71,111 @@ int main(int argc, const char** argv){
|
||||
}
|
||||
|
||||
ndbout << "Deleting all from " << argv[i] << "...";
|
||||
UtilTransactions utilTrans(*pTab);
|
||||
int tmp = NDBT_OK;
|
||||
if (_ver2 == 0){
|
||||
if(utilTrans.clearTable(&MyNdb) == NDBT_FAILED)
|
||||
tmp = NDBT_FAILED;
|
||||
} else {
|
||||
if(utilTrans.clearTable3(&MyNdb) == NDBT_FAILED)
|
||||
tmp = NDBT_FAILED;
|
||||
}
|
||||
if(tmp == NDBT_FAILED){
|
||||
res = tmp;
|
||||
if(clear_table(&MyNdb, pTab) == NDBT_FAILED){
|
||||
res = NDBT_FAILED;
|
||||
ndbout << "FAILED" << endl;
|
||||
}
|
||||
}
|
||||
return NDBT_ProgramExit(res);
|
||||
}
|
||||
|
||||
|
||||
int clear_table(Ndb* pNdb, const NdbDictionary::Table* pTab, int parallelism)
|
||||
{
|
||||
// Scan all records exclusive and delete
|
||||
// them one by one
|
||||
int retryAttempt = 0;
|
||||
const int retryMax = 10;
|
||||
int deletedRows = 0;
|
||||
int check;
|
||||
NdbConnection *pTrans;
|
||||
NdbScanOperation *pOp;
|
||||
NdbError err;
|
||||
|
||||
int par = parallelism;
|
||||
while (true){
|
||||
restart:
|
||||
if (retryAttempt++ >= retryMax){
|
||||
g_info << "ERROR: has retried this operation " << retryAttempt
|
||||
<< " times, failing!" << endl;
|
||||
return NDBT_FAILED;
|
||||
}
|
||||
|
||||
pTrans = pNdb->startTransaction();
|
||||
if (pTrans == NULL) {
|
||||
err = pNdb->getNdbError();
|
||||
if (err.status == NdbError::TemporaryError){
|
||||
ERR(err);
|
||||
NdbSleep_MilliSleep(50);
|
||||
continue;
|
||||
}
|
||||
goto failed;
|
||||
}
|
||||
|
||||
pOp = pTrans->getNdbScanOperation(pTab->getName());
|
||||
if (pOp == NULL) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
NdbResultSet * rs = pOp->readTuplesExclusive(par);
|
||||
if( rs == 0 ) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if(pTrans->execute(NoCommit) != 0){
|
||||
err = pTrans->getNdbError();
|
||||
if(err.status == NdbError::TemporaryError){
|
||||
ERR(err);
|
||||
pNdb->closeTransaction(pTrans);
|
||||
NdbSleep_MilliSleep(50);
|
||||
continue;
|
||||
}
|
||||
goto failed;
|
||||
}
|
||||
|
||||
while((check = rs->nextResult(true)) == 0){
|
||||
do {
|
||||
if (rs->deleteTuple() != 0){
|
||||
goto failed;
|
||||
}
|
||||
deletedRows++;
|
||||
} while((check = rs->nextResult(false)) == 0);
|
||||
|
||||
if(check != -1){
|
||||
check = pTrans->execute(Commit);
|
||||
pTrans->releaseCompletedOperations();
|
||||
}
|
||||
|
||||
err = pTrans->getNdbError();
|
||||
if(check == -1){
|
||||
if(err.status == NdbError::TemporaryError){
|
||||
ERR(err);
|
||||
pNdb->closeTransaction(pTrans);
|
||||
NdbSleep_MilliSleep(50);
|
||||
par = 1;
|
||||
goto restart;
|
||||
}
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
if(check == -1){
|
||||
err = pTrans->getNdbError();
|
||||
if(err.status == NdbError::TemporaryError){
|
||||
ERR(err);
|
||||
pNdb->closeTransaction(pTrans);
|
||||
NdbSleep_MilliSleep(50);
|
||||
par = 1;
|
||||
goto restart;
|
||||
}
|
||||
goto failed;
|
||||
}
|
||||
pNdb->closeTransaction(pTrans);
|
||||
return NDBT_OK;
|
||||
}
|
||||
return NDBT_FAILED;
|
||||
|
||||
failed:
|
||||
if(pTrans != 0) pNdb->closeTransaction(pTrans);
|
||||
ERR(err);
|
||||
return (err.code != 0 ? err.code : NDBT_FAILED);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user