Move boolean variant to LocalFilesystem base class.

Author: shaunrd0

tiledb/sm/filesystem/azure.cc

@@ -638,8 +638,8 @@ std::vector<std::string> Azure::ls(
   return paths;
 }
 
-std::vector<directory_entry> Azure::ls_with_sizes(const URI& uri, bool) const {
-  return ls_with_sizes(uri, std::string("/"));
+std::vector<directory_entry> Azure::ls_with_sizes(const URI& uri) const {
+  return ls_with_sizes(uri, "/");
 }
 
 std::vector<directory_entry> Azure::ls_with_sizes(

tiledb/sm/filesystem/azure.h

@@ -459,7 +459,7 @@ class Azure : public FilesystemBase {
    * @return All entries that are contained in the prefix URI.
    */
   std::vector<tiledb::common::filesystem::directory_entry> ls_with_sizes(
-      const URI& uri, bool get_sizes) const override;
+      const URI& uri) const override;
 
   /**
    * Lists objects and object information that start with `uri`.

tiledb/sm/filesystem/failing_fs.h

@@ -88,7 +88,7 @@ class FailingFS : public FilesystemBase {
   }
 
   virtual std::vector<tiledb::common::filesystem::directory_entry>
-  ls_with_sizes(const URI&, bool) const override {
+  ls_with_sizes(const URI&) const override {
     throw get_exception();
   }
 

tiledb/sm/filesystem/filesystem_base.h

@@ -151,7 +151,7 @@ class FilesystemBase {
    * @return All entries that are contained in the parent
    */
   virtual std::vector<tiledb::common::filesystem::directory_entry>
-  ls_with_sizes(const URI& parent, bool get_sizes = true) const = 0;
+  ls_with_sizes(const URI& parent) const = 0;
 
   /**
    * Lists objects and object information that start with `prefix`, invoking

tiledb/sm/filesystem/gcs.cc

@@ -510,7 +510,7 @@ std::vector<directory_entry> GCS::ls_with_sizes(
   return entries;
 }
 
-std::vector<directory_entry> GCS::ls_with_sizes(const URI& uri, bool) const {
+std::vector<directory_entry> GCS::ls_with_sizes(const URI& uri) const {
   return ls_with_sizes(uri, "/", -1);
 }
 

tiledb/sm/filesystem/gcs.h

@@ -358,7 +358,7 @@ class GCS : public FilesystemBase {
    * @return A list of directory_entry objects.
    */
   std::vector<tiledb::common::filesystem::directory_entry> ls_with_sizes(
-      const URI& uri, bool get_sizes) const override;
+      const URI& uri) const override;
 
   /**
    * Copies the directory at 'old_uri' to `new_uri`.

tiledb/sm/filesystem/local.cc

@@ -124,6 +124,20 @@ LsObjects LocalFilesystem::ls_filtered_v2(
   return qualifyingPaths;
 }
 
+Status LocalFilesystem::ls(
+    const std::string& path, std::vector<std::string>* paths) const {
+  for (auto& fs : ls_with_sizes(URI(path), false)) {
+    paths->emplace_back(fs.path().native());
+  }
+
+  return Status::Ok();
+}
+
+std::vector<filesystem::directory_entry> LocalFilesystem::ls_with_sizes(
+    const URI& uri) const {
+  return ls_with_sizes(uri, true);
+}
+
 void LocalFilesystem::copy_file(const URI& old_uri, const URI& new_uri) {
   std::filesystem::copy_file(
       old_uri.to_path(),

tiledb/sm/filesystem/local.h

@@ -53,6 +53,21 @@ class LocalFilesystem : public FilesystemBase {
       ResultFilterV2 result_filter,
       bool recursive) const override;
 
+  /**
+   * Lists files one level deep under a given path.
+   *
+   * @param path  The parent path to list sub-paths.
+   * @param paths Pointer to a vector of strings to store the retrieved paths.
+   * @return Status
+   */
+  Status ls(const std::string& path, std::vector<std::string>* paths) const;
+
+  std::vector<tiledb::common::filesystem::directory_entry> ls_with_sizes(
+      const URI& uri) const override;
+
+  virtual std::vector<tiledb::common::filesystem::directory_entry>
+  ls_with_sizes(const URI& uri, bool get_sizes) const = 0;
+
   void copy_file(const URI& old_uri, const URI& new_uri) override;
 
   void copy_dir(const URI& old_uri, const URI& new_uri) override;

tiledb/sm/filesystem/mem_filesystem.cc

@@ -381,15 +381,15 @@ Status MemFilesystem::ls(
     const std::string& path, std::vector<std::string>* const paths) const {
   iassert(paths);
 
-  for (auto& fs : ls_with_sizes(URI(path), true)) {
+  for (auto& fs : ls_with_sizes(URI(path))) {
     paths->emplace_back(fs.path().native());
   }
 
   return Status::Ok();
 }
 
 std::vector<directory_entry> MemFilesystem::ls_with_sizes(
-    const URI& path, bool) const {
+    const URI& path) const {
   auto abspath = path.to_path();
   std::vector<std::string> tokens = tokenize(abspath);
 

tiledb/sm/filesystem/mem_filesystem.h

@@ -159,7 +159,7 @@ class MemFilesystem : public FilesystemBase {
    * @return A list of directory_entry objects
    */
   std::vector<tiledb::common::filesystem::directory_entry> ls_with_sizes(
-      const URI& path, bool get_sizes) const override;
+      const URI& path) const override;
 
   /**
    * Move a given filesystem path.