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 e99c1c6..c3212ff 100644 Binary files a/vendor/hiredis-vip-0.3.0.zip and b/vendor/hiredis-vip-0.3.0.zip differ