database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

ndb: use Ndb_cluster_connection in test*

Browse Source 
ndb/test/ndbapi/testBlobs.cpp:
  use Ndb_cluster_connection
ndb/test/ndbapi/testOIBasic.cpp:
  use Ndb_cluster_connection
This commit is contained in:
unknown
2004-12-22 15:08:22 +01:00
parent dfaa184df6
commit f20ac5cab0
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ndb/test/ndbapi/testBlobs.cpp
View File

@ -154,6 +154,7 @@ testcase(char x)
(g_opt.m_skip == 0 || strchr(g_opt.m_skip, x) == 0); (g_opt.m_skip == 0 || strchr(g_opt.m_skip, x) == 0);
} }
static Ndb_cluster_connection* g_ncc = 0;
static Ndb* g_ndb = 0; static Ndb* g_ndb = 0;
static NdbDictionary::Dictionary* g_dic = 0; static NdbDictionary::Dictionary* g_dic = 0;
static NdbConnection* g_con = 0; static NdbConnection* g_con = 0;
@ -1259,7 +1260,7 @@ deleteScan(bool idx)
static int static int
testmain() testmain()
{ {
g_ndb = new Ndb("TEST_DB"); g_ndb = new Ndb(g_ncc, "TEST_DB");
CHK(g_ndb->init() == 0); CHK(g_ndb->init() == 0);
CHK(g_ndb->waitUntilReady() == 0); CHK(g_ndb->waitUntilReady() == 0);
g_dic = g_ndb->getDictionary(); g_dic = g_ndb->getDictionary();
@ -1448,7 +1449,7 @@ testperf()
if (! testcase('p')) if (! testcase('p'))
return 0; return 0;
DBG("=== perf test ==="); DBG("=== perf test ===");
g_ndb = new Ndb("TEST_DB"); g_ndb = new Ndb(g_ncc, "TEST_DB");
CHK(g_ndb->init() == 0); CHK(g_ndb->init() == 0);
CHK(g_ndb->waitUntilReady() == 0); CHK(g_ndb->waitUntilReady() == 0);
g_dic = g_ndb->getDictionary(); g_dic = g_ndb->getDictionary();
@ -1860,10 +1861,13 @@ NDB_COMMAND(testOdbcDriver, "testBlobs", "testBlobs", "testBlobs", 65535)
strcat(b, "r"); strcat(b, "r");
g_opt.m_skip = strdup(b); g_opt.m_skip = strdup(b);
} }
if (testmain() == -1 || testperf() == -1) { g_ncc = new Ndb_cluster_connection();
if (g_ncc->connect(30) != 0 || testmain() == -1 || testperf() == -1) {
ndbout << "line " << __LINE__ << " FAIL loop=" << g_loop << endl; ndbout << "line " << __LINE__ << " FAIL loop=" << g_loop << endl;
return NDBT_ProgramExit(NDBT_FAILED); return NDBT_ProgramExit(NDBT_FAILED);
} }
delete g_ncc;
g_ncc = 0;
return NDBT_ProgramExit(NDBT_OK); return NDBT_ProgramExit(NDBT_OK);
} }

11
ndb/test/ndbapi/testOIBasic.cpp
View File

@ -59,7 +59,7 @@ struct Opt {
unsigned m_subloop; unsigned m_subloop;
const char* m_table; const char* m_table;
unsigned m_threads; unsigned m_threads;
unsigned m_v; int m_v;
Opt() : Opt() :
m_batch(32), m_batch(32),
m_bound("01234"), m_bound("01234"),
@ -672,6 +672,8 @@ tabcount = sizeof(tablist) / sizeof(tablist[0]);
// connections // connections
static Ndb_cluster_connection* g_ncc = 0;
struct Con { struct Con {
Ndb* m_ndb; Ndb* m_ndb;
NdbDictionary::Dictionary* m_dic; NdbDictionary::Dictionary* m_dic;
@ -720,7 +722,7 @@ int
Con::connect() Con::connect()
{ {
assert(m_ndb == 0); assert(m_ndb == 0);
m_ndb = new Ndb("TEST_DB"); m_ndb = new Ndb(g_ncc, "TEST_DB");
CHKCON(m_ndb->init() == 0, *this); CHKCON(m_ndb->init() == 0, *this);
CHKCON(m_ndb->waitUntilReady(30) == 0, *this); CHKCON(m_ndb->waitUntilReady(30) == 0, *this);
m_tx = 0, m_op = 0; m_tx = 0, m_op = 0;
@ -3514,8 +3516,11 @@ NDB_COMMAND(testOIBasic, "testOIBasic", "testOIBasic", "testOIBasic", 65535)
} }
{ {
Par par(g_opt); Par par(g_opt);
if (runtest(par) < 0) g_ncc = new Ndb_cluster_connection();
if (g_ncc->connect(30) != 0 || runtest(par) < 0)
goto failed; goto failed;
delete g_ncc;
g_ncc = 0;
} }
// always exit with NDBT code // always exit with NDBT code
ok: ok: