cpp impl: remove write_json_data buffer

remove write_json_data buffer argument

Author: joshualicht

src/cpp/inc/kvs.hpp

@@ -556,7 +556,7 @@ class Kvs final {
 
         score::Result<std::unordered_map<std::string, KvsValue>> parse_json_data(const std::string& data);
         score::Result<std::unordered_map<std::string, KvsValue>> open_json(const std::string& prefix, OpenJsonNeedFile need_file);
-        score::ResultBlank write_json_data(const std::string& filename_prefix, const std::string& buf);
+        score::ResultBlank write_json_data(const std::string& buf);
 };
 
 

src/cpp/src/kvs.cpp

@@ -823,7 +823,7 @@ score::ResultBlank Kvs::remove_key(const string_view key) {
 }
 
 /* Helper Function to write JSON data to a file for flush process (also adds Hash file)*/
-score::ResultBlank Kvs::write_json_data(const std::string& filename_prefix, const std::string& buf)
+score::ResultBlank Kvs::write_json_data(const std::string& buf)
 {
     score::ResultBlank result = score::MakeUnexpected(MyErrorCode::UnmappedError);
     const std::string fn_json = filename_prefix + "_0.json";
@@ -899,7 +899,7 @@ score::ResultBlank Kvs::flush() {
             }else{
                 /* Write JSON Data */
                 std::string buf = std::move(buf_res.value());
-                result = write_json_data(filename_prefix, buf);
+                result = write_json_data(buf);
             }
         }
     }

src/cpp/tests/test_kvs.cpp

@@ -1374,7 +1374,8 @@ TEST(kvs_write_json_data, write_json_data_success){
     auto kvs = Kvs::open(InstanceId(instance_id), OpenNeedDefaults::Optional, OpenNeedKvs::Optional, std::string(data_dir));
     ASSERT_TRUE(kvs);
 
-    auto result = kvs->write_json_data(filename_prefix, json_test_data);
+    kvs->filename_prefix = filename_prefix; /* Set the filename prefix to the test prefix */
+    auto result = kvs->write_json_data(json_test_data);
     EXPECT_TRUE(result);
     EXPECT_TRUE(std::filesystem::exists(kvs_prefix + ".json"));
     EXPECT_TRUE(std::filesystem::exists(kvs_prefix + ".hash"));
@@ -1410,8 +1411,8 @@ TEST(kvs_write_json_data, write_json_data_failure){
 
     auto kvs = Kvs::open(InstanceId(instance_id), OpenNeedDefaults::Optional, OpenNeedKvs::Optional, std::string(data_dir));
     ASSERT_TRUE(kvs);
-
-    auto result = kvs->write_json_data(unwritable_dir + "/kvs_" + std::to_string(instance), kvs_json);
+    kvs->filename_prefix = unwritable_dir + "/kvs_" + std::to_string(instance); /* Set the filename prefix to the test prefix */
+    auto result = kvs->write_json_data(kvs_json);
     EXPECT_FALSE(result);
     EXPECT_EQ(result.error(), MyErrorCode::PhysicalStorageFailure);
 
@@ -1420,7 +1421,8 @@ TEST(kvs_write_json_data, write_json_data_failure){
     out_hash << "data";
     out_hash.close();
     std::filesystem::permissions(kvs_prefix + ".hash", std::filesystem::perms::owner_read, std::filesystem::perm_options::replace);
-    result = kvs->write_json_data(filename_prefix, kvs_json);
+    kvs->filename_prefix = filename_prefix; /* Reset the filename prefix to the test prefix */
+    result = kvs->write_json_data(kvs_json);
     EXPECT_FALSE(result);
     EXPECT_EQ(result.error(), MyErrorCode::PhysicalStorageFailure);
 
@@ -1429,13 +1431,14 @@ TEST(kvs_write_json_data, write_json_data_failure){
     out_json << "data";
     out_json.close();
     std::filesystem::permissions(kvs_prefix + ".json", std::filesystem::perms::owner_read, std::filesystem::perm_options::replace);
-    result = kvs->write_json_data(filename_prefix, kvs_json);
+    kvs->filename_prefix = filename_prefix; /* Reset the filename prefix to the test prefix */
+    result = kvs->write_json_data(kvs_json);
     EXPECT_FALSE(result);
     EXPECT_EQ(result.error(), MyErrorCode::PhysicalStorageFailure);
 
     /* Test if path argument is missing parent path (will only occur if semantic errors will be done in flush() )*/
-    const std::string prefix = "no_parent_path";
-    result = kvs->write_json_data(prefix, kvs_json);
+    kvs->filename_prefix =  "no_parent_path"; /* Set the filename prefix to the test prefix */
+    result = kvs->write_json_data(kvs_json);
     EXPECT_FALSE(result);
     EXPECT_EQ(result.error(), MyErrorCode::UnmappedError);