apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r545407 - in /apr/apr-util/trunk/test: Makefile.in abts_tests.h testmemcache.c testutil.h
Date Fri, 08 Jun 2007 04:56:25 GMT
Author: pquerna
Date: Thu Jun  7 21:56:25 2007
New Revision: 545407

URL: http://svn.apache.org/viewvc?view=rev&rev=545407
Log:
Add a set of test cases for apr_memcache.

Note: These are currently if'defed out, since it doesn't make sense to require memcached running
on localhost, just to run the test suite.  It would be nice if there was a more intelegent
way to enable this, or to spawn memcached ourselves.

PR: 42358
Submitted By: Josh Rotenberg <joshrotenberg gmail.com>

Added:
    apr/apr-util/trunk/test/testmemcache.c   (with props)
Modified:
    apr/apr-util/trunk/test/Makefile.in
    apr/apr-util/trunk/test/abts_tests.h
    apr/apr-util/trunk/test/testutil.h

Modified: apr/apr-util/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.in?view=diff&rev=545407&r1=545406&r2=545407
==============================================================================
--- apr/apr-util/trunk/test/Makefile.in (original)
+++ apr/apr-util/trunk/test/Makefile.in Thu Jun  7 21:56:25 2007
@@ -93,7 +93,7 @@
 
 testall_OBJECTS = teststrmatch.lo testuri.lo testuuid.lo abts.lo testutil.lo \
 	testbuckets.lo testpass.lo testmd4.lo testmd5.lo testldap.lo \
-	testdaterfc.lo testdbd.lo
+	testdaterfc.lo testdbd.lo testmemcache.lo
 testall_LDADD =  $(TARGET_LIB_PATH)
 testall: $(testall_OBJECTS) $(testall_LDADD)
 	$(LINK) $(APRUTIL_LDFLAGS) $(testall_OBJECTS) $(testall_LDADD) $(PROGRAM_DEPENDENCIES)

Modified: apr/apr-util/trunk/test/abts_tests.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/abts_tests.h?view=diff&rev=545407&r1=545406&r2=545407
==============================================================================
--- apr/apr-util/trunk/test/abts_tests.h (original)
+++ apr/apr-util/trunk/test/abts_tests.h Thu Jun  7 21:56:25 2007
@@ -32,7 +32,8 @@
     {testmd5},
     {testldap},
     {testdbd},
-    {testdaterfc}
+    {testdaterfc},
+    {testmemcache}
 };
 
 #endif /* APR_TEST_INCLUDES */

