From 537f5995c425c76b2f2b5fd70281dbb8087f1085 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Thu, 23 Apr 2020 17:39:34 +0200 Subject: [PATCH] Make the method use common function --- core-buffer/src/BufferUtils.cpp | 17 +++-------------- core-buffer/test/test_buffer_utils.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/core-buffer/src/BufferUtils.cpp b/core-buffer/src/BufferUtils.cpp index 726ca86..3c92b34 100644 --- a/core-buffer/src/BufferUtils.cpp +++ b/core-buffer/src/BufferUtils.cpp @@ -69,25 +69,14 @@ vector BufferUtils::get_path_suffixes ( uint64_t start_file_base = start_pulse_id / core_buffer::FILE_MOD; start_file_base *= core_buffer::FILE_MOD; - for ( - uint64_t first_pulse_id=start_file_base; + for (uint64_t first_pulse_id=start_file_base; first_pulse_id <= stop_pulse_id; first_pulse_id += core_buffer::FILE_MOD) { - uint64_t folder_base = first_pulse_id / core_buffer::FOLDER_MOD; - folder_base *= core_buffer::FOLDER_MOD; - - uint64_t file_base = first_pulse_id / core_buffer::FILE_MOD; - file_base *= core_buffer::FILE_MOD; - - stringstream folder; - folder << folder_base << "/"; - folder << file_base << core_buffer::FILE_EXTENSION; - result.emplace_back( {first_pulse_id, - first_pulse_id+core_buffer::FILE_MOD-1, - folder.str()}); + first_pulse_id + core_buffer::FILE_MOD - 1, + get_filename("", "", first_pulse_id)}); } return result; diff --git a/core-buffer/test/test_buffer_utils.cpp b/core-buffer/test/test_buffer_utils.cpp index b2b318e..d964816 100644 --- a/core-buffer/test/test_buffer_utils.cpp +++ b/core-buffer/test/test_buffer_utils.cpp @@ -53,17 +53,17 @@ TEST(BufferUtils, get_path_suffixes) auto suffixes = BufferUtils::get_path_suffixes(15100, 18000); ASSERT_EQ(suffixes[0].start_pulse_id, 15000); ASSERT_EQ(suffixes[0].stop_pulse_id, 15999); - ASSERT_EQ(suffixes[0].path, "0/15000.h5"); + ASSERT_EQ(suffixes[0].path, "//0/15000.h5"); ASSERT_EQ(suffixes[1].start_pulse_id, 16000); ASSERT_EQ(suffixes[1].stop_pulse_id, 16999); - ASSERT_EQ(suffixes[1].path, "0/16000.h5"); + ASSERT_EQ(suffixes[1].path, "//0/16000.h5"); ASSERT_EQ(suffixes[2].start_pulse_id, 17000); ASSERT_EQ(suffixes[2].stop_pulse_id, 17999); - ASSERT_EQ(suffixes[2].path, "0/17000.h5"); + ASSERT_EQ(suffixes[2].path, "//0/17000.h5"); ASSERT_EQ(suffixes[3].start_pulse_id, 18000); ASSERT_EQ(suffixes[3].stop_pulse_id, 18999); - ASSERT_EQ(suffixes[3].path, "0/18000.h5"); + ASSERT_EQ(suffixes[3].path, "//0/18000.h5"); } \ No newline at end of file