Remove unused fcts

Author: Hind-M

include/sparrow_ipc/deserialize_utils.hpp

@@ -32,27 +32,22 @@ namespace sparrow_ipc::utils
     );
 
     /**
-     * @brief Extracts bitmap pointer and null count from a RecordBatch buffer.
-     *
-     * This function retrieves a bitmap buffer from the specified index in the RecordBatch's
-     * buffer list and calculates the number of null values represented by the bitmap.
+     * @brief Extracts a buffer from a RecordBatch's body.
      *
-     * @param record_batch The Arrow RecordBatch containing buffer metadata
-     * @param body The raw buffer data as a byte span
-     * @param index The index of the bitmap buffer in the RecordBatch's buffer list
+     * This function retrieves a buffer span from the specified index in the RecordBatch's
+     * buffer list and increments the index.
      *
-     * @return A pair containing:
-     *         - First: Pointer to the bitmap data (nullptr if buffer is empty)
-     *         - Second: Count of null values in the bitmap (0 if buffer is empty)
+     * @param record_batch The Arrow RecordBatch containing buffer metadata.
+     * @param body The raw buffer data as a byte span.
+     * @param buffer_index The index of the buffer to retrieve. This value is incremented by the function.
      *
-     * @note If the bitmap buffer has zero length, returns {nullptr, 0}
-     * @note The returned pointer is a non-const cast of the original const data
+     * @return A `std::span<const uint8_t>` viewing the extracted buffer data.
+     * @throws std::runtime_error if the buffer metadata indicates a buffer that exceeds the body size.
      */
-    // TODO to be removed when not used anymore (after adding compression to deserialize_fixedsizebinary_array)
-    [[nodiscard]] std::pair<std::uint8_t*, int64_t> get_bitmap_pointer_and_null_count(
+    [[nodiscard]] std::span<const uint8_t> get_buffer(
         const org::apache::arrow::flatbuf::RecordBatch& record_batch,
         std::span<const uint8_t> body,
-        size_t index
+        size_t& buffer_index
     );
 
     /**
@@ -72,23 +67,4 @@ namespace sparrow_ipc::utils
         std::span<const uint8_t> buffer_span,
         const org::apache::arrow::flatbuf::BodyCompression* compression
     );
-
-    /**
-     * @brief Extracts a buffer from a RecordBatch's body.
-     *
-     * This function retrieves a buffer span from the specified index in the RecordBatch's
-     * buffer list and increments the index.
-     *
-     * @param record_batch The Arrow RecordBatch containing buffer metadata.
-     * @param body The raw buffer data as a byte span.
-     * @param buffer_index The index of the buffer to retrieve. This value is incremented by the function.
-     *
-     * @return A `std::span<const uint8_t>` viewing the extracted buffer data.
-     * @throws std::runtime_error if the buffer metadata indicates a buffer that exceeds the body size.
-     */
-    [[nodiscard]] std::span<const uint8_t> get_buffer(
-        const org::apache::arrow::flatbuf::RecordBatch& record_batch,
-        std::span<const uint8_t> body,
-        size_t& buffer_index
-    );
 }

src/deserialize_utils.cpp

@@ -4,7 +4,6 @@
 
 namespace sparrow_ipc::utils
 {
-    // TODO check and remove unused fcts?
     std::pair<std::uint8_t*, int64_t> get_bitmap_pointer_and_null_count(
         std::span<const uint8_t> validity_buffer_span,
         const int64_t length
@@ -22,29 +21,6 @@ namespace sparrow_ipc::utils
         return {ptr, bitmap_view.null_count()};
     }
 
-    std::pair<std::uint8_t*, int64_t> get_bitmap_pointer_and_null_count(
-        const org::apache::arrow::flatbuf::RecordBatch& record_batch,
-        std::span<const uint8_t> body,
-        size_t index
-    )
-    {
-        const auto bitmap_metadata = record_batch.buffers()->Get(index);
-        if (bitmap_metadata->length() == 0)
-        {
-            return {nullptr, 0};
-        }
-        if (body.size() < (bitmap_metadata->offset() + bitmap_metadata->length()))
-        {
-            throw std::runtime_error("Bitmap buffer exceeds body size");
-        }
-        auto ptr = const_cast<uint8_t*>(body.data() + bitmap_metadata->offset());
-        const sparrow::dynamic_bitset_view<const std::uint8_t> bitmap_view{
-            ptr,
-            static_cast<size_t>(record_batch.length())
-        };
-        return {ptr, bitmap_view.null_count()};
-    }
-
     std::span<const uint8_t> get_buffer(
         const org::apache::arrow::flatbuf::RecordBatch& record_batch,
         std::span<const uint8_t> body,

tests/test_serialize_utils.cpp

@@ -113,7 +113,7 @@ namespace sparrow_ipc
                 CHECK_EQ(size % 8, 0);
                 std::vector<uint8_t> serialized;
                 memory_output_stream stream(serialized);
-                    any_output_stream astream(stream);
+                any_output_stream astream(stream);
                 generate_body(record_batch, astream);
                 CHECK_EQ(size, static_cast<int64_t>(serialized.size()));
             }