CodeCow/roapi
1
0
Fork 0
mirror of https://github.com/roapi/roapi.git synced 2026-06-05 21:04:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bump convergence to support string type (#394)
Some checks failed
build / build (push) Has been cancelled
Details
build / build_ui (push) Has been cancelled
Details
build / database_test (push) Has been cancelled
Details
build / object_store_memory_test (push) Has been cancelled
Details
build / object_store_direct_test (push) Has been cancelled
Details
build / openssl_build (push) Has been cancelled
Details
build / mac_cross_build (push) Has been cancelled
Details
build / Docker Image Build (push) Has been cancelled
Details
columnq-cli release / Validate git tag (push) Has been cancelled
Details
roapi release / Validate git tag (push) Has been cancelled
Details
columnq-cli release / macos (push) Has been cancelled
Details
columnq-cli release / windows (map[features:database-sqlite python-architecture:x64 target:x86_64-pc-windows-msvc]) (push) Has been cancelled
Details
columnq-cli release / linux (map[features:rustls,database-sqlite image_tag:aarch64-musl manylinux:2014 name_suffix: target:aarch64-unknown-linux-musl upload:true]) (push) Has been cancelled
Details
columnq-cli release / linux (map[features:rustls,database-sqlite image_tag:x86_64-musl manylinux:2010 name_suffix: target:x86_64-unknown-linux-musl upload:true]) (push) Has been cancelled
Details
columnq-cli release / PyPI Release (push) Has been cancelled
Details
roapi release / macos (push) Has been cancelled
Details
roapi release / windows (map[features:database-sqlite python-architecture:x64 target:x86_64-pc-windows-msvc]) (push) Has been cancelled
Details
roapi release / linux (map[features:rustls,database-sqlite image_tag:aarch64-musl manylinux:2014 name_suffix: target:aarch64-unknown-linux-musl upload:true]) (push) Has been cancelled
Details
roapi release / linux (map[features:rustls,database-sqlite image_tag:x86_64-musl manylinux:2010 name_suffix: target:x86_64-unknown-linux-musl upload:true]) (push) Has been cancelled
Details
roapi release / PyPI Release (push) Has been cancelled
Details
roapi release / Docker Image Release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
QP Hou 2025-04-23 22:57:44 -07:00 committed by GitHub
parent 3707a7c094
commit 1607c9a452
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -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",

15
columnq/src/columnq.rs
View File

@ -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))),

2
columnq/src/io/mod.rs
View File

@ -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),

4
roapi/Cargo.toml
View File

@ -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"]