projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in build trunk work.
[m6w6/libmemcached]
/
libmemcached
/
delete.cc
diff --git
a/libmemcached/delete.cc
b/libmemcached/delete.cc
index a96ecbace8627b5f66e978ae63ab783febad826b..a7526dfcf5dfe9573db1df3a00c73a30417eaf8f 100644
(file)
--- a/
libmemcached/delete.cc
+++ b/
libmemcached/delete.cc
@@
-44,7
+44,7
@@
memcached_return_t memcached_delete(memcached_st *memc, const char *key, size_t
return memcached_delete_by_key(memc, key, key_length, key, key_length, expiration);
}
return memcached_delete_by_key(memc, key, key_length, key, key_length, expiration);
}
-static inline memcached_return_t ascii_delete(
memcached_server_write_instance_st
instance,
+static inline memcached_return_t ascii_delete(
org::libmemcached::Instance*
instance,
uint32_t ,
const char *key,
const size_t key_length,
uint32_t ,
const char *key,
const size_t key_length,
@@
-65,7
+65,7
@@
static inline memcached_return_t ascii_delete(memcached_server_write_instance_st
return memcached_vdo(instance, vector, 6, is_buffering ? false : true);
}
return memcached_vdo(instance, vector, 6, is_buffering ? false : true);
}
-static inline memcached_return_t binary_delete(
memcached_server_write_instance_st
instance,
+static inline memcached_return_t binary_delete(
org::libmemcached::Instance*
instance,
uint32_t server_key,
const char *key,
const size_t key_length,
uint32_t server_key,
const char *key,
const size_t key_length,
@@
-117,7
+117,7
@@
static inline memcached_return_t binary_delete(memcached_server_write_instance_s
server_key= 0;
}
server_key= 0;
}
-
memcached_server_write_instance_st replica= memcached_server
_instance_fetch(instance->root, server_key);
+
org::libmemcached::Instance* replica= memcached
_instance_fetch(instance->root, server_key);
if (memcached_fatal(memcached_vdo(replica, vector, 4, should_flush)))
{
if (memcached_fatal(memcached_vdo(replica, vector, 4, should_flush)))
{
@@
-158,7
+158,7
@@
memcached_return_t memcached_delete_by_key(memcached_st *memc,
}
uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length);
}
uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length);
-
memcached_server_write_instance_st instance= memcached_server
_instance_fetch(memc, server_key);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(memc, server_key);
bool is_buffering= memcached_is_buffering(instance->root);
bool is_replying= memcached_is_replying(instance->root);
bool is_buffering= memcached_is_buffering(instance->root);
bool is_replying= memcached_is_replying(instance->root);