From 1607c9a452d930e05ddfd4fd8a82721943ed5052 Mon Sep 17 00:00:00 2001
From: QP Hou <dave2008713@gmail.com>
Date: Wed, 23 Apr 2025 22:57:44 -0700
Subject: [PATCH] bump convergence to support string type (#394)

---
 Cargo.lock             |  4 ++--
 columnq/src/columnq.rs | 15 +++++++--------
 columnq/src/io/mod.rs  |  2 +-
 roapi/Cargo.toml       |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 071b5d0..d9d978b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2021,7 +2021,7 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 [[package]]
 name = "convergence"
 version = "0.16.0"
-source = "git+https://github.com/roapi/convergence.git?rev=da158f04d09460ff9416f3328df419ce01dbae77#da158f04d09460ff9416f3328df419ce01dbae77"
+source = "git+https://github.com/roapi/convergence.git?rev=5ddae0d849710eabb91118657758f8db17ac1886#5ddae0d849710eabb91118657758f8db17ac1886"
 dependencies = [
  "async-trait",
  "bytes",
@@ -2036,7 +2036,7 @@ dependencies = [
 [[package]]
 name = "convergence-arrow"
 version = "0.16.0"
-source = "git+https://github.com/roapi/convergence.git?rev=da158f04d09460ff9416f3328df419ce01dbae77#da158f04d09460ff9416f3328df419ce01dbae77"
+source = "git+https://github.com/roapi/convergence.git?rev=5ddae0d849710eabb91118657758f8db17ac1886#5ddae0d849710eabb91118657758f8db17ac1886"
 dependencies = [
  "async-trait",
  "chrono",
diff --git a/columnq/src/columnq.rs b/columnq/src/columnq.rs
index 5020db0..8b04080 100644
--- a/columnq/src/columnq.rs
+++ b/columnq/src/columnq.rs
@@ -17,10 +17,10 @@ use log::info;
 use object_store::aws::AmazonS3Builder;
 use object_store::azure::MicrosoftAzureBuilder;
 use object_store::gcp::GoogleCloudStorageBuilder;
-use object_store::{ClientOptions, DynObjectStore};
-use object_store::ObjectStore;
-use std::time::Duration;
 use object_store::http::HttpBuilder;
+use object_store::ObjectStore;
+use object_store::{ClientOptions, DynObjectStore};
+use std::time::Duration;
 use tokio::sync::mpsc;
 use url::Url;
 
@@ -221,11 +221,10 @@ impl ColumnQ {
             Some(host) => {
                 match blob_type {
                     BlobStoreType::Http => {
-                        let http_builder =
-                            HttpBuilder::new()
-                                .with_client_options(ClientOptions::new().with_allow_http(true))
-                                .with_url(url.origin().ascii_serialization());
-                        
+                        let http_builder = HttpBuilder::new()
+                            .with_client_options(ClientOptions::new().with_allow_http(true))
+                            .with_url(url.origin().ascii_serialization());
+
                         match http_builder.build() {
                             Ok(http) => Ok(Arc::new(http)),
                             Err(err) => Err(DataFusionError::External(Box::new(err))),
diff --git a/columnq/src/io/mod.rs b/columnq/src/io/mod.rs
index f06f601..c481293 100644
--- a/columnq/src/io/mod.rs
+++ b/columnq/src/io/mod.rs
@@ -62,7 +62,7 @@ impl TryFrom<&str> for BlobStoreType {
 
     fn try_from(scheme: &str) -> Result<Self, Self::Error> {
         match scheme {
-            "http" | "https" => Ok(BlobStoreType::Http), 
+            "http" | "https" => Ok(BlobStoreType::Http),
             "s3" => Ok(BlobStoreType::S3),
             "gs" => Ok(BlobStoreType::GCS),
             "az" | "adl" | "adfs" | "adfss" | "azure" => Ok(BlobStoreType::Azure),
diff --git a/roapi/Cargo.toml b/roapi/Cargo.toml
index 3a16ceb..e8f6757 100644
--- a/roapi/Cargo.toml
+++ b/roapi/Cargo.toml
@@ -60,12 +60,12 @@ mime_guess = { version = "2", optional = true }
 [dependencies.convergence]
 version = "0"
 git = "https://github.com/roapi/convergence.git"
-rev = "da158f04d09460ff9416f3328df419ce01dbae77"
+rev = "5ddae0d849710eabb91118657758f8db17ac1886"
 
 [dependencies.convergence-arrow]
 version = "0"
 git = "https://github.com/roapi/convergence.git"
-rev = "da158f04d09460ff9416f3328df419ce01dbae77"
+rev = "5ddae0d849710eabb91118657758f8db17ac1886"
 
 [features]
 default = ["rustls", "snmalloc"]