From a8754c8129d6a382f600c03437ff347eb2b0a1a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:45:12 +0200 Subject: [PATCH] [Backport release-2.24] Revert "Enable array open v2 and query v3 by default." (#5044) Backport 0130764b4ba0fe68b2c4a6c637b4f7e3ac65bfeb from #5042. Co-authored-by: KiterLuc <67824247+KiterLuc@users.noreply.github.com> --- test/src/unit-capi-config.cc | 12 ++++++------ tiledb/api/c_api/config/config_api_external.h | 10 +++++----- tiledb/sm/config/config.cc | 4 ++-- tiledb/sm/cpp_api/config.h | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/src/unit-capi-config.cc b/test/src/unit-capi-config.cc index 34dca3c2fd3..ca4269d88a8 100644 --- a/test/src/unit-capi-config.cc +++ b/test/src/unit-capi-config.cc @@ -239,8 +239,8 @@ void check_save_to_file() { ss << "rest.retry_initial_delay_ms 500\n"; ss << "rest.server_address https://api.tiledb.com\n"; ss << "rest.server_serialization_format CAPNP\n"; - ss << "rest.use_refactored_array_open true\n"; - ss << "rest.use_refactored_array_open_and_query_submit true\n"; + ss << "rest.use_refactored_array_open false\n"; + ss << "rest.use_refactored_array_open_and_query_submit false\n"; ss << "sm.allow_separate_attribute_writes false\n"; ss << "sm.allow_updates_experimental false\n"; ss << "sm.check_coord_dups true\n"; @@ -578,13 +578,13 @@ TEST_CASE("C API: Test config iter", "[capi][config]") { CHECK(rc == TILEDB_OK); CHECK(error == nullptr); rc = tiledb_config_set( - config, "rest.use_refactored_array_open", "false", &error); + config, "rest.use_refactored_array_open", "true", &error); CHECK(rc == TILEDB_OK); CHECK(error == nullptr); rc = tiledb_config_set( config, "rest.use_refactored_array_open_and_query_submit", - "false", + "true", &error); CHECK(rc == TILEDB_OK); CHECK(error == nullptr); @@ -612,8 +612,8 @@ TEST_CASE("C API: Test config iter", "[capi][config]") { all_param_values["rest.load_metadata_on_array_open"] = "false"; all_param_values["rest.load_non_empty_domain_on_array_open"] = "false"; all_param_values["rest.load_enumerations_on_array_open"] = "false"; - all_param_values["rest.use_refactored_array_open"] = "false"; - all_param_values["rest.use_refactored_array_open_and_query_submit"] = "false"; + all_param_values["rest.use_refactored_array_open"] = "true"; + all_param_values["rest.use_refactored_array_open_and_query_submit"] = "true"; all_param_values["sm.allow_separate_attribute_writes"] = "false"; all_param_values["sm.allow_updates_experimental"] = "false"; all_param_values["sm.encryption_key"] = ""; diff --git a/tiledb/api/c_api/config/config_api_external.h b/tiledb/api/c_api/config/config_api_external.h index 0d1ef516823..5e0e8c6b312 100644 --- a/tiledb/api/c_api/config/config_api_external.h +++ b/tiledb/api/c_api/config/config_api_external.h @@ -680,13 +680,13 @@ TILEDB_EXPORT void tiledb_config_free(tiledb_config_t** config) TILEDB_NOEXCEPT; * with the open array
* **Default**: true * - `rest.use_refactored_array_open`
- * If true, the new REST routes and APIs for opening an array + * If true, the new, experimental REST routes and APIs for opening an array * will be used
- * **Default**: true + * **Default**: false * - `rest.use_refactored_array_open_and_query_submit`
- * If true, the new REST routes and APIs for opening an array and submitting - * a query will be used
- * **Default**: true + * If true, the new, experimental REST routes and APIs for opening an array + * and submitting a query will be used
+ * **Default**: false * - `rest.curl.buffer_size`
* Set curl buffer size for REST requests
* **Default**: 524288 (512KB) diff --git a/tiledb/sm/config/config.cc b/tiledb/sm/config/config.cc index 72378c06e39..69ce8565a85 100644 --- a/tiledb/sm/config/config.cc +++ b/tiledb/sm/config/config.cc @@ -94,8 +94,8 @@ const std::string Config::REST_CURL_VERBOSE = "false"; const std::string Config::REST_LOAD_ENUMERATIONS_ON_ARRAY_OPEN = "true"; const std::string Config::REST_LOAD_METADATA_ON_ARRAY_OPEN = "true"; const std::string Config::REST_LOAD_NON_EMPTY_DOMAIN_ON_ARRAY_OPEN = "true"; -const std::string Config::REST_USE_REFACTORED_ARRAY_OPEN = "true"; -const std::string Config::REST_USE_REFACTORED_QUERY_SUBMIT = "true"; +const std::string Config::REST_USE_REFACTORED_ARRAY_OPEN = "false"; +const std::string Config::REST_USE_REFACTORED_QUERY_SUBMIT = "false"; const std::string Config::SM_ALLOW_SEPARATE_ATTRIBUTE_WRITES = "false"; const std::string Config::SM_ALLOW_UPDATES_EXPERIMENTAL = "false"; const std::string Config::SM_ENCRYPTION_KEY = ""; diff --git a/tiledb/sm/cpp_api/config.h b/tiledb/sm/cpp_api/config.h index c9598aedb5c..02d8105bc59 100644 --- a/tiledb/sm/cpp_api/config.h +++ b/tiledb/sm/cpp_api/config.h @@ -857,14 +857,14 @@ class Config { * **Default**: true * - `rest.use_refactored_array_open`
* **Experimental**
- * If true, the new REST routes and APIs for opening an array + * If true, the new, experimental REST routes and APIs for opening an array * will be used
- * **Default**: true + * **Default**: false * - `rest.use_refactored_array_open_and_query_submit`
* **Experimental**
- * If true, the new REST routes and APIs for opening an array and - * submitting a query will be used
- * **Default**: true + * If true, the new, experimental REST routes and APIs for opening an array + * and submitting a query will be used
+ * **Default**: false * - `rest.curl.buffer_size`
* Set curl buffer size for REST requests
* **Default**: 524288 (512KB)