Merge perch.ndb.mysql.com:/home/jonas/src/41-work (a503f2c7) · Commits · Software / OSDI20 Artifacts / mariadb

ndb/test/ndbapi/testDataBuffers.cpp

+19 −7

Original line number	Diff line number	Diff line
		@@ -254,12 +254,6 @@ testcase(Ndb_cluster_connection&cc, int flag)
		ndbout << "tab=" << tab << " cols=" << attrcnt
		<< " size max=" << smax << " tot=" << stot << endl;

		ndb = new Ndb(&cc, "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(Ndb_cluster_connection&cc, int flag)
		return ndberror("key %d not found", k);
		ndbout << "scanned " << key << endl;

		ndb = 0;
		ndbout << "done" << endl;
		return 0;
		}
		@@ -605,6 +598,7 @@ NDB_COMMAND(testDataBuffers, "testDataBuffers", "testDataBuffers", "testDataBuff
		return NDBT_ProgramExit(NDBT_WRONGARGS);
		}
		}

		unsigned ok = true;

		Ndb_cluster_connection con;
		@@ -613,6 +607,20 @@ NDB_COMMAND(testDataBuffers, "testDataBuffers", "testDataBuffers", "testDataBuff
		return NDBT_ProgramExit(NDBT_FAILED);
		}

		ndb = new Ndb(&con, "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++) {
		@@ -621,9 +629,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);
		}