Clean code

Author: shaunrd0

tiledb/sm/serialization/query.cc

@@ -280,23 +280,17 @@ Subarray subarray_from_capnp(
     auto dim = array->array_schema_latest().dimension_ptr(i);
 
     bool implicitly_initialized = range_reader.getHasDefaultRange();
-    range_subset[i] =
-        RangeSetAndSuperset(dim->type(), dim->domain(), true, coalesce_ranges);
+    range_subset[i] = RangeSetAndSuperset(
+        dim->type(), dim->domain(), implicitly_initialized, coalesce_ranges);
     is_default[i] = implicitly_initialized;
     if (range_reader.hasBufferSizes()) {
       auto ranges = range_buffers_from_capnp(range_reader);
       // If the range is implicitly initialized, the RangeSetAndSuperset
       // constructor will initialize the ranges to the domain.
       if (!implicitly_initialized) {
-        // Edge case for dimension labels where there are only label ranges set.
-        if (ranges.empty()) {
-          range_subset[i] = RangeSetAndSuperset(
-              dim->type(), dim->domain(), {dim->domain()}, coalesce_ranges);
-        } else {
-          // Add custom ranges, clearing any implicit ranges previously set.
-          range_subset[i] = RangeSetAndSuperset(
-              dim->type(), dim->domain(), ranges, coalesce_ranges);
-        }
+        // Add custom ranges, clearing any implicit ranges previously set.
+        range_subset[i] = RangeSetAndSuperset(
+            dim->type(), dim->domain(), ranges, coalesce_ranges);
       }
     } else {
       // Handle 1.7 style ranges where there is a single range with no sizes
@@ -325,7 +319,6 @@ Subarray subarray_from_capnp(
       // Set ranges for this dim label on the subarray
       label_range_subset[dim_index] = {
           label_name, dim->type(), label_ranges, coalesce_ranges};
-      range_subset[dim_index].clear();
       is_default[dim_index] = false;
     }
   }
@@ -361,7 +354,7 @@ Subarray subarray_from_capnp(
 
   auto frag_meta_size = array->opened_array()->fragment_metadata().size();
   return {
-      array,
+      array->opened_array(),
       layout,
       reader.hasStats() ? s.stats() : parent_stats,
       logger,

tiledb/sm/subarray/subarray.cc

@@ -151,7 +151,7 @@ Subarray::Subarray(
 }
 
 Subarray::Subarray(
-    const Array* array,
+    const shared_ptr<OpenedArray> opened_array,
     Layout layout,
     stats::Stats* stats,
     shared_ptr<Logger> logger,
@@ -163,7 +163,7 @@ Subarray::Subarray(
     bool coalesce_ranges)
     : stats_(stats)
     , logger_(std::move(logger))
-    , array_(array->opened_array())
+    , array_(opened_array)
     , layout_(layout)
     , cell_order_(array_->array_schema_latest().cell_order())
     , range_subset_(std::move(range_subset))
@@ -1791,20 +1791,6 @@ Status Subarray::set_ranges_for_dim(
   return Status::Ok();
 }
 
-void Subarray::set_label_ranges_for_dim(
-    const uint32_t dim_idx,
-    const std::string& name,
-    const std::vector<Range>& ranges) {
-  auto dim{array_->array_schema_latest().dimension_ptr(dim_idx)};
-  label_range_subset_[dim_idx] =
-      LabelRangeSubset(name, dim->type(), coalesce_ranges_);
-  for (const auto& range : ranges) {
-    throw_if_not_ok(
-        label_range_subset_[dim_idx].value().ranges_.add_range_unrestricted(
-            range));
-  }
-}
-
 Status Subarray::split(
     unsigned splitting_dim,
     const ByteVecValue& splitting_value,

tiledb/sm/subarray/subarray.h

@@ -342,7 +342,7 @@ class Subarray {
    *    with existing ranges as they are added
    */
   Subarray(
-      const Array* array,
+      const shared_ptr<OpenedArray> opened_array,
       Layout layout,
       stats::Stats* stats,
       shared_ptr<tiledb::common::Logger> logger,
@@ -1188,22 +1188,6 @@ class Subarray {
    */
   Status set_ranges_for_dim(uint32_t dim_idx, const std::vector<Range>& ranges);
 
-  /**
-   * Directly sets the dimension label ranges for the given dimension index,
-   * making a deep copy.
-   *
-   * @param dim_idx Index of dimension to set
-   * @param name Name of the dimension label to set
-   * @param ranges `Range` vector that will be copied and set
-   * @return Status
-   *
-   * @note Intended for serialization only
-   */
-  void set_label_ranges_for_dim(
-      const uint32_t dim_idx,
-      const std::string& name,
-      const std::vector<Range>& ranges);
-
   /**
    * Splits the subarray along the splitting dimension and value into
    * two new subarrays `r1` and `r2`.