Add test with xfile_array

Author: davidbrochart

include/xtensor-io/xfile_array.hpp

@@ -145,6 +145,9 @@ namespace xt
 
         xfile_array_container(const std::string& path, xfile_mode mode=xfile_mode::load);
 
+        template <class IOC>
+        xfile_array_container(const std::string& path, IOC& io_config, xfile_mode mode=xfile_mode::load);
+
         xfile_array_container(const std::string& path, xfile_mode mode, const value_type& init_value);
 
         ~xfile_array_container();
@@ -385,6 +388,19 @@ namespace xt
         set_path(path);
     }
 
+    template <class E, class IOH>
+    template <class IOC>
+    inline xfile_array_container<E, IOH>::xfile_array_container(const std::string& path, IOC& io_config, xfile_mode file_mode)
+        : m_storage()
+        , m_dirty(false)
+        , m_io_handler()
+        , m_file_mode(file_mode)
+        , m_init(false)
+    {
+        m_io_handler.configure_io(io_config);
+        set_path(path);
+    }
+
     template <class E, class IOH>
     inline xfile_array_container<E, IOH>::xfile_array_container(const std::string& path, xfile_mode file_mode, const value_type& init_value)
         : m_storage()

include/xtensor-io/xio_aws_handler.hpp

@@ -26,15 +26,20 @@ namespace xt
         xio_aws_handler();
 
         template <class E>
-        void write(const xexpression<E>& expression, const Aws::String& path, xfile_dirty dirty);
+        void write(const xexpression<E>& expression, const std::string& path, xfile_dirty dirty);
 
         template <class ET>
-        void read(ET& array, const Aws::String& path);
+        void read(ET& array, const std::string& path);
 
         void configure(const C& format_config, const xio_aws_config& io_config);
         void configure_io(const xio_aws_config& io_config);
 
     private:
+        template <class E>
+        void write(const xexpression<E>& expression, const char* path, xfile_dirty dirty);
+
+        template <class ET>
+        void read(ET& array, const char* path);
 
         C m_format_config;
         Aws::S3::S3Client m_client;
@@ -48,16 +53,24 @@ namespace xt
 
     template <class C>
     template <class E>
-    inline void xio_aws_handler<C>::write(const xexpression<E>& expression, const Aws::String& path, xfile_dirty dirty)
+    inline void xio_aws_handler<C>::write(const xexpression<E>& expression, const std::string& path, xfile_dirty dirty)
+    {
+        write(expression, path.c_str(), dirty);
+    }
+
+    template <class C>
+    template <class E>
+    inline void xio_aws_handler<C>::write(const xexpression<E>& expression, const char* path, xfile_dirty dirty)
     {
         if (m_format_config.will_dump(dirty))
         {
+            Aws::String path2 = path;
             Aws::S3::Model::PutObjectRequest request;
             request.SetBucket(m_bucket);
-            request.SetKey(path);
+            request.SetKey(path2);
 
-            std::shared_ptr<Aws::IOStream> writer = Aws::MakeShared<Aws::FStream>("SampleAllocationTag", path.c_str(), std::ios_base::in | std::ios_base::binary);
-            dump_file(writer, expression, m_format_config);
+            std::shared_ptr<Aws::IOStream> writer = Aws::MakeShared<Aws::FStream>("SampleAllocationTag", path, std::ios_base::in | std::ios_base::binary);
+            dump_file(*writer, expression, m_format_config);
 
             request.SetBody(writer);
 
@@ -73,11 +86,19 @@ namespace xt
 
     template <class C>
     template <class ET>
-    inline void xio_aws_handler<C>::read(ET& array, const Aws::String& path)
+    inline void xio_aws_handler<C>::read(ET& array, const std::string& path)
+    {
+        read(array, path.c_str());
+    }
+
+    template <class C>
+    template <class ET>
+    inline void xio_aws_handler<C>::read(ET& array, const char* path)
     {
+        Aws::String path2 = path;
         Aws::S3::Model::GetObjectRequest request;
         request.SetBucket(m_bucket);
-        request.SetKey(path);
+        request.SetKey(path2);
 
         Aws::S3::Model::GetObjectOutcome outcome = m_client.GetObject(request);
 

test/test_xio_aws_handler.cpp

@@ -13,6 +13,7 @@
 
 #include "gtest/gtest.h"
 #include "xtensor/xview.hpp"
+#include "xtensor-io/xfile_array.hpp"
 #include "xtensor-io/xio_binary.hpp"
 #include "xtensor-io/xio_aws_handler.hpp"
 
@@ -30,7 +31,23 @@ namespace xt
         xio_aws_config c = {client, "elevation-tiles-prod"};
         h.configure_io(c);
         xarray<char> a0;
-        h.read(a0, "main.js");
+        std::string path = "main.js";
+        h.read(a0, path);
+        xarray<char> a1 = {'/', '*', 'j', 's', 'l', 'i', 'n', 't', ' ', 'b', 'r' ,'o', 'w', 's', 'e', 'r', ':', ' ', 't', 'r', 'u', 'e', '*', '/'};
+        EXPECT_TRUE(xt::all(xt::equal(xt::view(a0, xt::range(0, 24)), a1)));
+
+        Aws::ShutdownAPI(options);
+    }
+
+    TEST(xio_aws_handler, xfile_array)
+    {
+        Aws::SDKOptions options;
+        Aws::InitAPI(options);
+
+        Aws::S3::S3Client client;
+        xio_aws_config c = {client, "elevation-tiles-prod"};
+        xfile_array<char, xio_aws_handler<xio_binary_config>> a0("main.js", c);
+
         xarray<char> a1 = {'/', '*', 'j', 's', 'l', 'i', 'n', 't', ' ', 'b', 'r' ,'o', 'w', 's', 'e', 'r', ':', ' ', 't', 'r', 'u', 'e', '*', '/'};
         EXPECT_TRUE(xt::all(xt::equal(xt::view(a0, xt::range(0, 24)), a1)));