Skip to content

Commit b2da58b

Browse files
Merge source into modules (#42)
* merge source and delete .DS store * move source into module * crates
1 parent 941a680 commit b2da58b

38 files changed

Lines changed: 117 additions & 151 deletions

Cargo.lock

Lines changed: 65 additions & 68 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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ license = "Apache-2.0"
1010
[workspace]
1111
members = [ "crates/cli",
1212
"crates/skardi",
13-
"crates/sources",
1413
"crates/server"]
1514

1615
resolver = "2"
@@ -46,9 +45,9 @@ iceberg = "0.9.0"
4645
iceberg-datafusion = "0.9.0"
4746
iceberg-storage-opendal = "0.9.0"
4847
insta = { version = "1.41.1", features = ["glob", "filters"] }
49-
lance = { git = "https://github.com/lance-format/lance", tag = "v4.0.0-rc.1", default-features = false }
50-
lance-index = { git = "https://github.com/lance-format/lance", tag = "v4.0.0-rc.1" }
51-
lance-linalg = { git = "https://github.com/lance-format/lance", tag = "v4.0.0-rc.1" }
48+
lance = { version = "4.0.0", default-features = false }
49+
lance-index = { version = "4.0.0" }
50+
lance-linalg = { version = "4.0.0" }
5251
log = "0.4.27"
5352
object_store = { version = "0.12.4", default-features = false, features = ["aws", "gcp", "azure", "http"] }
5453
parking_lot = "0.12"

asset/.DS_Store

-6 KB
Binary file not shown.

crates/.DS_Store

-6 KB
Binary file not shown.

crates/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object_store = { workspace = true, features = ["aws", "gcp", "azure", "http"] }
2626
serde = { workspace = true }
2727
serde_json = { workspace = true }
2828
serde_yaml = { workspace = true }
29-
sources = { package = "skardi-sources", path = "../sources" }
29+
skardi = { path = "../skardi" }
3030
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
3131
url = { workspace = true }
3232

crates/cli/src/main.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ use object_store::azure::MicrosoftAzureBuilder;
1616
use object_store::gcp::GoogleCloudStorageBuilder;
1717
use object_store::http::HttpBuilder;
1818
use serde::Deserialize;
19-
use sources::providers::lance::fts_table_function::register_lance_fts_udtf;
20-
use sources::providers::lance::knn_table_function::register_lance_knn_udtf;
21-
use sources::providers::{
19+
use skardi::sources::providers::lance::fts_table_function::register_lance_fts_udtf;
20+
use skardi::sources::providers::lance::knn_table_function::register_lance_knn_udtf;
21+
use skardi::sources::providers::{
2222
iceberg::register_iceberg_table, lance::register_lance_table, mongo::register_mongo_tables,
2323
mysql::register_mysql_tables, sqlite::register_sqlite_tables,
2424
sqlx::postgres::register_postgres_tables,
@@ -254,12 +254,11 @@ impl UrlTableFactory for SkardiUrlTableFactory {
254254
let table_name = &url[pos + ext.len()..];
255255

256256
if !table_name.is_empty() {
257-
let provider =
258-
sources::providers::sqlite::create_sqlite_table_provider(db_path, table_name)
259-
.await
260-
.map_err(|e| {
261-
datafusion::error::DataFusionError::Execution(e.to_string())
262-
})?;
257+
let provider = skardi::sources::providers::sqlite::create_sqlite_table_provider(
258+
db_path, table_name,
259+
)
260+
.await
261+
.map_err(|e| datafusion::error::DataFusionError::Execution(e.to_string()))?;
263262

264263
return Ok(Some(provider));
265264
}

crates/server/.DS_Store

-6 KB
Binary file not shown.

crates/server/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ serde = { workspace = true }
2626
serde_json = { workspace = true }
2727
serde_yaml = { workspace = true }
2828
skardi = { path = "../skardi" }
29-
sources = { package = "skardi-sources", path = "../sources" }
3029
anyhow = "1.0"
3130
thiserror = "1.0"
3231
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "net", "sync"] }

0 commit comments

Comments
 (0)