diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..2dbc9c6e61 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,21 @@ +repos: +- repo: https://github.com/compilerla/conventional-pre-commit + rev: 47923ce11be4a936cd216d427d985dd342adb751 + hooks: + - id: conventional-pre-commit + stages: [commit-msg] + +- repo: https://github.com/DevinR528/cargo-sort + rev: e6a795bc6b2c0958f9ef52af4863bbd7cc17238f + hooks: + - id: cargo-sort + args: ["--workspace"] + +- repo: https://github.com/doublify/pre-commit-rust + rev: v1.0 + hooks: + - id: fmt + - id: clippy + args: ["--workspace", "--all-targets", "--", "-D", "warnings", "-D", "clippy::print_stdout", "-D", "clippy::print_stderr"] + stages: [push] + - id: cargo-check diff --git a/Cargo.toml b/Cargo.toml index d7a537318c..7deaf5eee7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ members = [ "src/api", "src/catalog", "src/client", + "src/cmd", "src/common/base", "src/common/error", "src/common/function", @@ -13,7 +14,6 @@ members = [ "src/common/runtime", "src/common/telemetry", "src/common/time", - "src/cmd", "src/datanode", "src/datatypes", "src/frontend", diff --git a/README.md b/README.md index fea61bd1cc..0280daada4 100644 --- a/README.md +++ b/README.md @@ -150,3 +150,34 @@ cargo run -- --log-dir=logs --log-level=debug frontend start -c ./config/fronten 3 rows in set (0.01 sec) ``` You can delete your data by removing `/tmp/greptimedb`. + +## Contribute + +1. [Install rust](https://www.rust-lang.org/tools/install) +2. [Install `pre-commit`](https://pre-commit.com/#plugins) for run hooks on every commit automatically such as `cargo fmt` etc. + +``` +$ pip install pre-commit + +or + +$ brew install pre-commit +$ +``` + +3. Install the git hook scripts: + +``` +$ pre-commit install +pre-commit installed at .git/hooks/pre-commit + +$ pre-commit install --hook-type commit-msg +pre-commit installed at .git/hooks/commit-msg + +$ pre-commit install --hook-type pre-push +pre-commit installed at .git/hooks/pre-pus +``` + +now `pre-commit` will run automatically on `git commit`. + +4. Check out branch from `develop` and make your contribution. Follow the [style guide](https://github.com/GreptimeTeam/docs/blob/main/style-guide/zh.md). Create a PR when you are ready, feel free and have fun! diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index a9264c1e5f..7f59a80315 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -2,7 +2,6 @@ name = "api" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/src/catalog/Cargo.toml b/src/catalog/Cargo.toml index eca9c98411..2d981d8e35 100644 --- a/src/catalog/Cargo.toml +++ b/src/catalog/Cargo.toml @@ -2,12 +2,11 @@ name = "catalog" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-trait = "0.1" async-stream = "0.3" +async-trait = "0.1" common-error = { path = "../common/error" } common-query = { path = "../common/query" } common-recordbatch = { path = "../common/recordbatch" } diff --git a/src/client/Cargo.toml b/src/client/Cargo.toml index 224c66f2a4..49854595db 100644 --- a/src/client/Cargo.toml +++ b/src/client/Cargo.toml @@ -2,7 +2,6 @@ name = "client" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml index a962b24148..1cb37040ad 100644 --- a/src/cmd/Cargo.toml +++ b/src/cmd/Cargo.toml @@ -10,7 +10,7 @@ path = "src/bin/greptime.rs" [dependencies] clap = { version = "3.1", features = ["derive"] } common-error = { path = "../common/error" } -common-telemetry = { path = "../common/telemetry", features = ["deadlock_detection"]} +common-telemetry = { path = "../common/telemetry", features = ["deadlock_detection"] } datanode = { path = "../datanode" } frontend = { path = "../frontend" } futures = "0.3" diff --git a/src/common/error/Cargo.toml b/src/common/error/Cargo.toml index b41e6d1f0d..d03de11f55 100644 --- a/src/common/error/Cargo.toml +++ b/src/common/error/Cargo.toml @@ -2,7 +2,6 @@ name = "common-error" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/src/common/function/Cargo.toml b/src/common/function/Cargo.toml index ffe0b0767f..87be4aef8f 100644 --- a/src/common/function/Cargo.toml +++ b/src/common/function/Cargo.toml @@ -3,18 +3,13 @@ edition = "2021" name = "common-function" version = "0.1.0" -[dependencies.arrow] -features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] -package = "arrow2" -version = "0.10" - [dependencies] arc-swap = "1.0" chrono-tz = "0.6" common-error = { path = "../error" } -common-query = { path = "../query" } common-function-macro = { path = "../function-macro" } -datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git" , branch = "arrow2" } +common-query = { path = "../query" } +datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2" } datatypes = { path = "../../datatypes" } libc = "0.2" num = "0.4" @@ -24,6 +19,11 @@ paste = "1.0" snafu = { version = "0.7", features = ["backtraces"] } statrs = "0.15" +[dependencies.arrow] +features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] +package = "arrow2" +version = "0.10" + [dev-dependencies] ron = "0.7" -serde = {version = "1.0", features = ["derive"]} +serde = { version = "1.0", features = ["derive"] } diff --git a/src/common/query/Cargo.toml b/src/common/query/Cargo.toml index 5aec1192d8..492ba32a18 100644 --- a/src/common/query/Cargo.toml +++ b/src/common/query/Cargo.toml @@ -3,10 +3,6 @@ name = "common-query" version = "0.1.0" edition = "2021" -[dependencies.arrow] -package = "arrow2" -version="0.10" - [dependencies] common-error = { path = "../error" } common-recordbatch = { path = "../recordbatch" } @@ -18,6 +14,10 @@ datatypes = { path = "../../datatypes" } snafu = { version = "0.7", features = ["backtraces"] } statrs = "0.15" +[dependencies.arrow] +package = "arrow2" +version = "0.10" + [dev-dependencies] -tokio = { version = "1.0", features = ["full"] } common-base = { path = "../base" } +tokio = { version = "1.0", features = ["full"] } diff --git a/src/common/recordbatch/Cargo.toml b/src/common/recordbatch/Cargo.toml index 3e02e164ae..aa6aa7dfab 100644 --- a/src/common/recordbatch/Cargo.toml +++ b/src/common/recordbatch/Cargo.toml @@ -5,8 +5,8 @@ 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"} +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" paste = "1.0" diff --git a/src/common/runtime/Cargo.toml b/src/common/runtime/Cargo.toml index ef3f92d9d9..c26f33f982 100644 --- a/src/common/runtime/Cargo.toml +++ b/src/common/runtime/Cargo.toml @@ -3,7 +3,6 @@ name = "common-runtime" version = "0.1.0" edition = "2021" - [dependencies] common-error = { path = "../error" } common-telemetry = { path = "../telemetry" } diff --git a/src/common/telemetry/Cargo.toml b/src/common/telemetry/Cargo.toml index c4a41d2d52..ff9e69a84c 100644 --- a/src/common/telemetry/Cargo.toml +++ b/src/common/telemetry/Cargo.toml @@ -2,12 +2,11 @@ name = "common-telemetry" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] console = ["console-subscriber"] -deadlock_detection=["parking_lot"] +deadlock_detection =["parking_lot"] [dependencies] backtrace = "0.3" diff --git a/src/common/time/Cargo.toml b/src/common/time/Cargo.toml index 430d4c3cdc..86bfaef059 100644 --- a/src/common/time/Cargo.toml +++ b/src/common/time/Cargo.toml @@ -2,7 +2,6 @@ name = "common-time" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/src/datanode/Cargo.toml b/src/datanode/Cargo.toml index 2243c40ccb..4272638029 100644 --- a/src/datanode/Cargo.toml +++ b/src/datanode/Cargo.toml @@ -3,13 +3,6 @@ name = "datanode" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies.arrow] -package = "arrow2" -version = "0.10" -features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] - [features] default = ["python"] python = [ @@ -49,20 +42,26 @@ store-api = { path = "../store-api" } table = { path = "../table" } table-engine = { path = "../table-engine", features = ["test"] } tokio = { version = "1.18", features = ["full"] } -tonic = "0.8" tokio-stream = { version = "0.1.8", features = ["net"] } -tower = { version = "0.4", features = ["full"]} -tower-http = { version ="0.3", features = ["full"]} +tonic = "0.8" +tower = { version = "0.4", features = ["full"] } +tower-http = { version = "0.3", features = ["full"] } +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies.arrow] +package = "arrow2" +version = "0.10" +features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] [dev-dependencies] axum-test-helper = "0.1" client = { path = "../client" } common-query = { path = "../common/query" } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git" , branch = "arrow2", features = ["simd"]} +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" } tempdir = "0.3" [dev-dependencies.arrow] package = "arrow2" -version="0.10" +version = "0.10" features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] diff --git a/src/datatypes/Cargo.toml b/src/datatypes/Cargo.toml index a022b1c6c5..708b521b67 100644 --- a/src/datatypes/Cargo.toml +++ b/src/datatypes/Cargo.toml @@ -7,15 +7,10 @@ edition = "2021" default = [] test = [] -[dependencies.arrow] -package = "arrow2" -version = "0.10" -features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] - [dependencies] common-base = { path = "../common/base" } -common-time = { path = "../common/time" } common-error = { path = "../common/error" } +common-time = { path = "../common/time" } datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2" } enum_dispatch = "0.3" num = "0.4" @@ -25,3 +20,8 @@ paste = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" snafu = { version = "0.7", features = ["backtraces"] } + +[dependencies.arrow] +package = "arrow2" +version = "0.10" +features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] diff --git a/src/datatypes/src/scalar.rs b/src/datatypes/src/scalar.rs index e69de29bb2..8b13789179 100644 --- a/src/datatypes/src/scalar.rs +++ b/src/datatypes/src/scalar.rs @@ -0,0 +1 @@ + diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml index c316556550..3fea2cf4f2 100644 --- a/src/frontend/Cargo.toml +++ b/src/frontend/Cargo.toml @@ -3,11 +3,6 @@ name = "frontend" version = "0.1.0" edition = "2021" -[dependencies.arrow] -package = "arrow2" -version = "0.10" -features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] - [dependencies] api = { path = "../api" } async-stream = "0.3" @@ -23,17 +18,22 @@ common-telemetry = { path = "../common/telemetry" } common-time = { path = "../common/time" } datatypes = { path = "../datatypes" } query = { path = "../query" } -snafu = { version = "0.7", features = ["backtraces"] } -tokio = { version = "1.18", features = ["full"] } serde = "1.0" servers = { path = "../servers" } +snafu = { version = "0.7", features = ["backtraces"] } sql = { path = "../sql" } +tokio = { version = "1.18", features = ["full"] } + +[dependencies.arrow] +package = "arrow2" +version = "0.10" +features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] [dev-dependencies] -datanode = { path = "../datanode" } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git" , branch = "arrow2", features = ["simd"]} +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" } +datanode = { path = "../datanode" } futures = "0.3" -tonic = "0.8" tempdir = "0.3" +tonic = "0.8" tower = "0.4" diff --git a/src/log-store/Cargo.toml b/src/log-store/Cargo.toml index 9b0f36a99e..c9c1f8c18c 100644 --- a/src/log-store/Cargo.toml +++ b/src/log-store/Cargo.toml @@ -13,7 +13,7 @@ byteorder = "1.4" bytes = "1.1" common-base = { path = "../common/base" } common-error = { path = "../common/error" } -common-runtime = {path = "../common/runtime"} +common-runtime = { path = "../common/runtime" } common-telemetry = { path = "../common/telemetry" } crc = "3.0" futures = "0.3" diff --git a/src/logical-plans/Cargo.toml b/src/logical-plans/Cargo.toml index fd20e3350b..9f48d4ac88 100644 --- a/src/logical-plans/Cargo.toml +++ b/src/logical-plans/Cargo.toml @@ -2,7 +2,6 @@ name = "logical-plans" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/src/object-store/Cargo.toml b/src/object-store/Cargo.toml index fb18330456..413fc9718c 100644 --- a/src/object-store/Cargo.toml +++ b/src/object-store/Cargo.toml @@ -2,11 +2,10 @@ name = "object-store" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -futures = { version = "0.3"} +futures = { version = "0.3" } opendal = "0.9" tokio = { version = "1.0", features = ["full"] } diff --git a/src/query/Cargo.toml b/src/query/Cargo.toml index 59fc6ac4fc..330e5afdf3 100644 --- a/src/query/Cargo.toml +++ b/src/query/Cargo.toml @@ -3,11 +3,6 @@ name = "query" version = "0.1.0" edition = "2021" -[dependencies.arrow] -package = "arrow2" -version = "0.10" -features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] - [dependencies] arc-swap = "1.0" async-trait = "0.1" @@ -30,12 +25,17 @@ sql = { path = "../sql" } table = { path = "../table" } tokio = "1.0" +[dependencies.arrow] +package = "arrow2" +version = "0.10" +features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] + [dev-dependencies] approx_eq = "0.1" common-function-macro = { path = "../common/function-macro" } +format_num = "0.1" num = "0.4" num-traits = "0.2" -format_num = "0.1" paste = "1.0" rand = "0.8" statrs = "0.15" diff --git a/src/query/src/expr.rs b/src/query/src/expr.rs index e69de29bb2..8b13789179 100644 --- a/src/query/src/expr.rs +++ b/src/query/src/expr.rs @@ -0,0 +1 @@ + diff --git a/src/script/Cargo.toml b/src/script/Cargo.toml index 033c0e470f..469a289548 100644 --- a/src/script/Cargo.toml +++ b/src/script/Cargo.toml @@ -21,37 +21,37 @@ python = [ [dependencies] async-trait = "0.1" catalog = { path = "../catalog" } -common-error = {path = "../common/error"} +common-error = { path = "../common/error" } common-function = { path = "../common/function" } -common-query = {path = "../common/query"} -common-recordbatch = {path = "../common/recordbatch" } +common-query = { path = "../common/query" } +common-recordbatch = { path = "../common/recordbatch" } common-telemetry = { path = "../common/telemetry" } common-time = { path = "../common/time" } console = "0.15" -datafusion = {git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", optional = true} -datafusion-common = {git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2"} -datafusion-expr = {git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", optional = true} -datafusion-physical-expr = {git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", optional = true} -datatypes = {path = "../datatypes"} -futures-util = "0.3" +datafusion = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", optional = true } +datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2" } +datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", optional = true } +datafusion-physical-expr = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", optional = true } +datatypes = { path = "../datatypes" } futures = "0.3" +futures-util = "0.3" +paste = { version = "1.0", optional = true } query = { path = "../query" } -rustpython-ast = {git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d"} -rustpython-bytecode = {git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d"} -rustpython-compiler = {git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d"} -rustpython-compiler-core = {git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d"} -rustpython-parser = {git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d"} -rustpython-vm = {git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d"} -paste = { version = "1.0", optional = true} -snafu = {version = "0.7", features = ["backtraces"]} +rustpython-ast = { git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d" } +rustpython-bytecode = { git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d" } +rustpython-compiler = { git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d" } +rustpython-compiler-core = { git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d" } +rustpython-parser = { git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d" } +rustpython-vm = { git = "https://github.com/RustPython/RustPython", optional = true, rev = "02a1d1d" } +snafu = { version = "0.7", features = ["backtraces"] } sql = { path = "../sql" } -tokio = { version = "1.0", features = ["full"] } table = { path = "../table" } +tokio = { version = "1.0", features = ["full"] } [dev-dependencies] log-store = { path = "../log-store" } ron = "0.7" -serde = {version = "1.0", features = ["derive"]} +serde = { version = "1.0", features = ["derive"] } storage = { path = "../storage" } table-engine = { path = "../table-engine", features = ["test"] } tempdir = "0.3" diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml index 8aa04c789d..281f8a3090 100644 --- a/src/servers/Cargo.toml +++ b/src/servers/Cargo.toml @@ -24,16 +24,16 @@ query = { path = "../query" } serde = "1.0" serde_json = "1.0" snafu = { version = "0.7", features = ["backtraces"] } -tonic = "0.8" tokio = { version = "1.20", features = ["full"] } tokio-stream = { version = "0.1", features = ["net"] } -tower = { version = "0.4", features = ["full"]} -tower-http = { version ="0.3", features = ["full"]} +tonic = "0.8" +tower = { version = "0.4", features = ["full"] } +tower-http = { version = "0.3", features = ["full"] } [dev-dependencies] -common-base = { path = "../common/base" } catalog = { path = "../catalog" } +common-base = { path = "../common/base" } mysql_async = "0.30" rand = "0.8" -test-util = { path = "../../test-util" } script = { path = "../script", features = ["python"] } +test-util = { path = "../../test-util" } diff --git a/src/sql/Cargo.toml b/src/sql/Cargo.toml index bbff85bd48..ce6084bb0a 100644 --- a/src/sql/Cargo.toml +++ b/src/sql/Cargo.toml @@ -2,7 +2,6 @@ name = "sql" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index c80e6abef2..bb3e83149c 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -2,7 +2,6 @@ name = "storage" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -25,17 +24,17 @@ object-store = { path = "../object-store" } paste = "1.0" planus = "0.2" prost = "0.11" +regex = "1.5" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" snafu = { version = "0.7", features = ["backtraces"] } store-api = { path = "../store-api" } -regex = "1.5" tokio = { version = "1.18", features = ["full"] } tonic = "0.8" -uuid = { version = "1.1" , features=["v4"]} +uuid = { version = "1.1", features = ["v4"] } [dev-dependencies] -atomic_float="0.1" +atomic_float = "0.1" criterion = "0.3" datatypes = { path = "../datatypes", features = ["test"] } rand = "0.8" diff --git a/src/store-api/Cargo.toml b/src/store-api/Cargo.toml index 2e084fc277..b07f45d259 100644 --- a/src/store-api/Cargo.toml +++ b/src/store-api/Cargo.toml @@ -2,7 +2,6 @@ name = "store-api" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -12,11 +11,11 @@ common-base = { path = "../common/base" } common-error = { path = "../common/error" } 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"] } -derive_builder = "0.11" [dev-dependencies] async-stream = "0.3" diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml index 66775264f9..c53720e37f 100644 --- a/src/table/Cargo.toml +++ b/src/table/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" [dependencies] async-trait = "0.1" chrono = { version = "0.4", features = ["serde"] } -common-error = {path = "../common/error" } -common-query = {path = "../common/query" } -common-recordbatch = {path = "../common/recordbatch" } -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"} +common-error = { path = "../common/error" } +common-query = { path = "../common/query" } +common-recordbatch = { path = "../common/recordbatch" } +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" } derive_builder = "0.11" futures = "0.3" diff --git a/test-util/Cargo.toml b/test-util/Cargo.toml index 48fb447e48..740bd043e1 100644 --- a/test-util/Cargo.toml +++ b/test-util/Cargo.toml @@ -3,18 +3,18 @@ name = "test-util" version = "0.1.0" edition = "2021" -[dependencies.arrow] -package = "arrow2" -version="0.10" -features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"] - [dependencies] async-trait = "0.1" common-query = { path = "../src/common/query" } common-recordbatch = { path = "../src/common/recordbatch" } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git" , branch = "arrow2", features = ["simd"] } +datafusion = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", features = ["simd"] } datatypes = { path = "../src/datatypes" } futures = "0.3" snafu = { version = "0.7", features = ["backtraces"] } table = { path = "../src/table" } tokio = { version = "1.20", features = ["full"] } + +[dependencies.arrow] +package = "arrow2" +version = "0.10" +features = ["io_csv", "io_json", "io_parquet", "io_parquet_compression", "io_ipc", "ahash", "compute", "serde_types"]