Skip to content

Add user input ramcloud locator and database name for test cases #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HarryWei wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add user input ramcloud locator and database name for test cases #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
458f71c
Check not null before free memory
HarryWei Apr 24, 2015
21e6234
fix previous pull's incorrect include header path
HarryWei Apr 24, 2015
1d1e5c9
Add user input ramcloud locator and database name for test cases
HarryWei Apr 24, 2015
8452a0f
Check not malloc successfully and close opened file before return
HarryWei Apr 26, 2015
fc6d17b
Keep the right header file include path with master branch
HarryWei Apr 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@
int main(int argc, char **argv) {
int retval;

char *dbname = "./my-db";
if (argc > 1)
dbname = argv[1];
if (argc < 3) {
printf("usage: %s <ramcloud locator> <db name>\n", argv[0]);
return 1;
}

char *locator = argv[1];
char *dbname = argv[2];
//sqlite3_vfs *vfs = sqlite3_vfs_find("unix");
//assert(vfs != NULL);
//retval = sqlite3_vfs_register(vfs, 1);
SQLITE_RCVFS_CONNECTION *conn =
sqlite3_rcvfs_connect("zk:localhost:2181", "main", "sqlite3");
sqlite3_rcvfs_connect(locator, "main", "sqlite3");
assert(conn != NULL);
retval = sqlite3_vfs_register(sqlite3_rcvfs("ramcloud", conn), 1);
assert(retval == 0);
Expand Down
11 changes: 7 additions & 4 deletions test2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,18 @@ static void *mainThread(void *data) {
int main(int argc, char **argv) {
int retval;

dbname = "./my-db";
if (argc > 1)
dbname = argv[1];
if (argc < 3) {
printf("usage: %s <ramcloud locator> <db name>\n", argv[0]);
return 1;
}

char *locator = argv[1];
dbname = argv[2];
//sqlite3_vfs *vfs = sqlite3_vfs_find("unix");
//assert(vfs != NULL);
//retval = sqlite3_vfs_register(vfs, 1);
SQLITE_RCVFS_CONNECTION *conn =
sqlite3_rcvfs_connect("zk:localhost:2181", "main", "sqlite3");
sqlite3_rcvfs_connect(locator, "main", "sqlite3");
assert(conn != NULL);
retval = sqlite3_vfs_register(sqlite3_rcvfs("ramcloud", conn), 1);
assert(retval == 0);
Expand Down
11 changes: 7 additions & 4 deletions test3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@
int main(int argc, char **argv) {
int retval;

char *dbname = "./my-db";
if (argc > 1)
dbname = argv[1];
if (argc < 3) {
printf("usage: %s <ramcloud locator> <db name>\n", argv[0]);
return 1;
}

char *locator = argv[1];
char *dbname = argv[2];
//sqlite3_vfs *vfs = sqlite3_vfs_find("unix");
//assert(vfs != NULL);
//retval = sqlite3_vfs_register(vfs, 1);
SQLITE_RCVFS_CONNECTION *conn =
sqlite3_rcvfs_connect("zk:localhost:2181", "main", "sqlite3");
sqlite3_rcvfs_connect(locator, "main", "sqlite3");
assert(conn != NULL);
retval = sqlite3_vfs_register(sqlite3_rcvfs("ramcloud", conn), 1);
assert(retval == 0);
Expand Down
20 changes: 16 additions & 4 deletions vfs-ramcloud.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,12 @@ void sqlite3_rcvfs_disconnect(SQLITE_RCVFS_CONNECTION *conn) {
sqlite3_rcvfs_tls_destructor((void *)rcs);
}
pthread_key_delete(conn->tls);
sqlite3_free(conn->locator);
sqlite3_free(conn->cluster_name);
sqlite3_free(conn->table_name);
sqlite3_free(conn);
if (conn) {
if (conn->locator) sqlite3_free(conn->locator);
if (conn->cluster_name) sqlite3_free(conn->cluster_name);
if (conn->table_name) sqlite3_free(conn->table_name);
sqlite3_free(conn);
}
}


Expand Down Expand Up @@ -1422,6 +1424,10 @@ int sqlite3_rcvfs_upload(SQLITE_RCVFS_CONNECTION *conn, const char *path) {
f.permanentSize = f.handle.size;
f.blockBuffer = (SQLITE_RCVFS_WBUFFER *)
sqlite3_malloc(sizeof(SQLITE_RCVFS_WBUFFER));
if (!f.blockBuffer) {
fclose(fsrc);
return SQLITE_NOMEM;
}
f.blockBuffer->gauge = 0;
unsigned i;
for (i = 0; i < SQLITE_RCVFS_WBUF_NBLOCKS; ++i)
Expand All @@ -1436,12 +1442,14 @@ int sqlite3_rcvfs_upload(SQLITE_RCVFS_CONNECTION *conn, const char *path) {
retval = rcBufferedWrite(rcs, &f, buf, nbytes, iOfst);
if (retval != SQLITE_OK) {
rcClose((struct sqlite3_file *)&f);
fclose(fsrc);
return retval;
}
iOfst += nbytes;
} while (1);
retval = rcSync((struct sqlite3_file *)&f, 0);
rcClose((struct sqlite3_file *)&f);
fclose(fsrc);
return retval;
}

Expand Down Expand Up @@ -1481,6 +1489,10 @@ int sqlite3_rcvfs_download(SQLITE_RCVFS_CONNECTION *conn, const char *path) {
f.permanentSize = f.handle.size;
f.blockBuffer = (SQLITE_RCVFS_WBUFFER *)
sqlite3_malloc(sizeof(SQLITE_RCVFS_WBUFFER));
if (!f.blockBuffer) {
fclose(fdst);
return SQLITE_NOMEM;
}
f.blockBuffer->gauge = 0;
unsigned i;
for (i = 0; i < SQLITE_RCVFS_WBUF_NBLOCKS; ++i)
Expand Down