diff --git a/Cargo.lock b/Cargo.lock index fbdeae5405..b6ff256ba8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -790,7 +790,6 @@ version = "0.1.0" dependencies = [ "api", "async-stream", - "catalog", "common-base", "common-error", "common-grpc", @@ -950,7 +949,6 @@ name = "common-recordbatch" version = "0.1.0" dependencies = [ "common-error", - "datafusion", "datafusion-common", "datatypes", "futures", @@ -1002,7 +1000,6 @@ name = "common-time" version = "0.1.0" dependencies = [ "chrono", - "common-error", "serde", "serde_json", "snafu", @@ -1733,7 +1730,6 @@ dependencies = [ "arrow2", "async-stream", "async-trait", - "catalog", "client", "common-base", "common-error", @@ -1747,7 +1743,6 @@ dependencies = [ "datanode", "datatypes", "futures", - "query", "serde", "servers", "snafu", @@ -4549,7 +4544,6 @@ dependencies = [ "axum-test-helper", "bytes", "catalog", - "client", "common-base", "common-error", "common-grpc", @@ -4574,7 +4568,6 @@ dependencies = [ "serde", "serde_json", "snafu", - "table", "test-util", "tokio", "tokio-postgres", @@ -4870,7 +4863,6 @@ dependencies = [ "datatypes", "derive_builder", "futures", - "object-store", "serde", "serde_json", "snafu", diff --git a/src/client/Cargo.toml b/src/client/Cargo.toml index 49854595db..82bb407f9c 100644 --- a/src/client/Cargo.toml +++ b/src/client/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" [dependencies] api = { path = "../api" } async-stream = "0.3" -catalog = { path = "../catalog" } common-base = { path = "../common/base" } common-error = { path = "../common/error" } common-grpc = { path = "../common/grpc" } diff --git a/src/common/function-macro/Cargo.toml b/src/common/function-macro/Cargo.toml index 2bbb4e2d67..51749b388c 100644 --- a/src/common/function-macro/Cargo.toml +++ b/src/common/function-macro/Cargo.toml @@ -7,12 +7,12 @@ edition = "2021" proc-macro = true [dependencies] -common-query = { path = "../query" } -datatypes = { path = "../../datatypes" } quote = "1.0" -snafu = { version = "0.7", features = ["backtraces"] } syn = "1.0" [dev-dependencies] arc-swap = "1.0" +common-query = { path = "../query" } +datatypes = { path = "../../datatypes" } +snafu = { version = "0.7", features = ["backtraces"] } static_assertions = "1.1.0" diff --git a/src/common/recordbatch/Cargo.toml b/src/common/recordbatch/Cargo.toml index aa6aa7dfab..69e5f889ce 100644 --- a/src/common/recordbatch/Cargo.toml +++ b/src/common/recordbatch/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] common-error = { path = "../error" } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", features = ["simd"] } datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2" } datatypes = { path = "../../datatypes" } futures = "0.3" diff --git a/src/common/time/Cargo.toml b/src/common/time/Cargo.toml index 86bfaef059..37c0fa89fc 100644 --- a/src/common/time/Cargo.toml +++ b/src/common/time/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" [dependencies] chrono = "0.4" -common-error = { path = "../error" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" snafu = { version = "0.7", features = ["backtraces"] } diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml index 3fea2cf4f2..274ef66c77 100644 --- a/src/frontend/Cargo.toml +++ b/src/frontend/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" api = { path = "../api" } async-stream = "0.3" async-trait = "0.1" -catalog = { path = "../catalog" } client = { path = "../client" } common-base = { path = "../common/base" } common-error = { path = "../common/error" } @@ -17,7 +16,6 @@ common-runtime = { path = "../common/runtime" } common-telemetry = { path = "../common/telemetry" } common-time = { path = "../common/time" } datatypes = { path = "../datatypes" } -query = { path = "../query" } serde = "1.0" servers = { path = "../servers" } snafu = { version = "0.7", features = ["backtraces"] } diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml index ef6e47a9e4..4d2df5d0bb 100644 --- a/src/servers/Cargo.toml +++ b/src/servers/Cargo.toml @@ -9,7 +9,6 @@ async-trait = "0.1" axum = "0.6.0-rc.2" axum-macros = "0.3.0-rc.1" bytes = "1.2" -client = { path = "../client" } common-base = { path = "../common/base" } common-error = { path = "../common/error" } common-grpc = { path = "../common/grpc" } @@ -27,11 +26,9 @@ metrics = "0.20" num_cpus = "1.13" opensrv-mysql = "0.1" pgwire = { version = "0.4" } -query = { path = "../query" } serde = "1.0" serde_json = "1.0" snafu = { version = "0.7", features = ["backtraces"] } -table = { path = "../table" } tokio = { version = "1.20", features = ["full"] } tokio-stream = { version = "0.1", features = ["net"] } tonic = "0.8" @@ -45,6 +42,7 @@ common-base = { path = "../common/base" } mysql_async = { git = "https://github.com/Morranto/mysql_async.git", rev = "127b538" } rand = "0.8" script = { path = "../script", features = ["python"] } +query = { path = "../query" } test-util = { path = "../../test-util" } tokio-postgres = "0.7" tokio-test = "0.4" diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 2826b1be90..ccc0a48d0a 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -20,7 +20,6 @@ datatypes = { path = "../datatypes" } futures = "0.3" futures-util = "0.3" lazy_static = "1.4" -log-store = { path = "../log-store" } object-store = { path = "../object-store" } paste = "1.0" planus = "0.2" @@ -40,6 +39,7 @@ uuid = { version = "1.1", features = ["v4"] } atomic_float = "0.1" criterion = "0.3" datatypes = { path = "../datatypes", features = ["test"] } +log-store = { path = "../log-store" } rand = "0.8" tempdir = "0.3" diff --git a/src/store-api/Cargo.toml b/src/store-api/Cargo.toml index 0258a660eb..666b081407 100644 --- a/src/store-api/Cargo.toml +++ b/src/store-api/Cargo.toml @@ -14,7 +14,6 @@ common-time = { path = "../common/time" } datatypes = { path = "../datatypes" } derive_builder = "0.11" futures = "0.3" -object-store = { path = "../object-store" } serde = { version = "1.0", features = ["derive"] } snafu = { version = "0.7", features = ["backtraces"] }