Commit 522bbb83 authored by unknown's avatar unknown
Browse files

ndb - Make testDatabuffer clean up tables 


ndb/test/ndbapi/testDataBuffers.cpp:
  Make testDatabuffer clean up tables
parent 887d498b

ndb/test/ndbapi/testDataBuffers.cpp

+20 −7
Original line number Diff line number Diff line
@@ -254,12 +254,6 @@ testcase(int flag) 
    ndbout << "tab=" << tab << " cols=" << attrcnt

	<< " size max=" << smax << " tot=" << stot << endl;



    ndb = new Ndb("TEST_DB");

    if (ndb->init() != 0)

	return ndberror("init");

    if (ndb->waitUntilReady(30) < 0)

	return ndberror("waitUntilReady");



    if ((tcon = NdbSchemaCon::startSchemaTrans(ndb)) == 0)

	return ndberror("startSchemaTransaction");

    if ((top = tcon->getNdbSchemaOp()) == 0)
@@ -541,7 +535,6 @@ testcase(int flag) 
	    return ndberror("key %d not found", k);

    ndbout << "scanned " << key << endl;



    ndb = 0;

    ndbout << "done" << endl;

    return 0;

}
@@ -605,7 +598,23 @@ NDB_COMMAND(testDataBuffers, "testDataBuffers", "testDataBuffers", "testDataBuff 
	    return NDBT_ProgramExit(NDBT_WRONGARGS);

	}

    }



    unsigned ok = true;



    ndb = new Ndb("TEST_DB");

    if (ndb->init() != 0)

    {

	ndberror("init");

	ok = false;

	goto out;

    }

    if (ndb->waitUntilReady(30) < 0)

    {

      ndberror("waitUntilReady");

      ok = false;

      goto out;

    }

    

    for (i = 1; 0 == loopcnt || i <= loopcnt; i++) {

	ndbout << "=== loop " << i << " ===" << endl;

	for (int flag = 0; flag < (1<<testbits); flag++) {
@@ -614,9 +623,13 @@ NDB_COMMAND(testDataBuffers, "testDataBuffers", "testDataBuffers", "testDataBuff 
		if (! kontinue)

		    goto out;

	    }

	    NdbDictionary::Dictionary * dict = ndb->getDictionary();

	    dict->dropTable(tab);

	}

    }

    

out:

    delete ndb;

    return NDBT_ProgramExit(ok ? NDBT_OK : NDBT_FAILED);

}