projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
dump: memcached returns the right error by now
[awesomized/libmemcached]
/
libmemcached
/
dump.cc
diff --git
a/libmemcached/dump.cc
b/libmemcached/dump.cc
index 35da13f58db11adb32346d03cddb686de5514b97..fcb66604e41eb072089842b9345ab07d97074a63 100644
(file)
--- a/
libmemcached/dump.cc
+++ b/
libmemcached/dump.cc
@@
-68,7
+68,7
@@
static memcached_return_t ascii_dump(Memcached *memc, memcached_dump_fn *callbac
// Send message to all servers
for (uint32_t server_key= 0; server_key < memcached_server_count(memc); server_key++)
{
// Send message to all servers
for (uint32_t server_key= 0; server_key < memcached_server_count(memc); server_key++)
{
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(memc, server_key);
+
memcached_instance_st
* instance= memcached_instance_fetch(memc, server_key);
memcached_return_t vdo_rc;
if (memcached_success((vdo_rc= memcached_vdo(instance, vector, 3, true))))
memcached_return_t vdo_rc;
if (memcached_success((vdo_rc= memcached_vdo(instance, vector, 3, true))))
@@
-82,7
+82,7
@@
static memcached_return_t ascii_dump(Memcached *memc, memcached_dump_fn *callbac
}
// Collect the returned items
}
// Collect the returned items
-
org::libmemcached::Instance
* instance;
+
memcached_instance_st
* instance;
memcached_return_t read_ret= MEMCACHED_SUCCESS;
while ((instance= memcached_io_get_readable_server(memc, read_ret)))
{
memcached_return_t read_ret= MEMCACHED_SUCCESS;
while ((instance= memcached_io_get_readable_server(memc, read_ret)))
{
@@
-114,7
+114,7
@@
static memcached_return_t ascii_dump(Memcached *memc, memcached_dump_fn *callbac
{
// All items have been returned
}
{
// All items have been returned
}
- else if (response_rc == MEMCACHED_SERVER_ERROR
or response_rc == MEMCACHED_CLIENT_ERROR or response_rc == MEMCACHED_ERROR
)
+ else if (response_rc == MEMCACHED_SERVER_ERROR)
{
/* If we try to request stats cachedump for a slab class that is too big
* the server will return an incorrect error message:
{
/* If we try to request stats cachedump for a slab class that is too big
* the server will return an incorrect error message: