Merge branch 'main' into graceful-shutdown

Author: gibber9809

components/core/CMakeLists.txt

@@ -441,8 +441,8 @@ set(SOURCE_FILES_unitTest
         src/clp/aws/constants.hpp
         src/clp/BoundedReader.cpp
         src/clp/BoundedReader.hpp
-        src/clp/BufferedFileReader.cpp
-        src/clp/BufferedFileReader.hpp
+        src/clp/BufferedReader.cpp
+        src/clp/BufferedReader.hpp
         src/clp/BufferReader.cpp
         src/clp/BufferReader.hpp
         src/clp/clp/CommandLineArguments.cpp
@@ -689,7 +689,7 @@ set(SOURCE_FILES_unitTest
         tests/LogSuppressor.hpp
         tests/TestOutputCleaner.hpp
         tests/test-BoundedReader.cpp
-        tests/test-BufferedFileReader.cpp
+        tests/test-BufferedReader.cpp
         tests/test-clp_s-delta-encode-log-order.cpp
         tests/test-clp_s-end_to_end.cpp
         tests/test-clp_s-range_index.cpp

components/core/src/clp/BufferReader.cpp

@@ -4,18 +4,21 @@
 #include <cstring>
 
 namespace clp {
-BufferReader::BufferReader(char const* data, size_t data_size, size_t pos) {
-    if (nullptr == data) {
+BufferReader::BufferReader(char const* data, size_t data_size, size_t pos)
+        : m_internal_buf{data},
+          m_internal_buf_size{data_size},
+          m_internal_buf_pos{pos} {
+    if (nullptr == data && (data_size != 0 || pos != 0)) {
+        throw OperationFailed(ErrorCode_BadParam, __FILENAME__, __LINE__);
+    }
+    if (pos > data_size) {
         throw OperationFailed(ErrorCode_BadParam, __FILENAME__, __LINE__);
     }
-    m_internal_buf = data;
-    m_internal_buf_size = data_size;
-    m_internal_buf_pos = pos;
 }
 
 auto BufferReader::peek_buffer(char const*& buf, size_t& peek_size) const -> void {
     peek_size = get_remaining_data_size();
-    buf = m_internal_buf + m_internal_buf_pos;
+    buf = 0 == peek_size ? nullptr : m_internal_buf + m_internal_buf_pos;
 }
 
 auto BufferReader::try_read_to_delimiter(

components/core/src/clp/BufferReader.hpp

@@ -23,6 +23,8 @@ class BufferReader : public ReaderInterface {
     };
 
     // Constructors
+    BufferReader() : BufferReader(nullptr, 0, 0) {}
+
     BufferReader(char const* data, size_t data_size) : BufferReader(data, data_size, 0) {}
 
     BufferReader(char const* data, size_t data_size, size_t pos);