X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fbehavior.cc;h=7536248e214f2db040a83444b5a7276691d3209c;hb=f30bca797720f53297e881c79935dbd13a93a068;hp=8ffbd665ec570ae29d76fddc7571d9804d6849fe;hpb=fbdda95bad712d301373b64193eb3ca00f281e55;p=awesomized%2Flibmemcached diff --git a/libmemcached/behavior.cc b/libmemcached/behavior.cc index 8ffbd665..7536248e 100644 --- a/libmemcached/behavior.cc +++ b/libmemcached/behavior.cc @@ -42,16 +42,37 @@ #include #include +bool memcached_is_consistent_distribution(const Memcached* memc) +{ + switch (memc->distribution) + { + case MEMCACHED_DISTRIBUTION_CONSISTENT: + case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA: + case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY: + case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED: + return true; + + case MEMCACHED_DISTRIBUTION_MODULA: + case MEMCACHED_DISTRIBUTION_RANDOM: + case MEMCACHED_DISTRIBUTION_VIRTUAL_BUCKET: + case MEMCACHED_DISTRIBUTION_CONSISTENT_MAX: + break; + } + + return false; +} + /* This function is used to modify the behavior of running client. We quit all connections so we can reset the sockets. */ -memcached_return_t memcached_behavior_set(memcached_st *ptr, +memcached_return_t memcached_behavior_set(memcached_st *shell, const memcached_behavior_t flag, uint64_t data) { + Memcached* ptr= memcached2Memcached(shell); if (ptr == NULL) { return MEMCACHED_INVALID_ARGUMENTS; @@ -85,6 +106,7 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, case MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS: ptr->flags.auto_eject_hosts= bool(data); + break; case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT: if (data == 0) @@ -95,6 +117,10 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, ptr->server_failure_limit= uint32_t(data); break; + case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT: + ptr->server_timeout_limit= uint32_t(data); + break; + case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL: send_quit(ptr); // We need t shutdown all of the connections to make sure we do the correct protocol if (data) @@ -162,13 +188,17 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, case MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED: { + if (bool(data) == false) + { + return memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_KETAMA, true); + } + (void)memcached_behavior_set_key_hash(ptr, MEMCACHED_HASH_MD5); (void)memcached_behavior_set_distribution_hash(ptr, MEMCACHED_HASH_MD5); - ptr->ketama.weighted= bool(data); /** @note We try to keep the same distribution going. This should be deprecated and rewritten. */ - return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA); + return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED); } case MEMCACHED_BEHAVIOR_HASH: @@ -205,11 +235,6 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, break; case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT: - if (data == 0) - { - return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, - memcached_literal_param("MEMCACHED_BEHAVIOR_RETRY_TIMEOUT requires a value greater then zero.")); - } ptr->retry_timeout= int32_t(data); break; @@ -284,10 +309,11 @@ bool _is_auto_eject_host(const memcached_st *ptr) return ptr->flags.auto_eject_hosts; } -uint64_t memcached_behavior_get(memcached_st *ptr, +uint64_t memcached_behavior_get(memcached_st *shell, const memcached_behavior_t flag) { - if (not ptr) + Memcached* ptr= memcached2Memcached(shell); + if (ptr == NULL) { return MEMCACHED_INVALID_ARGUMENTS; } @@ -331,13 +357,17 @@ uint64_t memcached_behavior_get(memcached_st *ptr, return ptr->flags.verify_key; case MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED: - return ptr->ketama.weighted; + if (memcached_is_consistent_distribution(ptr)) + { + return memcached_is_weighted_ketama(ptr); + } + return false; case MEMCACHED_BEHAVIOR_DISTRIBUTION: return ptr->distribution; case MEMCACHED_BEHAVIOR_KETAMA: - return (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) ? (uint64_t) 1 : 0; + return memcached_is_consistent_distribution(ptr); case MEMCACHED_BEHAVIOR_HASH: return hashkit_get_function(&ptr->hashkit); @@ -346,9 +376,14 @@ uint64_t memcached_behavior_get(memcached_st *ptr, return hashkit_get_function(&ptr->hashkit); case MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS: + return ptr->flags.auto_eject_hosts; + case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT: return ptr->server_failure_limit; + case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT: + return ptr->server_timeout_limit; + case MEMCACHED_BEHAVIOR_SORT_HOSTS: return ptr->flags.use_sort_hosts; @@ -383,7 +418,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr, return (uint64_t) ptr->send_size; } - memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, 0); + memcached_instance_st* instance= memcached_instance_fetch(ptr, 0); if (instance) // If we have an instance we test, otherwise we just set and pray { @@ -399,7 +434,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr, return 0; } - if (getsockopt(instance->fd, SOL_SOCKET, SO_SNDBUF, &sock_size, &sock_length) < 0) + if (getsockopt(instance->fd, SOL_SOCKET, SO_SNDBUF, (char*)&sock_size, &sock_length) < 0) { memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT); return 0; /* Zero means error */ @@ -417,7 +452,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr, if (ptr->recv_size != -1) // If value is -1 then we are using the default return (uint64_t) ptr->recv_size; - memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, 0); + memcached_instance_st* instance= memcached_instance_fetch(ptr, 0); /** @note REFACTOR @@ -435,7 +470,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr, return 0; } - if (getsockopt(instance->fd, SOL_SOCKET, SO_RCVBUF, &sock_size, &sock_length) < 0) + if (getsockopt(instance->fd, SOL_SOCKET, SO_RCVBUF, (char*)&sock_size, &sock_length) < 0) { memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT); return 0; /* Zero means error */ @@ -477,7 +512,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr, case MEMCACHED_BEHAVIOR_MAX: default: - assert_msg(0, "Invalid behavior passed to memcached_behavior_set()"); + assert_msg(0, "Invalid behavior passed to memcached_behavior_get()"); return 0; } @@ -485,67 +520,120 @@ uint64_t memcached_behavior_get(memcached_st *ptr, } -memcached_return_t memcached_behavior_set_distribution(memcached_st *ptr, memcached_server_distribution_t type) +memcached_return_t memcached_behavior_set_distribution(memcached_st *shell, memcached_server_distribution_t type) { - if (type < MEMCACHED_DISTRIBUTION_CONSISTENT_MAX) + Memcached* ptr= memcached2Memcached(shell); + if (ptr) { - if (MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED) + switch (type) { - ptr->ketama.weighted= true; - } - else - { - ptr->ketama.weighted= false; - } + case MEMCACHED_DISTRIBUTION_MODULA: + break; + case MEMCACHED_DISTRIBUTION_CONSISTENT: + case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA: + memcached_set_weighted_ketama(ptr, false); + break; + + case MEMCACHED_DISTRIBUTION_RANDOM: + break; + + case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY: + break; + + case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED: + memcached_set_weighted_ketama(ptr, true); + break; + + case MEMCACHED_DISTRIBUTION_VIRTUAL_BUCKET: + break; + + default: + case MEMCACHED_DISTRIBUTION_CONSISTENT_MAX: + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("Invalid memcached_server_distribution_t")); + } ptr->distribution= type; + return run_distribution(ptr); } - return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, - memcached_literal_param("Invalid memcached_server_distribution_t")); + return MEMCACHED_INVALID_ARGUMENTS; } -memcached_server_distribution_t memcached_behavior_get_distribution(memcached_st *ptr) +memcached_server_distribution_t memcached_behavior_get_distribution(memcached_st *shell) { - return ptr->distribution; + Memcached* ptr= memcached2Memcached(shell); + if (ptr) + { + return ptr->distribution; + } + + return MEMCACHED_DISTRIBUTION_CONSISTENT_MAX; } -memcached_return_t memcached_behavior_set_key_hash(memcached_st *ptr, memcached_hash_t type) +memcached_return_t memcached_behavior_set_key_hash(memcached_st *shell, memcached_hash_t type) { - if (hashkit_success(hashkit_set_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type))) + Memcached* ptr= memcached2Memcached(shell); + if (ptr) { - return MEMCACHED_SUCCESS; + if (hashkit_success(hashkit_set_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type))) + { + return MEMCACHED_SUCCESS; + } + + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("Invalid memcached_hash_t()")); } - return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, - memcached_literal_param("Invalid memcached_hash_t()")); + return MEMCACHED_INVALID_ARGUMENTS; } -memcached_hash_t memcached_behavior_get_key_hash(memcached_st *ptr) +memcached_hash_t memcached_behavior_get_key_hash(memcached_st *shell) { - return (memcached_hash_t)hashkit_get_function(&ptr->hashkit); + Memcached* ptr= memcached2Memcached(shell); + if (ptr) + { + return (memcached_hash_t)hashkit_get_function(&ptr->hashkit); + } + + return MEMCACHED_HASH_MAX; } -memcached_return_t memcached_behavior_set_distribution_hash(memcached_st *ptr, memcached_hash_t type) +memcached_return_t memcached_behavior_set_distribution_hash(memcached_st *shell, memcached_hash_t type) { - if (hashkit_success(hashkit_set_distribution_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type))) - return MEMCACHED_SUCCESS; + Memcached* ptr= memcached2Memcached(shell); + if (ptr) + { + if (hashkit_success(hashkit_set_distribution_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type))) + { + return MEMCACHED_SUCCESS; + } + + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("Invalid memcached_hash_t()")); + } - return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, - memcached_literal_param("Invalid memcached_hash_t()")); + return MEMCACHED_INVALID_ARGUMENTS; } -memcached_hash_t memcached_behavior_get_distribution_hash(memcached_st *ptr) +memcached_hash_t memcached_behavior_get_distribution_hash(memcached_st *shell) { - return (memcached_hash_t)hashkit_get_function(&ptr->hashkit); + Memcached* ptr= memcached2Memcached(shell); + if (ptr) + { + return (memcached_hash_t)hashkit_get_function(&ptr->hashkit); + } + + return MEMCACHED_HASH_MAX; } const char *libmemcached_string_behavior(const memcached_behavior_t flag) { switch (flag) { + case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT: return "MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT"; case MEMCACHED_BEHAVIOR_NO_BLOCK: return "MEMCACHED_BEHAVIOR_NO_BLOCK"; case MEMCACHED_BEHAVIOR_TCP_NODELAY: return "MEMCACHED_BEHAVIOR_TCP_NODELAY"; case MEMCACHED_BEHAVIOR_HASH: return "MEMCACHED_BEHAVIOR_HASH"; @@ -604,12 +692,13 @@ const char *libmemcached_string_distribution(const memcached_server_distribution } } -memcached_return_t memcached_bucket_set(memcached_st *self, +memcached_return_t memcached_bucket_set(memcached_st *shell, const uint32_t *host_map, const uint32_t *forward_map, const uint32_t buckets, const uint32_t replicas) { + Memcached* self= memcached2Memcached(shell); memcached_return_t rc; if (self == NULL)