Skip to content

Commit 12b1196

Browse files
committed
Merge branch 'main' into gabrielmusat/execution-experiment
# Conflicts: # src/execution_plans/arrow_flight_read.rs # src/execution_plans/mod.rs # src/execution_plans/stage.rs # src/lib.rs
2 parents a99ff6c + e428e7f commit 12b1196

File tree

21 files changed

+2096
-39
lines changed

21 files changed

+2096
-39
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: ./.github/actions/setup
2323
with:
2424
components: clippy
25-
- run: cargo clippy
25+
- run: cargo clippy --all-targets --features integration
2626

2727
unit-test:
2828
runs-on: ubuntu-latest

Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ version = "0.1.0"
1111
edition = "2021"
1212

1313
[dependencies]
14+
chrono = { version = "0.4.42" }
1415
datafusion = { workspace = true }
1516
datafusion-proto = { workspace = true }
1617
arrow-flight = "55.2.0"
@@ -47,8 +48,9 @@ integration = [
4748
"parquet",
4849
"arrow",
4950
"tokio-stream",
50-
"hyper-util"
51+
"hyper-util",
5152
]
53+
5254
tpch = ["integration"]
5355

5456
[dev-dependencies]

0 commit comments

Comments
 (0)