X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fdump.cc;h=ee6100fe0bd99c73bff4fde681acd10fbdd199ad;hb=25efe3485198149616820ab4e52d2f18f0abe5a7;hp=44391eff06034f9cdbaaa435f0c1224ee8c42b1f;hpb=d360b4e7edb133db3dc9750538e4de6b1c5cdcf7;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/dump.cc b/tests/libmemcached-1.0/dump.cc
index 44391eff..ee6100fe 100644
--- a/tests/libmemcached-1.0/dump.cc
+++ b/tests/libmemcached-1.0/dump.cc
@@ -35,6 +35,10 @@
  */
 
 #include <config.h>
+
+#include <cstdlib>
+#include <climits>
+
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
@@ -45,17 +49,42 @@ using namespace libtest;
 #include "tests/libmemcached-1.0/dump.h"
 
 static memcached_return_t callback_dump_counter(const memcached_st *,
-                                                const char *,
-                                                size_t ,
+                                                const char*, // key,
+                                                size_t, // length,
                                                 void *context)
 {
   size_t *counter= (size_t *)context;
 
+#if 0
+  std::cerr.write(key, length);
+  std::cerr << std::endl;
+#endif
+
   *counter= *counter +1;
 
   return MEMCACHED_SUCCESS;
 }
 
+static memcached_return_t item_counter(memcached_server_instance_st ,
+                                       const char *key, size_t key_length,
+                                       const char *value, size_t, // value_length,
+                                       void *context)
+{
+  if ((key_length == (sizeof("curr_items") -1)) and (strncmp("curr_items", key, (sizeof("curr_items") -1)) == 0))
+  {
+    uint64_t* counter= (uint64_t*)context;
+    unsigned long number_value= strtoul(value, (char **)NULL, 10);
+    if (number_value == ULONG_MAX)
+    {
+      return MEMCACHED_FAILURE;
+    }
+    *counter= *counter +number_value;
+  }
+
+  return MEMCACHED_SUCCESS;
+}
+
+#if 0
 test_return_t memcached_dump_TEST(memcached_st *memc)
 {
   test_skip(false, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
@@ -64,7 +93,52 @@ test_return_t memcached_dump_TEST(memcached_st *memc)
   memcached_dump_fn callbacks[1];
   callbacks[0]= &callback_dump_counter;
 
-  test_compare_hint(MEMCACHED_SUCCESS, memcached_dump(memc, callbacks, &count, 1), memcached_last_error_message(memc));
+  uint64_t counter= 0;
+  test_compare_got(MEMCACHED_SUCCESS,
+                   memcached_stat_execute(memc, NULL, item_counter, &counter),
+                   memcached_last_error_message(memc));
+  test_zero(counter);
+
+  test_compare_got(MEMCACHED_SUCCESS, memcached_dump(memc, callbacks, &count, 1), memcached_last_error_message(memc));
+
+  return TEST_SUCCESS;
+}
+#endif
+
+#define memcached_dump_TEST2_COUNT 64
+test_return_t memcached_dump_TEST2(memcached_st *memc)
+{
+  test_skip(false, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
+
+  /* The dump test relies on there being at least 32 items in memcached */
+  for (uint32_t x= 0; x < memcached_dump_TEST2_COUNT; x++)
+  {
+    char key[1024];
+
+    int length= snprintf(key, sizeof(key), "%s%u", __func__, x);
+
+    test_true(length > 0);
+
+    test_compare(MEMCACHED_SUCCESS,
+                 memcached_set(memc, key, length,
+                               NULL, 0, // Zero length values
+                               time_t(0), uint32_t(0)));
+  }
+  memcached_quit(memc);
+
+  uint64_t counter= 0;
+  test_compare(MEMCACHED_SUCCESS,
+               memcached_stat_execute(memc, NULL, item_counter, &counter));
+  test_true(counter > 0);
+
+  size_t count= 0;
+  memcached_dump_fn callbacks[1];
+  callbacks[0]= &callback_dump_counter;
+
+  test_compare(MEMCACHED_SUCCESS,
+               memcached_dump(memc, callbacks, &count, 1));
+
+  test_true(count);
 
   return TEST_SUCCESS;
 }