Added: apr/apr-util/trunk/test/testmemcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/testmemcache.c?view=auto&rev=545407
==============================================================================
--- apr/apr-util/trunk/test/testmemcache.c (added)
+++ apr/apr-util/trunk/test/testmemcache.c Thu Jun  7 21:56:25 2007
@@ -0,0 +1,455 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "testutil.h"
+#include "apr.h"
+#include "apu.h"
+#include "apr_general.h"
+#include "apr_strings.h"
+#include "apr_hash.h"
+#include "apr_memcache.h"
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>		/* for exit() */
+#endif
+
+#define HOST "localhost"
+#define PORT 11211
+
+/* the total number of items to use for set/get testing */
+#define TDATA_SIZE 3000
+
+/* some smaller subset of TDATA_SIZE */
+#define TDATA_SET 100
+
+/* all keys will be prefixed with this */
+const char prefix[] = "testmemcache";
+
+/* text for values we store */
+const char txt[] =
+"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis at"
+"lacus in ligula hendrerit consectetuer. Vestibulum tristique odio"
+"iaculis leo. In massa arcu, ultricies a, laoreet nec, hendrerit non,"
+"neque. Nulla sagittis sapien ac risus. Morbi ligula dolor, vestibulum"
+"nec, viverra id, placerat dapibus, arcu. Curabitur egestas feugiat"
+"tellus. Donec dignissim. Nunc ante. Curabitur id lorem. In mollis"
+"tortor sit amet eros auctor dapibus. Proin nulla sem, tristique in,"
+"convallis id, iaculis feugiat cras amet.";
+
+/*
+ * general test to make sure we can create the memcache struct and add
+ * some servers, but not more than we tell it we can add
+ */
+
+static void test_memcache_create(abts_case * tc, void *data)
+{
+  apr_pool_t *pool = p;
+  apr_status_t rv;
+  apr_memcache_t *memcache;
+  apr_memcache_server_t *server, *s;
+  int max_servers = 10;
+  int i;
+  apr_uint32_t hash;
+
+  rv = apr_memcache_create(pool, max_servers, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+  
+  for (i = 1; i <= max_servers; i++) {
+    apr_port_t port;
+    
+    port = PORT + i;
+    rv =
+      apr_memcache_server_create(pool, HOST, PORT + i, 0, 1, 1, 60, &server);
+    ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+    
+    rv = apr_memcache_add_server(memcache, server);
+    ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+    
+    s = apr_memcache_find_server(memcache, HOST, port);
+    ABTS_PTR_EQUAL(tc, s, server);
+    
+    rv = apr_memcache_disable_server(memcache, s);
+    ABTS_ASSERT(tc, "server disable failed", rv == APR_SUCCESS);
+    
+    rv = apr_memcache_enable_server(memcache, s);
+    ABTS_ASSERT(tc, "server enable failed", rv == APR_SUCCESS);
+    
+    hash = apr_memcache_hash(prefix, strlen(prefix));
+    ABTS_ASSERT(tc, "hash failed", hash > 0);
+    
+    s = apr_memcache_find_server_hash(memcache, hash);
+    ABTS_PTR_NOTNULL(tc, s);
+  }
+
+  rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+  ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_add_server(memcache, server);
+  ABTS_ASSERT(tc, "server add should have failed", rv != APR_SUCCESS);
+  
+}
+
+/* test non data related commands like stats and version */
+static void test_memcache_meta(abts_case * tc, void *data)
+{
+    apr_pool_t *pool = p;
+    apr_memcache_t *memcache;
+    apr_memcache_server_t *server;
+    apr_memcache_stats_t *stats;
+    char *result;
+    apr_status_t rv;
+
+    rv = apr_memcache_create(pool, 1, 0, &memcache);
+    ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+    ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_add_server(memcache, server);
+    ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_version(server, pool, &result);
+    ABTS_PTR_NOTNULL(tc, result);
+
+    rv = apr_memcache_stats(server, p, &stats);
+    ABTS_PTR_NOTNULL(tc, stats);
+
+    ABTS_STR_NEQUAL(tc, stats->version, result, 5);
+
+    /* 
+     * no way to know exactly what will be in most of these, so
+     * just make sure there is something.
+     */
+    
+    ABTS_ASSERT(tc, "pid", stats->pid >= 0);
+    ABTS_ASSERT(tc, "time", stats->time >= 0);
+    /* ABTS_ASSERT(tc, "pointer_size", stats->pointer_size >= 0); */
+    ABTS_ASSERT(tc, "rusage_user", stats->rusage_user >= 0);
+    ABTS_ASSERT(tc, "rusage_system", stats->rusage_system >= 0);
+
+    ABTS_ASSERT(tc, "curr_items", stats->curr_items >= 0);
+    ABTS_ASSERT(tc, "total_items", stats->total_items >= 0);
+    ABTS_ASSERT(tc, "bytes", stats->bytes >= 0);
+
+    ABTS_ASSERT(tc, "curr_connections", stats->curr_connections >= 0);
+    ABTS_ASSERT(tc, "total_connections", stats->total_connections >= 0);
+    ABTS_ASSERT(tc, "connection_structures", 
+                stats->connection_structures >= 0);
+
+    ABTS_ASSERT(tc, "cmd_get", stats->cmd_get >= 0);
+    ABTS_ASSERT(tc, "cmd_set", stats->cmd_set >= 0);
+    ABTS_ASSERT(tc, "get_hits", stats->get_hits >= 0);
+    ABTS_ASSERT(tc, "get_misses", stats->get_misses >= 0);
+
+    /* ABTS_ASSERT(tc, "evictions", stats->evictions >= 0); */
+
+    ABTS_ASSERT(tc, "bytes_read", stats->bytes_read >= 0);
+    ABTS_ASSERT(tc, "bytes_written", stats->bytes_written >= 0);
+    ABTS_ASSERT(tc, "limit_maxbytes", stats->limit_maxbytes >= 0);
+
+    /* ABTS_ASSERT(tc, "threads", stats->threads >= 0); */
+}
+
+/* test add and replace calls */
+
+static void test_memcache_addreplace(abts_case * tc, void *data)
+{
+ apr_pool_t *pool = p;
+ apr_pool_t *tmppool;
+ apr_status_t rv;
+ apr_memcache_t *memcache;
+ apr_memcache_server_t *server;
+ apr_hash_t *tdata;
+ apr_hash_index_t *hi;
+ char *result;
+ apr_size_t len;
+ int i;
+
+  rv = apr_memcache_create(pool, 1, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+  ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_add_server(memcache, server);
+  ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+  
+  tdata = apr_hash_make(p);
+  create_test_hash(pool, tdata);
+
+  for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+    const void *k;
+    void *v;
+    const char *key;
+
+    apr_hash_this(hi, &k, NULL, &v);
+    key = k;
+
+    /* doesn't exist yet, fail */
+    rv = apr_memcache_replace(memcache, key, v, strlen(v) - 1, 0, 27);
+    ABTS_ASSERT(tc, "replace should have failed", rv != APR_SUCCESS);
+    
+    /* doesn't exist yet, succeed */
+    rv = apr_memcache_add(memcache, key, v, strlen(v), 0, 27);
+    ABTS_ASSERT(tc, "add failed", rv == APR_SUCCESS);
+
+    /* exists now, succeed */
+    rv = apr_memcache_replace(memcache, key, "new", sizeof("new") - 1, 0, 27);
+    ABTS_ASSERT(tc, "replace failed", rv == APR_SUCCESS);
+
+    /* make sure its different */
+    rv = apr_memcache_getp(memcache, pool, key, &result, &len, NULL);
+    ABTS_ASSERT(tc, "get failed", rv == APR_SUCCESS);
+    ABTS_STR_NEQUAL(tc, result, "new", 3);
+
+    /* exists now, fail */
+    rv = apr_memcache_add(memcache, key, v, strlen(v), 0, 27);
+    ABTS_ASSERT(tc, "add should have failed", rv != APR_SUCCESS);
+
+    /* clean up */
+    rv = apr_memcache_delete(memcache, key, 0);
+    ABTS_ASSERT(tc, "delete failed", rv == APR_SUCCESS);
+  }
+}
+
+static void test_memcache_incrdecr(abts_case * tc, void *data)
+{
+ apr_pool_t *pool = p;
+ apr_status_t rv;
+ apr_memcache_t *memcache;
+ apr_memcache_server_t *server;
+ apr_uint32_t new, next = 2;
+ char *result;
+ apr_size_t len;
+ int i;
+
+  rv = apr_memcache_create(pool, 1, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+  ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_add_server(memcache, server);
+  ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+
+  rv = apr_memcache_set(memcache, prefix, "271", sizeof("271") - 1, 0, 27);
+  ABTS_ASSERT(tc, "set failed", rv == APR_SUCCESS);
+  
+  for( i = 1; i <= TDATA_SIZE; i++) {
+    int expect;
+
+    rv = apr_memcache_getp(memcache, pool, prefix, &result, &len, NULL);
+    ABTS_ASSERT(tc, "get failed", rv == APR_SUCCESS);
+
+    expect = i + atoi(result);
+
+    rv = apr_memcache_incr(memcache, prefix, i, &new);
+    ABTS_ASSERT(tc, "incr failed", rv == APR_SUCCESS);
+
+    ABTS_INT_EQUAL(tc, expect, new);
+
+    rv = apr_memcache_decr(memcache, prefix, i, &new);
+    ABTS_ASSERT(tc, "decr failed", rv == APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, atoi(result), new);
+
+  }
+
+  rv = apr_memcache_getp(memcache, pool, prefix, &result, &len, NULL);
+  ABTS_ASSERT(tc, "get failed", rv == APR_SUCCESS);
+
+  ABTS_INT_EQUAL(tc, atoi(result), 271);
+
+  rv = apr_memcache_delete(memcache, prefix, 0);
+  ABTS_ASSERT(tc, "delete failed", rv == APR_SUCCESS);
+}
+
+/* test the multiget functionality */
+
+static void test_memcache_multiget(abts_case * tc, void *data)
+{
+  apr_pool_t *pool = p;
+  apr_pool_t *tmppool;
+  apr_status_t rv;
+  apr_memcache_t *memcache;
+  apr_memcache_server_t *server;
+  apr_hash_t *tdata, *values;
+  apr_hash_index_t *hi;
+  int i;
+
+  rv = apr_memcache_create(pool, 1, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+  ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_add_server(memcache, server);
+  ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+  
+  values = apr_hash_make(p);
+  tdata = apr_hash_make(p);
+  
+  create_test_hash(pool, tdata);
+
+  for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+    const void *k;
+    void *v;
+    const char *key;
+
+    apr_hash_this(hi, &k, NULL, &v);
+    key = k;
+
+    rv = apr_memcache_set(memcache, key, v, strlen(v), 0, 27);
+    ABTS_ASSERT(tc, "set failed", rv == APR_SUCCESS);
+  }
+  
+  rv = apr_pool_create(&tmppool, pool);
+  for (i = 0; i < TDATA_SET; i++)
+    apr_memcache_add_multget_key(pool,
+                                 apr_pstrcat(pool, prefix,
+                                             apr_itoa(pool, i), NULL),
+                                 &values);
+    
+  rv = apr_memcache_multgetp(memcache,
+                             tmppool,
+                             pool,
+                             values);
+  
+  ABTS_ASSERT(tc, "multgetp failed", rv == APR_SUCCESS);
+  ABTS_ASSERT(tc, "multgetp returned too few results",
+              apr_hash_count(values) == TDATA_SET);
+  
+  for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+    const void *k;
+    void *v;
+    const char *key;
+    
+    apr_hash_this(hi, &k, NULL, NULL);
+    key = k;
+
+    rv = apr_memcache_delete(memcache, key, 0);
+    ABTS_ASSERT(tc, "delete failed", rv == APR_SUCCESS);
+  }
+  
+}
+
+/* test setting and getting */
+
+static void test_memcache_setget(abts_case * tc, void *data)
+{
+    apr_pool_t *pool = p;
+    apr_status_t rv;
+    apr_memcache_t *memcache;
+    apr_memcache_server_t *server;
+    apr_hash_t *tdata, *values;
+    apr_hash_index_t *hi;
+    char *result, *k;
+    apr_size_t len;
+    apr_uint16_t flags;
+    int i;
+
+    rv = apr_memcache_create(pool, 1, 0, &memcache);
+    ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+    ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_add_server(memcache, server);
+    ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+
+    tdata = apr_hash_make(pool);
+    values = apr_hash_make(pool);
+
+    create_test_hash(pool, tdata);
+
+    for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+	const void *k;
+	void *v;
+        const char *key;
+
+	apr_hash_this(hi, &k, NULL, &v);
+        key = k;
+
+	rv = apr_memcache_set(memcache, key, v, strlen(v), 0, 27);
+	ABTS_ASSERT(tc, "set failed", rv == APR_SUCCESS);
+	rv = apr_memcache_getp(memcache, pool, key, &result, &len, NULL);
+	ABTS_ASSERT(tc, "get failed", rv == APR_SUCCESS);
+    }
+
+    rv = apr_memcache_getp(memcache, pool, "nothere3423", &result, &len, NULL);
+
+    ABTS_ASSERT(tc, "get should have failed", rv != APR_SUCCESS);
+
+    for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+	const void *k;
+	void *v;
+	const char *key;
+
+	apr_hash_this(hi, &k, NULL, NULL);
+	key = k;
+
+	rv = apr_memcache_delete(memcache, key, 0);
+	ABTS_ASSERT(tc, "delete failed", rv == APR_SUCCESS);
+    }
+}
+
+int create_test_hash(apr_pool_t *p, apr_hash_t *h)
+{
+  apr_status_t rv;
+  int i;
+  
+  for (i = 0; i < TDATA_SIZE; i++) {
+    char *k, *v;
+    
+    k = apr_pstrcat(p, prefix, apr_itoa(p, i), NULL);
+    v = apr_pstrndup(p, txt, randval(strlen(txt)));
+    
+    apr_hash_set(h, k, APR_HASH_KEY_STRING, v);
+  }
+
+  return i;
+}
+
+int firsttime = 0;
+int randval(int high)
+{
+    unsigned int i = 0;
+    double d = 0;
+
+    if (firsttime == 0) {
+	srand((unsigned) (getpid()));
+	firsttime = 1;
+    }
+
+    d = (double) rand() / ((double) RAND_MAX + 1);
+    i = (int) (d * (high - 0 + 1));
+
+    return i > 0 ? i : 1;
+}
+
+abts_suite *testmemcache(abts_suite * suite)
+{
+    suite = ADD_SUITE(suite);
+    /* TODO: Determine if a memcache server is online, before proceding. */
+#if 0
+    abts_run_test(suite, test_memcache_create, NULL);
+    abts_run_test(suite, test_memcache_meta, NULL);
+    abts_run_test(suite, test_memcache_setget, NULL);
+    abts_run_test(suite, test_memcache_multiget, NULL);
+    abts_run_test(suite, test_memcache_addreplace, NULL);
+    abts_run_test(suite, test_memcache_incrdecr, NULL);
+#endif
+    return suite;
+}

Propchange: apr/apr-util/trunk/test/testmemcache.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: apr/apr-util/trunk/test/testutil.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/testutil.h?view=diff&rev=545407&r1=545406&r2=545407
==============================================================================
--- apr/apr-util/trunk/test/testutil.h (original)
+++ apr/apr-util/trunk/test/testutil.h Thu Jun  7 21:56:25 2007
@@ -53,5 +53,6 @@
 abts_suite *testldap(abts_suite *suite);
 abts_suite *testdbd(abts_suite *suite);
 abts_suite *testdaterfc(abts_suite *suite);
+abts_suite *testmemcache(abts_suite *suite);
 
 #endif /* APR_TEST_INCLUDES */



Mime
View raw message