diff --git a/cmake/Options/TileDBToolchain.cmake b/cmake/Options/TileDBToolchain.cmake index 08ca8654ba8..3882d83eda4 100644 --- a/cmake/Options/TileDBToolchain.cmake +++ b/cmake/Options/TileDBToolchain.cmake @@ -36,7 +36,7 @@ if (NOT DEFINED CMAKE_TOOLCHAIN_FILE) # Inspired from https://github.com/Azure/azure-sdk-for-cpp/blob/azure-core_1.10.3/cmake-modules/AzureVcpkg.cmake message("TILEDB_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # To help with resolving conflicts, when you update the commit, also update its date. - set(VCPKG_COMMIT_STRING 3b9d086009cc1c2256e9c28ad44a00036fbd9b26) # 2025-10-24 + set(VCPKG_COMMIT_STRING dd930e314f529c86d2703a60d5ea7dd6573d9e5a) # 2026-2-19 message("Vcpkg commit string used: ${VCPKG_COMMIT_STRING}") include(FetchContent) FetchContent_Declare( diff --git a/tiledb/sm/filesystem/azure.cc b/tiledb/sm/filesystem/azure.cc index 9788e2e2271..7b606265748 100644 --- a/tiledb/sm/filesystem/azure.cc +++ b/tiledb/sm/filesystem/azure.cc @@ -322,6 +322,9 @@ void Azure::AzureClientSingleton::ensure_initialized( options.Retry.RetryDelay = params.retry_delay_; options.Retry.MaxRetryDelay = params.max_retry_delay_; options.Transport.Transport = create_transport(params.ssl_cfg_); + // TODO: Remove this when azurite updates to support the latest Azure API. + // https://github.com/Azure/Azurite/pull/2629 + options.ApiVersion = "2025-11-05"; // Construct the Azure service credential. auto credential = @@ -350,6 +353,8 @@ void Azure::AzureClientSingleton::ensure_initialized( ::Azure::Storage::Files::DataLake::DataLakeClientOptions data_lake_options; data_lake_options.Retry = options.Retry; data_lake_options.Transport = options.Transport; + // TODO: Remove this when azurite updates to support the latest Azure API. + data_lake_options.ApiVersion = options.ApiVersion; data_lake_client_ = make_service_client( GetDfsUrlFromUrl(params.blob_endpoint_), credential, data_lake_options); @@ -1214,7 +1219,8 @@ LsObjects Azure::list_blobs_impl( recursive ? "" : "/", {.Prefix = blob_path, .ContinuationToken = to_azure_nullable(continuation_token), - .PageSizeHint = max_keys}); + .PageSizeHint = max_keys, + .StartFrom = {}}); continuation_token = from_azure_nullable(response.NextPageToken); result.reserve(response.Blobs.size() + response.BlobPrefixes.size()); diff --git a/tiledb/sm/serialization/tiledb-rest.capnp.h b/tiledb/sm/serialization/tiledb-rest.capnp.h index 4c1b95d85b7..0b92ea1f72f 100644 --- a/tiledb/sm/serialization/tiledb-rest.capnp.h +++ b/tiledb/sm/serialization/tiledb-rest.capnp.h @@ -9,7 +9,7 @@ #ifndef CAPNP_VERSION #error \ "CAPNP_VERSION is not defined, is capnp/generated-header-support.h missing?" -#elif CAPNP_VERSION != 1002000 +#elif CAPNP_VERSION != 1003000 #error \ "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library." #endif diff --git a/vcpkg.json b/vcpkg.json index 5791834fb0a..d5839c4d18a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,5 @@ { - "builtin-baseline": "3b9d086009cc1c2256e9c28ad44a00036fbd9b26", + "builtin-baseline": "dd930e314f529c86d2703a60d5ea7dd6573d9e5a", "dependencies": [ { "name": "blosc2",