wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Flow bindings no longer support API versions prior to 500. Remove DB name argument.

This commit is contained in:
A.J. Beamon 2017-05-26 13:59:10 -07:00
parent fc468f682b
commit ca3fdddf03
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/bindingtester/known_testers.py
View File

@ -64,5 +64,5 @@ testers = {
'java_completable' : Tester('java', _java_completable_cmd + 'StackTester', 2040, 500, MAX_API_VERSION),
'java_completable_async' : Tester('java', _java_completable_cmd + 'AsyncStackTester', 2040, 500, MAX_API_VERSION),
'go' : Tester('go', _absolute_path('go/bin/_stacktester'), 63, 200, MAX_API_VERSION),
'flow' : Tester('flow', _absolute_path('flow/bin/fdb_flow_tester'), 63, 200, MAX_API_VERSION),
'flow' : Tester('flow', _absolute_path('flow/bin/fdb_flow_tester'), 63, 500, MAX_API_VERSION),
}

13
bindings/flow/fdb_flow.actor.cpp
View File

@ -33,9 +33,9 @@ THREAD_FUNC networkThread(void* fdb) {
}
ACTOR Future<Void> _test() {
API *fdb = FDB::API::selectAPIVersion(400);
API *fdb = FDB::API::selectAPIVersion(500);
auto c = fdb->createCluster( std::string() );
auto db = c->createDatabase( LiteralStringRef("DB") );
auto db = c->createDatabase();
state Reference<Transaction> tr( new Transaction(db) );
// tr->setVersion(1);
@ -77,7 +77,7 @@ ACTOR Future<Void> _test() {
}
void fdb_flow_test() {
API *fdb = FDB::API::selectAPIVersion(400);
API *fdb = FDB::API::selectAPIVersion(500);
fdb->setupNetwork();
startThread(networkThread, fdb);
@ -144,7 +144,7 @@ namespace FDB {
throw api_version_already_set();
}
if(apiVersion < 200 || apiVersion > FDB_API_VERSION) {
if(apiVersion < 500 || apiVersion > FDB_API_VERSION) {
throw api_version_not_supported();
}
@ -183,8 +183,9 @@ namespace FDB {
return Reference<Cluster>( new Cluster(c) );
}
Reference<DatabaseContext> Cluster::createDatabase( Standalone<StringRef> dbName ) {
CFuture f( fdb_cluster_create_database( c, dbName.begin(), dbName.size() ) );
Reference<DatabaseContext> Cluster::createDatabase() {
const char *dbName = "DB";
CFuture f( fdb_cluster_create_database( c, (uint8_t*)dbName, (int)strlen(dbName) ) );
f.blockUntilReady();
FDBDatabase* db;

2
bindings/flow/fdb_flow.h
View File

@ -52,7 +52,7 @@ namespace FDB {
fdb_cluster_destroy( c );
}
Reference<DatabaseContext> createDatabase( Standalone<StringRef> dbName );
Reference<DatabaseContext> createDatabase();
private:
explicit Cluster( FDBCluster* c ) : c(c) {}

6
bindings/flow/tester/Tester.actor.cpp
View File

@ -1661,7 +1661,7 @@ ACTOR void startTest(std::string clusterFilename, StringRef prefix, int apiVersi
// Connect to the default cluster/database, and create a transaction
auto cluster = fdb->createCluster(clusterFilename);
Reference<DatabaseContext> db = cluster->createDatabase(LiteralStringRef("DB"));
Reference<DatabaseContext> db = cluster->createDatabase();
Reference<FlowTesterData> data = Reference<FlowTesterData>(new FlowTesterData(fdb));
Void _ = wait(runTest(data, db, prefix));
@ -1685,13 +1685,13 @@ ACTOR void _test_versionstamp() {
try {
g_network = newNet2(NetworkAddress(), false);
API *fdb = FDB::API::selectAPIVersion(410);
API *fdb = FDB::API::selectAPIVersion(500);
fdb->setupNetwork();
startThread(networkThread, fdb);
auto c = fdb->createCluster(std::string());
auto db = c->createDatabase(LiteralStringRef("DB"));
auto db = c->createDatabase();
state Reference<Transaction> tr(new Transaction(db));
state Future<FDBStandalone<StringRef>> ftrVersion = tr->getVersionstamp();