Remove status from some trivial functions in array and group directory.

Author: teo-tsirpanis

test/src/unit-cppapi-deletes.cc

@@ -437,15 +437,14 @@ void DeletesFx::check_delete_conditions(
   auto array_ptr = array->ptr()->array_;
 
   // Load delete conditions.
-  auto&& [st, delete_conditions, update_values] =
+  auto&& [delete_conditions, update_values] =
       array_ptr->opened_array()->load_delete_and_update_conditions();
-  REQUIRE(st.ok());
-  REQUIRE(delete_conditions->size() == qcs.size());
+  REQUIRE(delete_conditions.size() == qcs.size());
 
   for (uint64_t i = 0; i < qcs.size(); i++) {
     // Compare to negated condition.
     auto cmp = qcs[i].ptr()->query_condition_->negated_condition();
-    CHECK(tiledb::test::ast_equal(delete_conditions->at(i).ast(), cmp.ast()));
+    CHECK(tiledb::test::ast_equal(delete_conditions.at(i).ast(), cmp.ast()));
   }
 
   array->close();

test/src/unit-cppapi-update-queries.cc

@@ -208,17 +208,16 @@ void UpdatesFx::check_update_conditions(
   auto array_ptr = array->ptr()->array_;
 
   // Load delete conditions.
-  auto&& [st, conditions, update_values] =
+  auto&& [conditions, update_values] =
       array_ptr->opened_array()->load_delete_and_update_conditions();
-  REQUIRE(st.ok());
-  REQUIRE(conditions->size() == qcs.size());
+  REQUIRE(conditions.size() == qcs.size());
 
   for (uint64_t i = 0; i < qcs.size(); i++) {
     // Compare to negated condition.
     auto cmp = qcs[i].ptr()->query_condition_->negated_condition();
-    CHECK(tiledb::test::ast_equal(conditions->at(i).ast(), cmp.ast()));
+    CHECK(tiledb::test::ast_equal(conditions.at(i).ast(), cmp.ast()));
 
-    auto& loaded_update_values = update_values->at(i);
+    auto& loaded_update_values = update_values.at(i);
     for (uint64_t j = 0; j < uvs[i].size(); j++) {
       CHECK(uvs[i][j].field_name() == loaded_update_values[j].field_name());
     }

tiledb/sm/array/array.cc

@@ -110,10 +110,7 @@ Array::Array(
 /*                API                */
 /* ********************************* */
 
-tuple<
-    Status,
-    optional<std::vector<QueryCondition>>,
-    optional<std::vector<std::vector<UpdateValue>>>>
+tuple<std::vector<QueryCondition>, std::vector<std::vector<UpdateValue>>>
 OpenedArray::load_delete_and_update_conditions() {
   auto& locations = array_directory().delete_and_update_tiles_location();
   auto conditions = std::vector<QueryCondition>(locations.size());
@@ -151,7 +148,7 @@ OpenedArray::load_delete_and_update_conditions() {
 
     throw_if_not_ok(conditions[i].check(array_schema_latest()));
   });
-  return {Status::Ok(), conditions, update_values};
+  return {conditions, update_values};
 }
 
 Status Array::evolve_array_schema(

tiledb/sm/array/array.h

@@ -218,12 +218,9 @@ class OpenedArray {
   /**
    * Loads the delete and update conditions from storage.
    *
-   * @return Status, vector of the conditions, vector of the update values.
+   * @return vector of the conditions, vector of the update values.
    */
-  tuple<
-      Status,
-      optional<std::vector<QueryCondition>>,
-      optional<std::vector<std::vector<UpdateValue>>>>
+  tuple<std::vector<QueryCondition>, std::vector<std::vector<UpdateValue>>>
   load_delete_and_update_conditions();
 
  private:

tiledb/sm/array/array_directory.cc

@@ -410,22 +410,18 @@ Status ArrayDirectory::load() {
           consolidated_commit_uris_set_);
     } else {
       // Process root dir.
-      auto&& [st2, fragment_uris_v1_v11] =
-          load_root_dir_uris_v1_v11(root_dir_uris);
-      RETURN_NOT_OK(st2);
+      auto fragment_uris_v1_v11 = load_root_dir_uris_v1_v11(root_dir_uris);
 
       // Process commit dir.
-      auto&& [st3, fragment_uris_v12_or_higher] =
-          load_commits_dir_uris_v12_or_higher(
-              commits_dir_uris, consolidated_commit_uris.value());
-      RETURN_NOT_OK(st3);
+      auto fragment_uris_v12_or_higher = load_commits_dir_uris_v12_or_higher(
+          commits_dir_uris, consolidated_commit_uris.value());
 
       // Append the two fragment URI vectors together
-      unfiltered_fragment_uris_ = std::move(fragment_uris_v1_v11.value());
+      unfiltered_fragment_uris_ = std::move(fragment_uris_v1_v11);
       unfiltered_fragment_uris_.insert(
           unfiltered_fragment_uris_.end(),
-          fragment_uris_v12_or_higher.value().begin(),
-          fragment_uris_v12_or_higher.value().end());
+          fragment_uris_v12_or_higher.begin(),
+          fragment_uris_v12_or_higher.end());
 
       // Merge the fragment meta URIs.
       std::copy(
@@ -451,18 +447,15 @@ Status ArrayDirectory::load() {
 const ArrayDirectory::FilteredFragmentUris
 ArrayDirectory::filtered_fragment_uris(const bool full_overlap_only) const {
   // Compute fragment URIs and the vacuum file URIs to vacuum
-  auto&& [st, fragment_uris_to_vacuum, fragment_vac_uris_to_vacuum] =
+  auto&& [fragment_uris_to_vacuum, fragment_vac_uris_to_vacuum] =
       compute_uris_to_vacuum(full_overlap_only, unfiltered_fragment_uris_);
-  if (!st.ok()) {
-    throw std::logic_error(st.message());
-  }
 
   // Compute commit URIs to vacuum, which only need to be done for fragment
   // vacuuming mode.
   std::vector<URI> commit_uris_to_vacuum;
   std::vector<URI> commit_uris_to_ignore;
   if (mode_ == ArrayDirectoryMode::VACUUM_FRAGMENTS) {
-    for (auto& uri : fragment_uris_to_vacuum.value()) {
+    for (auto& uri : fragment_uris_to_vacuum) {
       auto commit_uri = get_commit_uri(uri);
       if (consolidated_commit_uris_set_.count(commit_uri.c_str()) == 0) {
         commit_uris_to_vacuum.emplace_back(commit_uri);
@@ -473,20 +466,15 @@ ArrayDirectory::filtered_fragment_uris(const bool full_overlap_only) const {
   }
 
   // Compute filtered fragment URIs
-  auto&& [st2, fragment_filtered_uris] = compute_filtered_uris(
-      full_overlap_only,
-      unfiltered_fragment_uris_,
-      fragment_uris_to_vacuum.value());
-  if (!st2.ok()) {
-    throw std::logic_error(st.message());
-  }
+  auto fragment_filtered_uris = compute_filtered_uris(
+      full_overlap_only, unfiltered_fragment_uris_, fragment_uris_to_vacuum);
 
   return FilteredFragmentUris(
-      std::move(fragment_uris_to_vacuum.value()),
+      std::move(fragment_uris_to_vacuum),
       std::move(commit_uris_to_vacuum),
       std::move(commit_uris_to_ignore),
-      std::move(fragment_vac_uris_to_vacuum.value()),
-      std::move(fragment_filtered_uris.value()));
+      std::move(fragment_vac_uris_to_vacuum),
+      std::move(fragment_filtered_uris));
 }
 
 const std::vector<URI>& ArrayDirectory::fragment_meta_uris() const {
@@ -610,16 +598,14 @@ std::vector<URI> ArrayDirectory::list_root_dir_uris() {
   return ls(uri_);
 }
 
-tuple<Status, optional<std::vector<URI>>>
-ArrayDirectory::load_root_dir_uris_v1_v11(
+std::vector<URI> ArrayDirectory::load_root_dir_uris_v1_v11(
     const std::vector<URI>& root_dir_uris) {
   // Compute the fragment URIs
-  auto&& [st1, fragment_uris] = compute_fragment_uris_v1_v11(root_dir_uris);
-  RETURN_NOT_OK_TUPLE(st1, nullopt);
+  auto fragment_uris = compute_fragment_uris_v1_v11(root_dir_uris);
 
   fragment_meta_uris_ = compute_fragment_meta_uris(root_dir_uris);
 
-  return {Status::Ok(), fragment_uris.value()};
+  return fragment_uris;
 }
 
 std::vector<URI> ArrayDirectory::list_commits_dir_uris() {
@@ -628,8 +614,7 @@ std::vector<URI> ArrayDirectory::list_commits_dir_uris() {
   return ls(uri_.join_path(constants::array_commits_dir_name));
 }
 
-tuple<Status, optional<std::vector<URI>>>
-ArrayDirectory::load_commits_dir_uris_v12_or_higher(
+std::vector<URI> ArrayDirectory::load_commits_dir_uris_v12_or_higher(
     const std::vector<URI>& commits_dir_uris,
     const std::vector<URI>& consolidated_uris) {
   std::vector<URI> fragment_uris;
@@ -682,7 +667,7 @@ ArrayDirectory::load_commits_dir_uris_v12_or_higher(
     }
   }
 
-  return {Status::Ok(), fragment_uris};
+  return fragment_uris;
 }
 
 std::vector<URI>
@@ -827,18 +812,12 @@ void ArrayDirectory::load_array_meta_uris() {
   }
 
   // Compute array metadata URIs and vacuum URIs to vacuum. */
-  auto&& [st1, array_meta_uris_to_vacuum, array_meta_vac_uris_to_vacuum] =
+  std::tie(array_meta_uris_to_vacuum_, array_meta_vac_uris_to_vacuum_) =
       compute_uris_to_vacuum(true, array_meta_dir_uris);
-  throw_if_not_ok(st1);
-  array_meta_uris_to_vacuum_ = std::move(array_meta_uris_to_vacuum.value());
-  array_meta_vac_uris_to_vacuum_ =
-      std::move(array_meta_vac_uris_to_vacuum.value());
 
   // Compute filtered array metadata URIs
-  auto&& [st2, array_meta_filtered_uris] = compute_filtered_uris(
+  array_meta_uris_ = compute_filtered_uris(
       true, array_meta_dir_uris, array_meta_uris_to_vacuum_);
-  throw_if_not_ok(st2);
-  array_meta_uris_ = std::move(array_meta_filtered_uris.value());
   array_meta_dir_uris.clear();
 }
 
@@ -901,8 +880,7 @@ void ArrayDirectory::load_commits_uris_to_consolidate(
   }
 }
 
-tuple<Status, optional<std::vector<URI>>>
-ArrayDirectory::compute_fragment_uris_v1_v11(
+std::vector<URI> ArrayDirectory::compute_fragment_uris_v1_v11(
     const std::vector<URI>& array_dir_uris) const {
   std::vector<URI> fragment_uris;
 
@@ -937,7 +915,7 @@ ArrayDirectory::compute_fragment_uris_v1_v11(
     }
   }
 
-  return {Status::Ok(), fragment_uris};
+  return fragment_uris;
 }
 
 std::vector<URI> ArrayDirectory::compute_fragment_meta_uris(
@@ -994,7 +972,7 @@ bool ArrayDirectory::timestamps_overlap(
   }
 }
 
-tuple<Status, optional<std::vector<URI>>, optional<std::vector<URI>>>
+tuple<std::vector<URI>, std::vector<URI>>
 ArrayDirectory::compute_uris_to_vacuum(
     const bool full_overlap_only, const std::vector<URI>& uris) const {
   // Get vacuum URIs
@@ -1095,19 +1073,18 @@ ArrayDirectory::compute_uris_to_vacuum(
       vac_uris_to_vacuum.emplace_back(vac_files[i]);
   }
 
-  return {Status::Ok(), uris_to_vacuum, vac_uris_to_vacuum};
+  return {uris_to_vacuum, vac_uris_to_vacuum};
 }
 
-tuple<Status, optional<std::vector<TimestampedURI>>>
-ArrayDirectory::compute_filtered_uris(
+std::vector<TimestampedURI> ArrayDirectory::compute_filtered_uris(
     const bool full_overlap_only,
     const std::vector<URI>& uris,
     const std::vector<URI>& to_ignore) const {
   std::vector<TimestampedURI> filtered_uris;
 
   // Do nothing if there are not enough URIs
   if (uris.empty()) {
-    return {Status::Ok(), filtered_uris};
+    return filtered_uris;
   }
 
   // Get the URIs that must be ignored
@@ -1156,7 +1133,7 @@ ArrayDirectory::compute_filtered_uris(
   // Sort the names based on the timestamps
   std::sort(filtered_uris.begin(), filtered_uris.end());
 
-  return {Status::Ok(), filtered_uris};
+  return filtered_uris;
 }
 
 Status ArrayDirectory::compute_array_schema_uris(

tiledb/sm/array/array_directory.h

@@ -323,7 +323,7 @@ class ArrayDirectory {
    *
    * @param array_schema_uri The URI path of the array schema.
    * @param encryption_key The encryption key to use.
-   * @return Status, the loaded array schema
+   * @return the loaded array schema
    */
   static shared_ptr<ArraySchema> load_array_schema_from_uri(
       ContextResources& resources,
@@ -348,7 +348,7 @@ class ArrayDirectory {
    * @param array_dir The ArrayDirectory object used to retrieve the
    *     various URIs in the array directory.
    * @param encryption_key The encryption key to use.
-   * @return Status, a new ArraySchema
+   * @return a new ArraySchema
    */
   shared_ptr<ArraySchema> load_array_schema_latest(
       const EncryptionKey& encryption_key,
@@ -361,10 +361,8 @@ class ArrayDirectory {
    * @param array_dir The ArrayDirectory object used to retrieve the
    *     various URIs in the array directory.
    * @param encryption_key The encryption key to use.
-   * @return tuple of Status, latest array schema and all array schemas.
-   *   Status Ok on success, else error
-   *   ArraySchema The latest array schema.
-   *   ArraySchemaMap Map of all array schemas loaded, keyed by name
+   * @return tuple of latest array schema and all array schemas loaded, keyed by
+   * name.
    */
   tuple<
       shared_ptr<ArraySchema>,
@@ -377,10 +375,7 @@ class ArrayDirectory {
    * Loads all schemas of an array from persistent storage into memory.
    *
    * @param encryption_key The encryption key to use.
-   * @return tuple of Status and optional unordered map. If Status is an error
-   * the unordered_map will be nullopt
-   *        Status Ok on success, else error
-   *        ArraySchemaMap Map of all array schemas found keyed by name
+   * @return Map of all array schemas found keyed by name
    */
   std::unordered_map<std::string, shared_ptr<ArraySchema>>
   load_all_array_schemas(
@@ -663,9 +658,9 @@ class ArrayDirectory {
   /**
    * Loads the root directory uris for v1 to v11.
    *
-   * @return Status, vector of fragment URIs.
+   * @return vector of fragment URIs.
    */
-  tuple<Status, optional<std::vector<URI>>> load_root_dir_uris_v1_v11(
+  std::vector<URI> load_root_dir_uris_v1_v11(
       const std::vector<URI>& root_dir_uris);
 
   /**
@@ -678,9 +673,9 @@ class ArrayDirectory {
   /**
    * Loads the commit directory uris for v12 or higher.
    *
-   * @return Status, vector of fragment URIs.
+   * @return vector of fragment URIs.
    */
-  tuple<Status, optional<std::vector<URI>>> load_commits_dir_uris_v12_or_higher(
+  std::vector<URI> load_commits_dir_uris_v12_or_higher(
       const std::vector<URI>& commits_dir_uris,
       const std::vector<URI>& consolidated_uris);
 
@@ -722,7 +717,7 @@ class ArrayDirectory {
    * Computes the fragment URIs from the input array directory URIs, for
    * versions 1 to 11.
    */
-  tuple<Status, optional<std::vector<URI>>> compute_fragment_uris_v1_v11(
+  std::vector<URI> compute_fragment_uris_v1_v11(
       const std::vector<URI>& array_dir_uris) const;
 
   /**
@@ -736,11 +731,10 @@ class ArrayDirectory {
    *
    * @param full_overlap_only Only enable full overlap.
    * @param uris The URIs to calculate the URIs to vacuum from.
-   * @return Status, a vector of the URIs to vacuum, a vector of
-   *     the vac file URIs to vacuum.
+   * @return a vector of the URIs to vacuum, a vector of the vac file URIs to
+   * vacuum.
    */
-  tuple<Status, optional<std::vector<URI>>, optional<std::vector<URI>>>
-  compute_uris_to_vacuum(
+  tuple<std::vector<URI>, std::vector<URI>> compute_uris_to_vacuum(
       const bool full_overlap_only, const std::vector<URI>& uris) const;
 
   /**
@@ -750,9 +744,9 @@ class ArrayDirectory {
    * @param full_overlap_only Only enable full overlap.
    * @param uris The URIs to filter.
    * @param to_ignore The URIs to ignore (because they are vacuumed).
-   * @return Status, vector of filtered timestamped URIs.
+   * @return vector of filtered timestamped URIs.
    */
-  tuple<Status, optional<std::vector<TimestampedURI>>> compute_filtered_uris(
+  std::vector<TimestampedURI> compute_filtered_uris(
       const bool full_overlap_only,
       const std::vector<URI>& uris,
       const std::vector<URI>& to_ignore) const;