Add dir based open & create calls

Init files from default names under dir

Author: movitto

include/nudb/_experimental/test/test_store.hpp

@@ -201,10 +201,12 @@ class basic_test_store
     temp_dir td_;
     std::uniform_int_distribution<std::size_t> sizef_;
     std::function<void(error_code&)> createf_;
+    std::function<void(error_code&)> create_dirf_;
     std::function<void(error_code&)> openf_;
     Buffer buf_;
 
 public:
+    path_type const dirp;
     path_type const dp;
     path_type const kp;
     path_type const lp;
@@ -234,6 +236,9 @@ class basic_test_store
     void
     create(error_code& ec);
 
+    void
+    create_dir(error_code& ec);
+
     void
     open(error_code& ec);
 
@@ -270,11 +275,20 @@ basic_test_store<File>::basic_test_store(
                     keySize, blockSize, loadFactor, ec,
                     args...);
             })
+        , create_dirf_(
+            [this, args...](error_code& ec)
+            {
+                nudb::create<Hasher, File>(
+                    dirp, appnum, salt,
+                    keySize, blockSize, loadFactor, ec,
+                    args...);
+            })
         , openf_(
             [this, args...](error_code& ec)
             {
                 db.open(dp, kp, lp, ec, args...);
             })
+        , dirp(td_.path())
         , dp(td_.file("nudb.dat"))
         , kp(td_.file("nudb.key"))
         , lp(td_.file("nudb.log"))
@@ -330,6 +344,15 @@ create(error_code& ec)
     createf_(ec);
 }
 
+template<class File>
+void
+basic_test_store<File>::
+create_dir(error_code& ec)
+{
+    create_dirf_(ec);
+}
+
+
 template<class File>
 void
 basic_test_store<File>::

include/nudb/basic_store.hpp

@@ -454,6 +454,40 @@ class basic_store
     flush() override;
 };
 
+/** Open a database.
+
+    The database identified by the specified directory
+    under which default data and key paths are opened.
+
+    @par Requirements
+
+    The database must be not be open.
+
+    @par Thread safety
+
+    Not thread safe. The caller is responsible for
+    ensuring that no other store member functions are
+    called concurrently.
+
+    @param dir_path The path to the directory containing data
+    and key files.
+
+    @param store The store to open.
+
+    @param ec Set to the error, if any occurred.
+
+    @param args Optional arguments passed to @b File constructors.
+
+*/
+template<class Hasher, class File, class... Args>
+void
+open_dir(
+    path_type const& dir_path,
+    basic_store<Hasher, File>& store,
+    error_code& ec,
+    Args&&... args);
+
+
 } // nudb
 
 #include <nudb/impl/basic_store.ipp>

include/nudb/create.hpp

@@ -110,6 +110,31 @@ create(
     error_code& ec,
     Args&&... args);
 
+/** Create a new database in specified directory.
+
+    Similar to create method with explicit dat,
+    key, and log paths, with the default filenames
+    being used.
+
+    @param dir_path The path to the data file.
+
+*/
+template<
+    class Hasher,
+    class File = native_file,
+    class... Args
+>
+void
+create(
+    path_type const& dir_path,
+    std::uint64_t appnum,
+    std::uint64_t salt,
+    nsize_t key_size,
+    nsize_t blockSize,
+    float load_factor,
+    error_code& ec,
+    Args&&... args);
+
 } // nudb
 
 #include <nudb/impl/create.ipp>

include/nudb/detail/format.hpp

@@ -46,6 +46,24 @@ value size          up to 32 bits (or 32-bit builds can't read it)
 
 static std::size_t constexpr currentVersion = 2;
 
+inline
+const path_type& default_dat_file() {
+  static const path_type ddf("nudb.dat");
+  return ddf;
+}
+
+inline
+const path_type& default_key_file() {
+  static const path_type dkf("nudb.key");
+  return dkf;
+}
+
+inline
+const path_type& default_log_file() {
+  static const path_type dkf("nudb.log");
+  return dkf;
+}
+
 struct dat_file_header
 {
     static std::size_t constexpr size =

include/nudb/error.hpp

@@ -221,7 +221,10 @@ enum class error
     size_mismatch,
 
     /// duplicate value
-    duplicate_value
+    duplicate_value,
+
+    /// directory not found
+    dir_not_found
 };
 
 /// Returns the error category used for database error codes.

include/nudb/file.hpp

@@ -50,6 +50,24 @@ enum class file_mode
     write
 };
 
+// Return boolean indicating if path exists
+bool path_exists(path_type const& path);
+
+// Return boolean indicating if path is a directory
+bool is_dir(path_type const& path);
+
+// Recursively make the specified dir tree
+bool mkdir_p(path_type const& path);
+
+// Append an rel-path to a local filesystem path.
+// The returned path is normalized for the platform.
+path_type
+path_cat(
+    path_type const& base,
+    path_type const& path);
+
 } // nudb
 
+#include <nudb/impl/file.ipp>
+
 #endif

include/nudb/impl/basic_store.ipp

@@ -784,6 +784,32 @@ flush()
         ecb_.store(true);
 }
 
+template<class Hasher, class File, class... Args>
+void
+open_dir(
+    path_type const& dir_path,
+    basic_store<Hasher, File>& store,
+    error_code& ec,
+    Args&&... args)
+{
+  if(is_dir(dir_path)){
+    ec = error::dir_not_found;
+    return;
+  }
+
+  path_type dat_path = path_cat(dir_path,
+      detail::default_dat_file());
+
+  path_type key_path = path_cat(dir_path,
+      detail::default_key_file());
+
+  path_type log_path = path_cat(dir_path,
+      detail::default_log_file());
+
+  store.open(dat_path, key_path, log_path,
+      ec, args...);
+}
+
 } // nudb
 
 #endif

include/nudb/impl/create.ipp

@@ -158,6 +158,46 @@ fail:
         erase_file(log_path);
 }
 
+template<
+    class Hasher,
+    class File,
+    class... Args
+>
+void
+create(
+    path_type const& dir_path,
+    std::uint64_t appnum,
+    std::uint64_t salt,
+    nsize_t key_size,
+    nsize_t blockSize,
+    float load_factor,
+    error_code& ec,
+    Args&&... args)
+{
+  if(!is_dir(dir_path))
+      mkdir_p(dir_path);
+
+  path_type dat_path = path_cat(dir_path,
+      detail::default_dat_file());
+
+  path_type key_path = path_cat(dir_path,
+      detail::default_key_file());
+
+  path_type log_path = path_cat(dir_path,
+      detail::default_log_file());
+
+  create<Hasher, File, Args...>(dat_path,
+                                key_path,
+                                log_path,
+                                appnum,
+                                salt,
+                                key_size,
+                                blockSize,
+                                load_factor,
+                                ec,
+                                args...);
+}
+
 } // nudb
 
 #endif