Undo default argument, add ArraySchema::load_schema_with_config

TileDB-Inc · Oct 25, 2024 · 754f239 · 754f239
1 parent 0bf188d
commit 754f239
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/test/src/unit-cppapi-enumerations.cc b/test/src/unit-cppapi-enumerations.cc
@@ -363,7 +363,7 @@ TEST_CASE_METHOD(
     Config config;
     config["rest.load_enumerations_on_array_open"] = "true";
 
-    auto schema = Array::load_schema(ctx_, uri_, config);
+    auto schema = Array::load_schema_with_config(ctx_, config, uri_);
     auto enmr = ArraySchemaExperimental::get_enumeration_if_loaded(
         ctx_, schema, "an_enumeration");
     REQUIRE(enmr.has_value());

diff --git a/tiledb/sm/cpp_api/array.h b/tiledb/sm/cpp_api/array.h
@@ -697,26 +697,46 @@ class Array {
     create(schema.context(), uri, schema);
   }
 
+  /**
+   * Loads the array schema from an array.
+   *
+   * **Example:**
+   * @code{.cpp}
+   * auto schema = tiledb::Array::load_schema(ctx,
+   * "s3://bucket-name/array-name");
+   * @endcode
+   *
+   * @param ctx The TileDB context.
+   * @param uri The array URI.
+   * @return The loaded ArraySchema object.
+   */
+  static ArraySchema load_schema(const Context& ctx, const std::string& uri) {
+    tiledb_array_schema_t* schema;
+    ctx.handle_error(
+        tiledb_array_schema_load(ctx.ptr().get(), uri.c_str(), &schema));
+    return ArraySchema(ctx, schema);
+  }
+
   /**
    * Loads the array schema from an array.
    * Options to load additional features are read from the optionally-provided
    * `config`. See `tiledb_array_schema_load_with_config`.
    *
    * **Example:**
    * @code{.cpp}
-   * auto schema = tiledb::Array::load_schema(ctx,
+   * tiledb::Config config;
+   * config["rest.load_enumerations_on_array_open"] = "true";
+   * auto schema = tiledb::Array::load_schema_with_config(ctx, config,
    * "s3://bucket-name/array-name");
    * @endcode
    *
    * @param ctx The TileDB context.
+   * @param config The request for additional features.
    * @param uri The array URI.
-   * @param config The optional request for additional features.
    * @return The loaded ArraySchema object.
    */
-  static ArraySchema load_schema(
-      const Context& ctx,
-      const std::string& uri,
-      const Config& config = Config()) {
+  static ArraySchema load_schema_with_config(
+      const Context& ctx, const Config& config, const std::string& uri) {
     tiledb_array_schema_t* schema;
     ctx.handle_error(tiledb_array_schema_load_with_config(
         ctx.ptr().get(), config.ptr().get(), uri.c_str(), &schema));