diff options
author | jim <jim@13f79535-47bb-0310-9956-ffa450edef68> | 2016-11-03 21:28:29 +0000 |
---|---|---|
committer | jim <jim@13f79535-47bb-0310-9956-ffa450edef68> | 2016-11-03 21:28:29 +0000 |
commit | 114d763a3c5d6c186c4f8453ec6b5b7029649d1e (patch) | |
tree | 51531317a95f10c9c87d41cc47ff296f6fe33ebf | |
parent | b5e1865e2d46c8bffbdffdb2ac38b6ece902be60 (diff) | |
download | libapr-util-114d763a3c5d6c186c4f8453ec6b5b7029649d1e.tar.gz |
Some tuning
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.6.x@1767979 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | redis/apr_redis.c | 26 | ||||
-rw-r--r-- | test/testredis.c | 12 |
2 files changed, 18 insertions, 20 deletions
diff --git a/redis/apr_redis.c b/redis/apr_redis.c index 94100c68..b58b1842 100644 --- a/redis/apr_redis.c +++ b/redis/apr_redis.c @@ -156,6 +156,17 @@ APU_DECLARE(apr_status_t) apr_redis_add_server(apr_redis_t *rc, static apr_status_t rc_ping(apr_redis_server_t *rs); APU_DECLARE(apr_redis_server_t *) +apr_redis_find_server_hash(apr_redis_t *rc, const apr_uint32_t hash) +{ + if (rc->server_func) { + return rc->server_func(rc->server_baton, rc, hash); + } + else { + return apr_redis_find_server_hash_default(NULL, rc, hash); + } +} + +APU_DECLARE(apr_redis_server_t *) apr_redis_find_server_hash_default(void *baton, apr_redis_t *rc, const apr_uint32_t hash) { @@ -206,17 +217,6 @@ APU_DECLARE(apr_redis_server_t *) return rs; } -APU_DECLARE(apr_redis_server_t *) - apr_redis_find_server_hash(apr_redis_t *rc, const apr_uint32_t hash) -{ - if (rc->server_func) { - return rc->server_func(rc->server_baton, rc, hash); - } - else { - return apr_redis_find_server_hash_default(NULL, rc, hash); - } -} - APU_DECLARE(apr_redis_server_t *) apr_redis_find_server(apr_redis_t *rc, const char *host, apr_port_t port) @@ -994,9 +994,7 @@ APU_DECLARE(apr_status_t) apr_redis_getp(apr_redis_t *rc, rv = grab_bulk_resp(rs, rc, conn, p, baton, new_length); } else { - rs_bad_conn(rs, conn); - apr_redis_disable_server(rc, rs); - return (APR_EGENERAL); + rv = APR_EGENERAL; } rs_release_conn(rs, conn); diff --git a/test/testredis.c b/test/testredis.c index 6bba0b0e..5b36d96a 100644 --- a/test/testredis.c +++ b/test/testredis.c @@ -146,7 +146,7 @@ static void test_redis_create(abts_case * tc, void *data) port = PORT + i; rv = - apr_redis_server_create(pool, HOST, PORT + i, 0, 1, 1, 60, 5, &server); + apr_redis_server_create(pool, HOST, PORT + i, 0, 1, 1, 60, 60, &server); ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS); rv = apr_redis_add_server(redis, server); @@ -168,7 +168,7 @@ static void test_redis_create(abts_case * tc, void *data) ABTS_PTR_NOTNULL(tc, s); } - rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 5, &server); + rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 60, &server); ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS); rv = apr_redis_add_server(redis, server); @@ -222,7 +222,7 @@ static void test_redis_user_funcs(abts_case * tc, void *data) for(i = 1; i <= 10; i++) { apr_redis_server_t *ms; - rv = apr_redis_server_create(pool, HOST, i, 0, 1, 1, 60, 5, &ms); + rv = apr_redis_server_create(pool, HOST, i, 0, 1, 1, 60, 60, &ms); ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS); rv = apr_redis_add_server(redis, ms); @@ -253,7 +253,7 @@ static void test_redis_meta(abts_case * tc, void *data) rv = apr_redis_create(pool, 1, 0, &redis); ABTS_ASSERT(tc, "redis create failed", rv == APR_SUCCESS); - rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 5, &server); + rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 60, &server); ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS); rv = apr_redis_add_server(redis, server); @@ -309,7 +309,7 @@ static void test_redis_incrdecr(abts_case * tc, void *data) rv = apr_redis_create(pool, 1, 0, &redis); ABTS_ASSERT(tc, "redis create failed", rv == APR_SUCCESS); - rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 5, &server); + rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 60, &server); ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS); rv = apr_redis_add_server(redis, server); @@ -364,7 +364,7 @@ static void test_redis_setget(abts_case * tc, void *data) rv = apr_redis_create(pool, 1, 0, &redis); ABTS_ASSERT(tc, "redis create failed", rv == APR_SUCCESS); - rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 5, &server); + rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 60, &server); ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS); rv = apr_redis_add_server(redis, server); |