Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: Use workspace dep inheritance for datafusion instead of shim crate

pull/24376/head
Carol (Nichols || Goulding) 2022-10-24 13:47:45 -04:00
parent 474620f4a7
commit 44936f661a
No known key found for this signature in database
GPG Key ID: E907EE5A736F87D4
23 changed files with 51 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Cargo.lock generated
View File

@ -197,7 +197,7 @@ dependencies = [
"arrow-flight",
"chrono",
"comfy-table",
"datafusion 0.1.0",
"datafusion",
"hashbrown",
"num-traits",
"rand",
@ -767,7 +767,7 @@ dependencies = [
"backoff",
"bytes",
"data_types",
"datafusion 0.1.0",
"datafusion",
"futures",
"generated_types",
"iox_catalog",
@ -1125,15 +1125,6 @@ dependencies = [
"workspace-hack",
]
[[package]]
name = "datafusion"
version = "0.1.0"
dependencies = [
"datafusion 13.0.0",
"datafusion-proto",
"workspace-hack",
]
[[package]]
name = "datafusion"
version = "13.0.0"
@ -1248,7 +1239,7 @@ source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc7
dependencies = [
"arrow",
"async-trait",
"datafusion 13.0.0",
"datafusion",
"datafusion-common",
"datafusion-expr",
"prost 0.11.0",
@ -1282,7 +1273,7 @@ name = "datafusion_util"
version = "0.1.0"
dependencies = [
"async-trait",
"datafusion 0.1.0",
"datafusion",
"futures",
"observability_deps",
"pin-project",
@ -1676,7 +1667,8 @@ dependencies = [
"base64",
"bytes",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion-proto",
"observability_deps",
"pbjson",
"pbjson-build",
@ -2143,7 +2135,7 @@ dependencies = [
"compactor",
"console-subscriber",
"data_types",
"datafusion 0.1.0",
"datafusion",
"dotenvy",
"flate2",
"futures",
@ -2291,7 +2283,7 @@ dependencies = [
"bytes",
"chrono",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"dml",
"flatbuffers",
@ -2435,7 +2427,7 @@ dependencies = [
"async-trait",
"chrono",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"executor",
"futures",
@ -2463,7 +2455,7 @@ dependencies = [
"arrow",
"bytes",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"futures",
"iox_catalog",
@ -3426,7 +3418,7 @@ dependencies = [
"base64",
"bytes",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"futures",
"generated_types",
@ -3452,7 +3444,7 @@ dependencies = [
name = "parquet_to_line_protocol"
version = "0.1.0"
dependencies = [
"datafusion 0.1.0",
"datafusion",
"futures",
"influxdb_line_protocol",
"mutable_batch",
@ -3654,7 +3646,7 @@ dependencies = [
"arrow",
"chrono",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"itertools",
"observability_deps",
@ -3915,7 +3907,7 @@ dependencies = [
"cache_system",
"client_util",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"futures",
"generated_types",
@ -3956,7 +3948,7 @@ version = "0.1.0"
dependencies = [
"arrow",
"chrono",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"itertools",
"observability_deps",
@ -3978,7 +3970,7 @@ dependencies = [
"async-trait",
"backoff",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"dml",
"futures",
@ -4485,7 +4477,7 @@ name = "service_common"
version = "0.1.0"
dependencies = [
"async-trait",
"datafusion 0.1.0",
"datafusion",
"iox_query",
"metric",
"parking_lot 0.12.1",
@ -4520,7 +4512,7 @@ dependencies = [
"arrow_util",
"bytes",
"data_types",
"datafusion 0.1.0",
"datafusion",
"futures",
"generated_types",
"iox_query",
@ -4547,7 +4539,7 @@ dependencies = [
"arrow",
"async-trait",
"data_types",
"datafusion 0.1.0",
"datafusion",
"datafusion_util",
"futures",
"generated_types",
@ -6008,11 +6000,11 @@ dependencies = [
"chrono",
"crossbeam-utils",
"crypto-common",
"datafusion",
"digest",
"either",
"fixedbitset",
"flatbuffers",
"flate2",
"futures-channel",
"futures-core",
"futures-sink",

5
Cargo.toml
View File

@ -8,7 +8,6 @@ members = [
"client_util",
"compactor",
"data_types",
"datafusion",
"datafusion_util",
"dml",
"executor",
@ -108,6 +107,10 @@ authors = ["IOx Project Developers"]
edition = "2021"
license = "MIT OR Apache-2.0"
[workspace.dependencies]
datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736", default-features = false }
datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736" }
# This profile optimizes for runtime performance and small binary size at the expense of longer
# build times. It's most suitable for final release builds.
[profile.release]

2
arrow_util/Cargo.toml
View File

@ -13,7 +13,7 @@ arrow = { version = "25.0.0", features = ["prettyprint", "dyn_cmp_dict"] }
# used by arrow anyway (needed for printing workaround)
chrono = { version = "0.4", default-features = false }
comfy-table = { version = "6.1", default-features = false }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
hashbrown = "0.12"
num-traits = "0.2"
snafu = "0.7"

2
compactor/Cargo.toml
View File

@ -11,7 +11,7 @@ async-trait = "0.1.58"
backoff = { path = "../backoff" }
bytes = "1.2"
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
futures = "0.3"
generated_types = { path = "../generated_types" }
iox_catalog = { path = "../iox_catalog" }

15
datafusion/Cargo.toml
View File

@ -1,15 +0,0 @@
[package]
name = "datafusion"
description = "Re-exports datafusion at a specific version"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
[dependencies]
# Rename to workaround doctest bug
# Turn off optional datafusion features (e.g. don't get support for crypto functions or avro)
upstream = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736", default-features = false, package = "datafusion" }
datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736" }
workspace-hack = { path = "../workspace-hack"}

4
datafusion/src/lib.rs
View File

@ -1,4 +0,0 @@
pub use upstream::*;
// Publically re-export datafusion-proto crate as well
pub use datafusion_proto;

2
datafusion_util/Cargo.toml
View File

@ -8,7 +8,7 @@ license.workspace = true
[dependencies]
async-trait = "0.1"
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
futures = "0.3"
observability_deps = { path = "../observability_deps" }
pin-project = "1.0"

7
generated_types/Cargo.toml
View File

@ -9,7 +9,8 @@ license.workspace = true
base64 = "0.13"
bytes = "1.2"
data_types = { path = "../data_types", optional = true }
datafusion = { path = "../datafusion", optional = true }
datafusion = { workspace = true, optional = true }
datafusion-proto = { workspace = true, optional = true }
observability_deps = { path = "../observability_deps" }
pbjson = "0.5"
pbjson-types = "0.5"
@ -28,9 +29,9 @@ pbjson-build = "0.5"
[dev-dependencies]
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
predicate = { path = "../predicate" }
[features]
default = ["data_types_conversions"]
data_types_conversions = ["data_types", "datafusion", "predicate"]
data_types_conversions = ["data_types", "datafusion", "datafusion-proto", "predicate"]

3
generated_types/src/ingester.rs
View File

@ -1,6 +1,7 @@
use crate::{google::FieldViolation, influxdata::iox::ingester::v1 as proto};
use data_types::TimestampRange;
use datafusion::{common::DataFusionError, datafusion_proto::bytes::Serializeable, prelude::Expr};
use datafusion::{common::DataFusionError, prelude::Expr};
use datafusion_proto::bytes::Serializeable;
use predicate::{Predicate, ValueExpr};
use prost::Message;
use snafu::{ResultExt, Snafu};

2
influxdb_iox/Cargo.toml
View File

@ -11,7 +11,7 @@ license.workspace = true
clap_blocks = { path = "../clap_blocks" }
compactor = { path = "../compactor" }
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
generated_types = { path = "../generated_types" }
import = { path = "../import" }
influxdb_iox_client = { path = "../influxdb_iox_client", features = ["flight", "format"] }

2
ingester/Cargo.toml
View File

@ -12,7 +12,7 @@ arrow_util = { path = "../arrow_util" }
async-trait = "0.1.58"
backoff = { path = "../backoff" }
bytes = "1.2"
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
datafusion_util = { path = "../datafusion_util" }
data_types = { path = "../data_types" }
flatbuffers = "2.1.2"

2
iox_query/Cargo.toml
View File

@ -20,7 +20,7 @@ arrow_util = { path = "../arrow_util" }
async-trait = "0.1"
chrono = { version = "0.4", default-features = false }
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
datafusion_util = { path = "../datafusion_util" }
executor = { path = "../executor"}
futures = "0.3"

2
iox_tests/Cargo.toml
View File

@ -10,7 +10,7 @@ license.workspace = true
arrow = "25.0.0"
bytes = "1.2"
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
datafusion_util = { path = "../datafusion_util" }
iox_catalog = { path = "../iox_catalog" }
iox_time = { path = "../iox_time" }

2
parquet_file/Cargo.toml
View File

@ -10,7 +10,7 @@ arrow = { version = "25.0.0", features = ["prettyprint"] }
base64 = "0.13"
bytes = "1.2"
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
datafusion_util = { path = "../datafusion_util" }
futures = "0.3"
generated_types = { path = "../generated_types" }

2
parquet_to_line_protocol/Cargo.toml
View File

@ -6,7 +6,7 @@ edition.workspace = true
license.workspace = true
[dependencies]
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
influxdb_line_protocol = { path = "../influxdb_line_protocol" }
futures = {version = "0.3"}
num_cpus = "1.13.1"

2
predicate/Cargo.toml
View File

@ -9,7 +9,7 @@ license.workspace = true
arrow = { version = "25.0.0", features = ["prettyprint"] }
chrono = { version = "0.4", default-features = false }
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
datafusion_util = { path = "../datafusion_util" }
itertools = "0.10"
observability_deps = { path = "../observability_deps" }

2
querier/Cargo.toml
View File

@ -13,7 +13,7 @@ bytes = "1.2"
cache_system = { path = "../cache_system" }
client_util = { path = "../client_util" }
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
datafusion_util = { path = "../datafusion_util" }
futures = "0.3"
generated_types = { path = "../generated_types" }

2
query_functions/Cargo.toml
View File

@ -8,7 +8,7 @@ license.workspace = true
[dependencies]
arrow = { version = "25.0.0", features = ["prettyprint"] }
chrono = { version = "0.4", default-features = false }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
itertools = "0.10.5"
observability_deps = { path = "../observability_deps" }
once_cell = "1"

2
query_tests/Cargo.toml
View File

@ -12,7 +12,7 @@ arrow_util = { path = "../arrow_util" }
async-trait = "0.1"
backoff = { path = "../backoff" }
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
datafusion_util = { path = "../datafusion_util" }
dml = { path = "../dml" }
futures = "0.3"

13
service_common/Cargo.toml
View File

@ -5,17 +5,14 @@ authors.workspace = true
edition.workspace = true
license.workspace = true
[dependencies]
# Workspace dependencies, in alphabetical order
datafusion = { path = "../datafusion" }
predicate = { path = "../predicate" }
[dependencies] # In alphabetical order
async-trait = "0.1.58"
datafusion = { workspace = true }
iox_query = { path = "../iox_query" }
metric = { path = "../metric" }
parking_lot = "0.12"
predicate = { path = "../predicate" }
tonic = "0.8"
trace = { path = "../trace" }
tracker = { path = "../tracker" }
tonic = "0.8"
workspace-hack = { path = "../workspace-hack"}
# Crates.io dependencies, in alphabetical order
async-trait = "0.1.58"

2
service_grpc_flight/Cargo.toml
View File

@ -9,7 +9,7 @@ license.workspace = true
# Workspace dependencies, in alphabetical order
arrow_util = { path = "../arrow_util" }
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
generated_types = { path = "../generated_types" }
observability_deps = { path = "../observability_deps" }
iox_query = { path = "../iox_query" }

2
service_grpc_influxrpc/Cargo.toml
View File

@ -8,7 +8,7 @@ license.workspace = true
[dependencies]
# Workspace dependencies, in alphabetical order
data_types = { path = "../data_types" }
datafusion = { path = "../datafusion" }
datafusion = { workspace = true }
datafusion_util = { path = "../datafusion_util" }
generated_types = { path = "../generated_types" }
observability_deps = { path = "../observability_deps" }

2
workspace-hack/Cargo.toml
View File

@ -25,11 +25,11 @@ bytes = { version = "1", features = ["std"] }
chrono = { version = "0.4", default-features = false, features = ["alloc", "clock", "iana-time-zone", "serde", "std", "winapi"] }
crossbeam-utils = { version = "0.8", features = ["std"] }
crypto-common = { version = "0.1", default-features = false, features = ["std"] }
datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "48f73c6af3b0cc747c38b4a9c7a610f4630e8736", features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] }
digest = { version = "0.10", features = ["alloc", "block-buffer", "core-api", "mac", "std", "subtle"] }
either = { version = "1", features = ["use_std"] }
fixedbitset = { version = "0.4", features = ["std"] }
flatbuffers = { version = "2", features = ["thiserror"] }
flate2 = { version = "1", features = ["miniz_oxide", "rust_backend"] }
futures-channel = { version = "0.3", features = ["alloc", "futures-sink", "sink", "std"] }
futures-core = { version = "0.3", features = ["alloc", "std"] }
futures-sink = { version = "0.3", features = ["alloc", "std"] }