Show errant values in current-domain out-of-bounds error message

test/src/test-cppapi-current-domain.cc

@@ -468,7 +468,7 @@ TEST_CASE_METHOD(
   CHECK_THROWS_WITH(
       query_read2.submit(),
       Catch::Matchers::ContainsSubstring(
-          "A range was set outside of the current domain."));
+          "was set outside of the current domain"));
 
   tiledb::Query query_read3(ctx_, array_read, TILEDB_READ);
   tiledb::Subarray subarray_read3(ctx_, array_read);
@@ -483,7 +483,7 @@ TEST_CASE_METHOD(
   CHECK_THROWS_WITH(
       query_read3.submit(),
       Catch::Matchers::ContainsSubstring(
-          "A range was set outside of the current domain."));
+          "was set outside of the current domain"));
 
   array_read.close();
 
@@ -588,7 +588,7 @@ TEST_CASE_METHOD(
       .set_data_buffer("a", a_with_cd2)
       .set_data_buffer("dim1", dim1_with_cd2);
   auto matcher = Catch::Matchers::ContainsSubstring(
-      "A range was set outside of the current domain.");
+      "was set outside of the current domain");
   REQUIRE_THROWS_WITH(query_for_cd2.submit(), matcher);
   array_with_cd2.close();
 

tiledb/sm/array_schema/current_domain.cc

@@ -408,6 +408,17 @@ void CurrentDomain::expand_to_tiles(
   }
 }
 
+std::string CurrentDomain::as_string() const {
+  if (type_ == CurrentDomainType::NDRECTANGLE) {
+    return ndrectangle_->as_string();
+  } else {
+    // As of 2025-01-09 there is no other such type. When/if we do make such a
+    // type, we'd need to configure it to return a description of itself.
+    throw std::runtime_error(
+        "CurrentDomain::as_string of non-NDRectangle type is not implemented");
+  }
+}
+
 }  // namespace tiledb::sm
 
 std::ostream& operator<<(

tiledb/sm/array_schema/current_domain.h

@@ -219,6 +219,14 @@ class CurrentDomain {
    */
   void expand_to_tiles(const Domain& domain, NDRange& query_ndrange) const;
 
+  /**
+   * Returns a human-readable display of the current domain. Nominal use is
+   * to improve readability / actionability of out-of-bounds error messages.
+   *
+   * @return A string.
+   */
+  std::string as_string() const;
+
  private:
   /* ********************************* */
   /*         PRIVATE ATTRIBUTES        */

tiledb/sm/array_schema/ndrectangle.cc

@@ -181,6 +181,20 @@ Datatype NDRectangle::range_dtype_for_name(const std::string& name) const {
   return range_dtype(idx);
 }
 
+std::string NDRectangle::as_string() const {
+  std::stringstream ss;
+  ss << "[";
+  for (uint32_t i = 0; i < get_ndranges().size(); ++i) {
+    if (i > 0) {
+      ss << ",";
+    }
+    auto dtype = domain()->dimension_ptr(i)->type();
+    ss << range_str(get_range(i), dtype);
+  }
+  ss << "]";
+  return ss.str();
+}
+
 }  // namespace tiledb::sm
 
 std::ostream& operator<<(std::ostream& os, const tiledb::sm::NDRectangle& ndr) {

tiledb/sm/array_schema/ndrectangle.h

@@ -198,6 +198,14 @@ class NDRectangle {
    */
   Datatype range_dtype_for_name(const std::string& name) const;
 
+  /**
+   * Returns a human-readable display of the NDRectangle. Nominal use is
+   * to improve readability / actionability of out-of-bounds error messages.
+   *
+   * @return A string.
+   */
+  std::string as_string() const;
+
  private:
   /* ********************************* */
   /*         PRIVATE ATTRIBUTES        */

tiledb/sm/query/query.cc

@@ -859,8 +859,18 @@ Status Query::process() {
           // Make sure all ranges are contained in the current domain.
           for (auto& range : subarray_.ranges_for_dim(d)) {
             if (!cd->includes(d, range)) {
-              throw QueryException(
-                  "A range was set outside of the current domain.");
+              // No std::format:
+              // https://github.com/TileDB-Inc/TileDB/pull/5421#discussion_r1909405876
+              std::stringstream ss;
+              ss << "A range ";
+              ss << range_str(
+                  range, array_schema_->domain().dimension_ptr(d)->type());
+              ss << " on dimension '";
+              ss << array_schema_->domain().dimension_ptr(d)->name();
+              ss << "' was set outside of the current domain ";
+              ss << cd->as_string();
+              ss << ".";
+              throw QueryException(ss.str());
             }
           }
         } else if (!all_ned_contained_in_current_domain) {