wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-24 13:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor state database (#22)

Browse Source 
* make db_connect return the connection

* rename db_conn -> db_handle

* more renaming

* clang-format

* free the db_handle
This commit is contained in:
Philipp Moritz
2016-09-25 21:52:06 -07:00
committed by Robert Nishihara
parent 1e08629013
commit db8c0acc71
9 changed files with 67 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/db_tests.c
+15 -18
View File
@@ -45,20 +45,18 @@ int64_t timeout_handler(event_loop *loop, int64_t id, void *context) {
TEST object_table_lookup_test(void) {
event_loop *loop = event_loop_create();
db_conn conn1;
db_connect("127.0.0.1", 6379, "plasma_manager", manager_addr, manager_port1,
&conn1);
db_conn conn2;
db_connect("127.0.0.1", 6379, "plasma_manager", manager_addr, manager_port2,
&conn2);
db_attach(&conn1, loop);
db_attach(&conn2, loop);
db_handle *db1 = db_connect("127.0.0.1", 6379, "plasma_manager", manager_addr,
manager_port1);
db_handle *db2 = db_connect("127.0.0.1", 6379, "plasma_manager", manager_addr,
manager_port2);
db_attach(db1, loop);
db_attach(db2, loop);
unique_id id = globally_unique_id();
object_table_add(&conn1, id);
object_table_add(&conn2, id);
object_table_add(db1, id);
object_table_add(db2, id);
event_loop_add_timer(loop, 100, timeout_handler, NULL);
event_loop_run(loop);
object_table_lookup(&conn1, id, test_callback);
object_table_lookup(db1, id, test_callback);
event_loop_add_timer(loop, 100, timeout_handler, NULL);
event_loop_run(loop);
int port1 = atoi(received_port1);
@@ -67,8 +65,8 @@ TEST object_table_lookup_test(void) {
ASSERT((port1 == manager_port1 && port2 == manager_port2) ||
(port2 == manager_port1 && port1 == manager_port2));
db_disconnect(&conn1);
db_disconnect(&conn2);
db_disconnect(db1);
db_disconnect(db2);
event_loop_destroy(loop);
PASS();
@@ -76,17 +74,16 @@ TEST object_table_lookup_test(void) {
TEST task_queue_test(void) {
event_loop *loop = event_loop_create();
db_conn conn;
db_connect("127.0.0.1", 6379, "local_scheduler", "", -1, &conn);
db_attach(&conn, loop);
db_handle *db = db_connect("127.0.0.1", 6379, "local_scheduler", "", -1);
db_attach(db, loop);
task_spec *task = example_task();
task_queue_submit_task(&conn, globally_unique_id(), task);
task_queue_submit_task(db, globally_unique_id(), task);
event_loop_add_timer(loop, 100, timeout_handler, NULL);
event_loop_run(loop);
free_task_spec(task);
db_disconnect(&conn);
db_disconnect(db);
event_loop_destroy(loop);
PASS();
}
test/redis_tests.c
+14 -16
View File
@@ -68,10 +68,10 @@ TEST redis_socket_test(void) {
}
void redis_read_callback(event_loop *loop, int fd, void *context, int events) {
db_conn *conn = context;
db_handle *db = context;
char *cmd = read_string(fd);
redisAsyncCommand(conn->context, async_redis_socket_test_callback, NULL, cmd,
conn->client_id, 0);
redisAsyncCommand(db->context, async_redis_socket_test_callback, NULL, cmd,
db->client_id, 0);
free(cmd);
}
@@ -102,9 +102,8 @@ TEST async_redis_socket_test(void) {
utarray_push_back(connections, &socket_fd);
/* Start connection to Redis. */
db_conn conn;
db_connect("127.0.0.1", 6379, "", "", 0, &conn);
db_attach(&conn, loop);
db_handle *db = db_connect("127.0.0.1", 6379, "", "", 0);
db_attach(db, loop);
/* Send a command to the Redis process. */
int client_fd = connect_ipc_sock(socket_pathname);
@@ -113,15 +112,15 @@ TEST async_redis_socket_test(void) {
write_formatted_string(client_fd, test_set_format, test_key, test_value);
event_loop_add_file(loop, client_fd, EVENT_LOOP_READ, redis_read_callback,
&conn);
db);
event_loop_add_file(loop, socket_fd, EVENT_LOOP_READ, redis_accept_callback,
&conn);
db);
event_loop_add_timer(loop, 100, timeout_handler, NULL);
event_loop_run(loop);
CHECK(async_redis_socket_test_callback_called);
db_disconnect(&conn);
db_disconnect(db);
event_loop_destroy(loop);
for (int *p = (int *) utarray_front(connections); p != NULL;
p = (int *) utarray_next(connections, p)) {
@@ -148,7 +147,7 @@ void logging_read_callback(event_loop *loop,
int fd,
void *context,
int events) {
db_conn *conn = context;
db_handle *conn = context;
char *cmd = read_string(fd);
redisAsyncCommand(conn->context, logging_test_callback, NULL, cmd,
conn->client_id, 0);
@@ -177,9 +176,8 @@ TEST logging_test(void) {
utarray_push_back(connections, &socket_fd);
/* Start connection to Redis. */
db_conn conn;
db_connect("127.0.0.1", 6379, "", "", 0, &conn);
db_attach(&conn, loop);
db_handle *conn = db_connect("127.0.0.1", 6379, "", "", 0);
db_attach(conn, loop);
/* Send a command to the Redis process. */
int client_fd = connect_ipc_sock(socket_pathname);
@@ -189,16 +187,16 @@ TEST logging_test(void) {
ray_log(logger, RAY_INFO, "TEST", "Message");
event_loop_add_file(loop, socket_fd, EVENT_LOOP_READ, logging_accept_callback,
&conn);
conn);
event_loop_add_file(loop, client_fd, EVENT_LOOP_READ, logging_read_callback,
&conn);
conn);
event_loop_add_timer(loop, 100, timeout_handler, NULL);
event_loop_run(loop);
CHECK(logging_test_callback_called);
free_ray_logger(logger);
db_disconnect(&conn);
db_disconnect(conn);
event_loop_destroy(loop);
for (int *p = (int *) utarray_front(connections); p != NULL;
p = (int *) utarray_next(connections, p)) {