From c5a559e77b7c4848e2a21f09b180bca41991438d Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Sat, 15 Jul 2023 21:55:47 +0100 Subject: [PATCH] remove arrow2 deps --- Cargo.lock | 39 ++++++++------------------------------- connectorx/Cargo.toml | 14 +------------- 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 522bdd5f9..84ddbbf1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -253,28 +253,6 @@ dependencies = [ "zstd 0.12.3+zstd.1.5.2", ] -[[package]] -name = "arrow2" -version = "0.17.3" -source = "git+https://github.com/jorgecarleitao/arrow2#589b3f842bb2092cbddc41bea05039898a0db74d" -dependencies = [ - "ahash 0.8.3", - "bytemuck", - "chrono", - "dyn-clone", - "either", - "ethnum", - "foreign_vec", - "getrandom 0.2.10", - "hash_hasher", - "lexical-core", - "multiversion 0.7.2", - "num-traits", - "rustc_version", - "simdutf8", - "strength_reduce", -] - [[package]] name = "async-channel" version = "1.9.0" @@ -871,7 +849,6 @@ version = "0.3.2-alpha.7" dependencies = [ "anyhow", "arrow", - "arrow2 0.17.3 (git+https://github.com/jorgecarleitao/arrow2)", "bb8", "bb8-tiberius", "chrono", @@ -3268,7 +3245,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52f7b885c589dd7184c881be3dfb149feb1f405083fdd2fd9194e8f96104b76" dependencies = [ - "arrow2 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arrow2", "hashbrown 0.14.0", "multiversion 0.7.2", "num-traits", @@ -3283,7 +3260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f98d6b1ef5362f76063b4984634d371de72f4834f50892944d48fd7b7d5ae45" dependencies = [ "ahash 0.8.3", - "arrow2 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arrow2", "bitflags", "chrono", "comfy-table 7.0.1", @@ -3312,7 +3289,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1557cd24b1865194bac6979765cfec5e97ecd8af5dcb7858a17b31d1e7fbf70" dependencies = [ - "arrow2 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arrow2", "regex", "thiserror", ] @@ -3324,7 +3301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c44b1c6d7b2c04e459effb93bac050f90762687cb752c534967476c452478a65" dependencies = [ "ahash 0.8.3", - "arrow2 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arrow2", "async-trait", "bytes", "chrono", @@ -3377,7 +3354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06dd95bc84a7bf17886670420097c5fb8b88906ebb16653153ce5f0cf71ffd6e" dependencies = [ "argminmax", - "arrow2 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arrow2", "either", "indexmap 2.0.0", "memchr", @@ -3414,7 +3391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58f0837dac2b7064e04a2a37a2bff20f75a455d23b29f2dd82f0345de62d3bfb" dependencies = [ "ahash 0.8.3", - "arrow2 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arrow2", "once_cell", "polars-arrow", "polars-core", @@ -3434,7 +3411,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46235f6f67005fff3fd8095b994e86f846b5affd6fc6f36f41099a4dbc27d714" dependencies = [ - "arrow2 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arrow2", "polars-error", "polars-utils", ] @@ -3460,7 +3437,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02488938edfbff6efed56a4f90ebd6574ea16a7d32b6dc678134624031f7f3e9" dependencies = [ - "arrow2 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arrow2", "atoi", "chrono", "now", diff --git a/connectorx/Cargo.toml b/connectorx/Cargo.toml index fb7b544cd..f02393f55 100644 --- a/connectorx/Cargo.toml +++ b/connectorx/Cargo.toml @@ -23,18 +23,6 @@ serde_json = "1" chrono = "0.4" arrow = {version = "26", optional = true, features = ["prettyprint", "ffi"]} -#arrow2 = {version = "0.10", default-features = false, optional = true} -arrow2 = {git = "https://github.com/jorgecarleitao/arrow2", version = "0.17", default-features = false, optional = true, features = [ - "compute_aggregate", - "compute_arithmetics", - "compute_boolean", - "compute_boolean_kleene", - "compute_cast", - "compute_comparison", - "compute_concatenate", - "compute_filter", - "compute_if_then_else", -]} bb8 = {version = "0.7", optional = true} bb8-tiberius = {version = "0.5", optional = true} csv = {version = "1", optional = true} @@ -84,7 +72,7 @@ all = ["src_sqlite", "src_postgres", "src_mysql", "src_mssql", "src_oracle", "sr branch = [] default = ["fptr"] dst_arrow = ["arrow"] -dst_arrow2 = ["arrow2", "polars"] +dst_arrow2 = ["polars"] fptr = [] src_bigquery = ["gcp-bigquery-client", "tokio"] src_csv = ["csv", "regex"]