From c801523de9c5ae244fc5182a63e4266a8f2482ac Mon Sep 17 00:00:00 2001 From: zhangchengwei Date: Sat, 15 Dec 2018 21:19:20 +0800 Subject: [PATCH] =?UTF-8?q?hiredis-vip-0.3.0.zip=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cache/include/object_store_client.h | 2 +- cache/src/object_store_client.cpp | 4 ++-- vendor/CMakeLists.txt | 2 +- vendor/hiredis-vip-0.3.0.zip | Bin 118990 -> 118991 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cache/include/object_store_client.h b/cache/include/object_store_client.h index e7d72bc..351bb83 100644 --- a/cache/include/object_store_client.h +++ b/cache/include/object_store_client.h @@ -29,7 +29,7 @@ int object_store_head_object(struct object_store_instance *instance, struct futu struct tango_cache_result *object_store_read_result(void *promise_result); //DELETE接口 -int object_store_delete_object(struct object_store_instance *instance, struct future* f, const char *objkey); +int object_store_delete_object(struct object_store_instance *instance, struct future* f, const char *objkey, const char *minio_addr=NULL, const char *bucket=NULL); //一次性上传接口 int object_store_upload_once_data(struct object_store_instance *instance, struct future* f, diff --git a/cache/src/object_store_client.cpp b/cache/src/object_store_client.cpp index bd2ecd9..58eb3fb 100644 --- a/cache/src/object_store_client.cpp +++ b/cache/src/object_store_client.cpp @@ -104,9 +104,9 @@ int object_store_head_object(struct object_store_instance *instance, struct futu return cache_evbase_head_object(instance->instances[rand()%instance->instance_num], f, meta); } -int object_store_delete_object(struct object_store_instance *instance, struct future* f, const char *objkey) +int object_store_delete_object(struct object_store_instance *instance, struct future* f, const char *objkey, const char *minio_addr, const char *bucket) { - return cache_evbase_delete_object(instance->instances[rand()%instance->instance_num], f, objkey); + return cache_evbase_delete_object(instance->instances[rand()%instance->instance_num], f, objkey, minio_addr, bucket); } struct object_store_instance *object_store_instance_new(const char* profile_path, const char* section, int thread_num, void *runtimelog) diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index b3f07a5..9f3aa3e 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -251,7 +251,7 @@ set_property(TARGET libcurl-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INST ### hiredis ExternalProject_Add(hiredisCluster PREFIX hiredisCluster URL ${CMAKE_CURRENT_SOURCE_DIR}/hiredis-vip-0.3.0.zip - URL_MD5 950ccc040a705ebe6c6b1854a744ae2d + URL_MD5 8d0636f911d4a4a6ec8aeff2abb5bc0f CONFIGURE_COMMAND "" BUILD_COMMAND make INSTALL_COMMAND make install diff --git a/vendor/hiredis-vip-0.3.0.zip b/vendor/hiredis-vip-0.3.0.zip index e99c1c61a6d943e7475ef3dcd04e03edff3b28be..c3212ff1c2fdc329bcc20866fed58bb4009db3ce 100644 GIT binary patch delta 3239 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 QL5+ie5l+zzh(GWD04r~@XaE2J