From 683aae798080ecb0ef396feb07318bf5e3aa5fdc Mon Sep 17 00:00:00 2001 From: Hariharan Devarajan Date: Wed, 13 Jan 2021 16:08:41 -0600 Subject: [PATCH] removed whitespace through formatting. --- src/rpc_thallium.cc | 69 ++++++++++++++++++++++----------------------- src/rpc_thallium.h | 6 ++-- test/bucket_test.cc | 38 +++++++++++++------------ 3 files changed, 56 insertions(+), 57 deletions(-) diff --git a/src/rpc_thallium.cc b/src/rpc_thallium.cc index b5cf002d3..278103c0e 100644 --- a/src/rpc_thallium.cc +++ b/src/rpc_thallium.cc @@ -176,9 +176,9 @@ void ThalliumStartRpcServer(SharedMemoryContext *context, RpcContext *rpc, function rpc_map_delete = [context](const request &req, string name, const MapType &map_type) { (void)req; - MetadataManager *mdm = GetMetadataManagerFromContext(context); - LocalDelete(mdm, name.c_str(), map_type); - }; + MetadataManager *mdm = GetMetadataManagerFromContext(context); + LocalDelete(mdm, name.c_str(), map_type); + }; function rpc_add_blob_bucket = [context](const request &req, BucketID bucket_id, BlobID blob_id) { @@ -186,6 +186,7 @@ void ThalliumStartRpcServer(SharedMemoryContext *context, RpcContext *rpc, MetadataManager *mdm = GetMetadataManagerFromContext(context); LocalAddBlobIdToBucket(mdm, bucket_id, blob_id); }; + function rpc_add_blob_vbucket = [context](const request &req, VBucketID vbucket_id, BlobID blob_id) { (void)req; @@ -197,12 +198,12 @@ void ThalliumStartRpcServer(SharedMemoryContext *context, RpcContext *rpc, MetadataManager *mdm = GetMetadataManagerFromContext(context); std::vector result = LocalGetBufferIdList(mdm, blob_id); - req.respond(result); - }; + req.respond(result); + }; - function rpc_free_buffer_id_list = - [context](const request &req, BlobID blob_id) { - (void)req; + function rpc_free_buffer_id_list = + [context](const request &req, BlobID blob_id) { + (void)req; LocalFreeBufferIdList(context, blob_id); }; @@ -343,42 +344,38 @@ void ThalliumStartRpcServer(SharedMemoryContext *context, RpcContext *rpc, rpc_server->define("RemoteGet", rpc_map_get); rpc_server->define("RemotePut", rpc_map_put).disable_response(); rpc_server->define("RemoteDelete", rpc_map_delete).disable_response(); - rpc_server->define("RemoteAddBlobIdToBucket", rpc_add_blob_bucket) - .disable_response(); - rpc_server->define("RemoteAddBlobIdToVBucket", rpc_add_blob_vbucket) - .disable_response(); + rpc_server->define("RemoteAddBlobIdToBucket", + rpc_add_blob_bucket).disable_response(); + rpc_server->define("RemoteAddBlobIdToVBucket", + rpc_add_blob_vbucket).disable_response(); rpc_server->define("RemoteDestroyBucket", rpc_destroy_bucket); - rpc_server->define("RemoteRenameBucket", rpc_rename_bucket) - .disable_response(); - rpc_server->define("RemoteDestroyBlobByName", rpc_destroy_blob_by_name) - .disable_response(); - rpc_server->define("RemoteDestroyBlobById", rpc_destroy_blob_by_id) - .disable_response(); + rpc_server->define("RemoteRenameBucket", + rpc_rename_bucket).disable_response(); + rpc_server->define("RemoteDestroyBlobByName", + rpc_destroy_blob_by_name).disable_response(); + rpc_server->define("RemoteDestroyBlobById", + rpc_destroy_blob_by_id).disable_response(); rpc_server->define("RemoteContainsBlob", rpc_contains_blob); rpc_server->define("RemoteGetNextFreeBucketId", rpc_get_next_free_bucket_id); - rpc_server - ->define("RemoteRemoveBlobFromBucketInfo", - rpc_remove_blob_from_bucket_info) - .disable_response(); + rpc_server->define("RemoteRemoveBlobFromBucketInfo", + rpc_remove_blob_from_bucket_info).disable_response(); rpc_server->define("RemoteAllocateBufferIdList", rpc_allocate_buffer_id_list); rpc_server->define("RemoteGetBufferIdList", rpc_get_buffer_id_list); - rpc_server->define("RemoteFreeBufferIdList", rpc_free_buffer_id_list) - .disable_response(); - rpc_server->define("RemoteIncrementRefcount", rpc_increment_refcount_bucket) - .disable_response(); - rpc_server->define("RemoteDecrementRefcount", rpc_decrement_refcount_bucket) - .disable_response(); + rpc_server->define("RemoteFreeBufferIdList", + rpc_free_buffer_id_list).disable_response(); + rpc_server->define("RemoteIncrementRefcount", + rpc_increment_refcount_bucket).disable_response(); + rpc_server->define("RemoteDecrementRefcount", + rpc_decrement_refcount_bucket).disable_response(); rpc_server - ->define("RemoteIncrementRefcountVBucket", rpc_increment_refcount_vbucket) - .disable_response(); + ->define("RemoteIncrementRefcountVBucket", + rpc_increment_refcount_vbucket).disable_response(); rpc_server - ->define("RemoteDecrementRefcountVBucket", rpc_decrement_refcount_vbucket) - .disable_response(); + ->define("RemoteDecrementRefcountVBucket", + rpc_decrement_refcount_vbucket).disable_response(); rpc_server->define("RemoteGetRemainingCapacity", rpc_get_remaining_capacity); - rpc_server - ->define("RemoteUpdateGlobalSystemViewState", - rpc_update_global_system_view_state) - .disable_response(); + rpc_server->define("RemoteUpdateGlobalSystemViewState", + rpc_update_global_system_view_state).disable_response(); rpc_server->define("RemoteGetGlobalDeviceCapacities", rpc_get_global_device_capacities); rpc_server->define("RemoteGetBlobIds", rpc_get_blob_ids); diff --git a/src/rpc_thallium.h b/src/rpc_thallium.h index 2a5287f50..ebbffad46 100644 --- a/src/rpc_thallium.h +++ b/src/rpc_thallium.h @@ -53,9 +53,9 @@ void serialize(A &ar, BufferID &buffer_id) { * @param ar An archive provided by Thallium. * @param bucket_id The BucketID to serialize. */ -template +template void serialize(A &ar, BucketID &bucket_id) { - ar &bucket_id.as_int; + ar & bucket_id.as_int; } /** @@ -79,7 +79,7 @@ void serialize(A &ar, VBucketID &vbucket_id) { * @param ar An archive provided by Thallium. * @param blob_id The BlobID to serialize. */ -template +template void serialize(A &ar, BlobID &blob_id) { ar & blob_id.as_int; } diff --git a/test/bucket_test.cc b/test/bucket_test.cc index 328b74708..264464f84 100644 --- a/test/bucket_test.cc +++ b/test/bucket_test.cc @@ -1,15 +1,14 @@ -#include "bucket.h" - -#include - #include #include #include +#include +#include "zlib.h" + #include "hermes.h" -#include "test_utils.h" +#include "bucket.h" #include "vbucket.h" -#include "zlib.h" +#include "test_utils.h" namespace hapi = hermes::api; std::shared_ptr hermes_app; @@ -55,19 +54,21 @@ int compress_blob(hermes::api::TraitInput &input, hermes::api::Trait *trait) { LOG(INFO) << "Compressing blob\n"; - if (destination_data == nullptr) return Z_MEM_ERROR; + if (destination_data == nullptr) + return Z_MEM_ERROR; - int return_value = - compress2((Bytef *)destination_data, &destination_length, - (Bytef *)blob.data(), source_length, my_trait->compress_level); - hermes::api::Blob destination{0}; + int return_value = compress2((Bytef *) destination_data, + &destination_length, (Bytef *) blob.data(), + source_length, my_trait->compress_level); + hermes::api::Blob destination {0}; // TODO(KIMMY): where to store compressed data add_buffer_to_vector(destination, destination_data, destination_length); - delete[] destination_data; + delete [] destination_data; return return_value; } + void TestBucketPersist(std::shared_ptr hermes) { constexpr int bytes_per_blob = KILOBYTES(3); constexpr int num_blobs = 3; @@ -94,7 +95,8 @@ void TestBucketPersist(std::shared_ptr hermes) { Assert(fread(read_buffer, 1, total_bytes, bkt_file) == total_bytes); for (int offset = 0; offset < num_blobs; ++offset) { - for (int i = offset * bytes_per_blob; i < bytes_per_blob * (offset + 1); + for (int i = offset * bytes_per_blob; + i < bytes_per_blob * (offset + 1); ++i) { char expected = '\0'; switch (offset) { @@ -141,19 +143,19 @@ int main(int argc, char **argv) { hermes::api::Bucket my_bucket("compression", hermes_app, ctx); hermes_app->Display_bucket(); - hermes::api::Blob p1(1024 * 1024 * 400, 255); + hermes::api::Blob p1(1024*1024*400, 255); hermes::api::Blob p2(p1); my_bucket.Put("Blob1", p1, ctx); my_bucket.Put("Blob2", p2, ctx); if (my_bucket.ContainsBlob("Blob1")) - std::cout << "Found Blob1\n"; + std::cout<< "Found Blob1\n"; else - std::cout << "Not found Blob1\n"; + std::cout<< "Not found Blob1\n"; if (my_bucket.ContainsBlob("Blob2")) - std::cout << "Found Blob2\n"; + std::cout<< "Found Blob2\n"; else - std::cout << "Not found Blob2\n"; + std::cout<< "Not found Blob2\n"; hermes::api::VBucket my_vb("VB1", hermes_app, false, ctx); hermes_app->Display_vbucket();