Skip to content

Commit 488f639

Browse files
authored
fix: Remove more dead code, remove datafusion dependency (#104)
* fix: Remove more dead code, remove datafusion dependency * fix: Remove unused dependencies
1 parent 37e366e commit 488f639

21 files changed

Lines changed: 16 additions & 4453 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,23 @@ arrow = { version = "57.0.0", features = ["prettyprint"] }
3131
arrow-array = "57.0.0"
3232
arrow-buffer = "57.0.0"
3333
arrow-flight = "57.0.0"
34-
arrow-json = "57.0.0"
3534
arrow-schema = "57.0.0"
36-
async-openai = { git = "https://github.com/spiceai/async-openai", rev = "7d5d31718143bf847cbc46286d4be26f035b58a0", features = [
37-
"byot",
38-
"embedding",
39-
"chat-completion",
40-
"responses",
41-
"model",
42-
] }
4335
async-trait = "0.1.89"
44-
aws-config = "1.8.13"
45-
aws-credential-types = "1.2.11"
46-
aws-sdk-dynamodb = "1.104.0"
4736
base64 = "0.22.1"
4837
byte-unit = "5.1.4"
4938
bytes = "1.10.0"
5039
chrono = "0.4.42"
5140
clap = { version = "4.5.54", features = ["derive", "env"] }
52-
datafusion = "51.0.0"
5341
duckdb = "1.4.4"
5442
duration-parse = { path = "crates/duration-parse" }
5543
tpchgen = "2.0.2"
5644
tpchgen-arrow = "2.0.2"
5745
futures = "0.3.30"
58-
hf-hub = { version = "0.4", features = ["tokio"] }
5946
http = "1.3.1"
6047
humantime = "2.1.0"
61-
indexmap = "2"
48+
indexmap = { version = "2", features = ["serde"] }
6249
insta = { version = "1.46.1", features = ["filters"] }
63-
itertools = "0.14"
64-
nix = "0.30"
50+
nix = { version = "0.30", features = ["signal"] }
6551
object_store = { version = "0.12.4", features = [
6652
"aws",
6753
"gcp",
@@ -121,7 +107,6 @@ url = { version = "2.5", features = ["serde"] }
121107
util = { path = "crates/util" }
122108
uuid = "1"
123109

124-
spiceai = { git = "https://github.com/spiceai/spice-rs.git", rev = "4c63970cf1d78c71eb69e2f4346d5d4795631b47" } # branch: trunk
125110

126111
[package]
127112
edition.workspace = true
@@ -142,7 +127,6 @@ checkpointer = { path = "crates/checkpointer" }
142127
clap.workspace = true
143128
data-generation = { path = "crates/data-generation" }
144129
etl = { path = "crates/etl" }
145-
reqwest.workspace = true
146130
serde.workspace = true
147131
serde_json.workspace = true
148132
system-adapter-protocol = { path = "crates/system-adapter-protocol" }

crates/app/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ serde.workspace = true
1313
snafu.workspace = true
1414
spicepod = { path = "../spicepod" }
1515
tracing.workspace = true
16-
util = { path = "../util" }
16+
util.workspace = true
1717

1818
[features]
1919
default = []

crates/checkpointer/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,14 @@ version.workspace = true
1111
[dependencies]
1212
anyhow.workspace = true
1313
arrow.workspace = true
14-
async-trait.workspace = true
15-
chrono.workspace = true
1614
clap = { workspace = true, features = ["derive"] }
1715
data-generation = { path = "../data-generation" }
1816
etl = { path = "../etl", features = ["duckdb"] }
1917
test-framework = { path = "../test-framework" }
2018
object_store = { workspace = true }
2119
serde = { workspace = true, features = ["derive"] }
2220
serde_json.workspace = true
23-
system-adapter-protocol = { path = "../system-adapter-protocol" }
2421
parquet.workspace = true
2522
tokio.workspace = true
26-
tokio-util.workspace = true
2723
tracing.workspace = true
2824
tracing-subscriber = { workspace = true, features = ["env-filter"] }

crates/telemetry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ snafu.workspace = true
2121
sysinfo.workspace = true
2222
tokio.workspace = true
2323
tracing.workspace = true
24-
util = { path = "../util" }
24+
util.workspace = true
2525

2626
[features]
2727
anonymous_telemetry = []

crates/test-framework/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ async-trait.workspace = true
1515
chrono.workspace = true
1616
clap = { workspace = true, features = ["derive"] }
1717
dashmap = "6.1.0"
18-
datafusion.workspace = true
1918
flight_client = { path = "../flight_client" }
2019
futures.workspace = true
2120
indicatif = "0.18.0"
@@ -32,16 +31,17 @@ serde.workspace = true
3231
serde_json.workspace = true
3332
yaml = { path = "../yaml" }
3433
spicepod = { path = "../spicepod" }
35-
sysinfo = "0.37.2"
34+
sysinfo.workspace = true
3635
telemetry = { path = "../telemetry" }
3736
tempfile.workspace = true
3837
tokio.workspace = true
3938
tokio-util.workspace = true
4039
tonic.workspace = true
4140
uuid = { workspace = true, features = ["v4"] }
41+
sqlparser = { version = "0.61", features = ["visitor"] }
4242

4343
[target.'cfg(not(windows))'.dependencies]
44-
nix = { version = "0.30", features = ["signal"] }
44+
nix = { workspace = true }
4545

4646
[dev-dependencies]
4747
rstest = "0.26.1"

crates/test-framework/src/queries/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,12 @@ impl Query {
233233
/// - The SQL query cannot be parsed
234234
/// - The query contains multiple statements (only single statements are supported)
235235
pub fn rewrite_with_reference_schema(&self, reference_schema: &str) -> anyhow::Result<Self> {
236-
use datafusion::sql::sqlparser::ast::{Ident, ObjectNamePart, visit_relations_mut};
237-
use datafusion::sql::sqlparser::parser::Parser;
236+
use sqlparser::ast::{Ident, ObjectNamePart, visit_relations_mut};
237+
use sqlparser::parser::Parser;
238238
use std::ops::ControlFlow;
239239

240240
// Parse the SQL query using sqlparser
241-
let dialect = datafusion::sql::sqlparser::dialect::PostgreSqlDialect {};
241+
let dialect = sqlparser::dialect::PostgreSqlDialect {};
242242
let mut statements = Parser::parse_sql(&dialect, &self.sql).map_err(|e| {
243243
anyhow::anyhow!(
244244
"Failed to parse query '{}' for reference schema rewrite: {}",

crates/util/Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,8 @@ version.workspace = true
1010

1111
[dependencies]
1212
backoff = { version = "0.4.0", features = ["futures", "tokio"] }
13-
chrono.workspace = true
1413
ctrlc = "3.5"
15-
futures.workspace = true
1614
humantime.workspace = true
17-
rand.workspace = true
18-
serde_json.workspace = true
1915
tokio = { workspace = true, features = ["signal", "sync", "time"] }
2016
tracing = { workspace = true }
2117
tracing-subscriber.workspace = true
22-
arrow.workspace = true
23-
arrow-schema.workspace = true
24-
datafusion.workspace = true
25-
parking_lot.workspace = true

crates/util/src/arrow.rs

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)