Skip to content

Commit e11a8ca

Browse files
logan-keedealamb
andauthored
refactor: Make catalog datasource (apache#14643)
* First Iteration * Some more stuff * cargo fmt * fixing name catlog-datasource => datasource * Update datafusion/datasource/README.md --------- Co-authored-by: Andrew Lamb <[email protected]>
1 parent 68306ac commit e11a8ca

26 files changed

+436
-318
lines changed

Cargo.lock

+33-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,10 @@ ctor = "0.2.9"
9999
dashmap = "6.0.1"
100100
datafusion = { path = "datafusion/core", version = "45.0.0", default-features = false }
101101
datafusion-catalog = { path = "datafusion/catalog", version = "45.0.0" }
102-
datafusion-catalog-listing = { path = "datafusion/catalog-listing", version = "45.0.0", default-features = false }
102+
datafusion-catalog-listing = { path = "datafusion/catalog-listing", version = "45.0.0" }
103103
datafusion-common = { path = "datafusion/common", version = "45.0.0", default-features = false }
104104
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "45.0.0" }
105+
datafusion-datasource = { path = "datafusion/datasource", version = "45.0.0", default-features = false }
105106
datafusion-doc = { path = "datafusion/doc", version = "45.0.0" }
106107
datafusion-execution = { path = "datafusion/execution", version = "45.0.0" }
107108
datafusion-expr = { path = "datafusion/expr", version = "45.0.0" }

datafusion/catalog-listing/Cargo.toml

+1-23
Original file line numberDiff line numberDiff line change
@@ -27,43 +27,21 @@ repository.workspace = true
2727
rust-version.workspace = true
2828
version.workspace = true
2929

30-
[features]
31-
compression = ["async-compression", "xz2", "bzip2", "flate2", "zstd", "tokio-util"]
32-
default = ["compression"]
33-
3430
[dependencies]
3531
arrow = { workspace = true }
36-
async-compression = { version = "0.4.0", features = [
37-
"bzip2",
38-
"gzip",
39-
"xz",
40-
"zstd",
41-
"tokio",
42-
], optional = true }
4332
async-trait = { workspace = true }
44-
bytes = { workspace = true }
45-
bzip2 = { version = "0.5.1", optional = true }
46-
chrono = { workspace = true }
4733
datafusion-catalog = { workspace = true }
4834
datafusion-common = { workspace = true, features = ["object_store"] }
49-
datafusion-common-runtime = { workspace = true }
35+
datafusion-datasource = { workspace = true }
5036
datafusion-execution = { workspace = true }
5137
datafusion-expr = { workspace = true }
5238
datafusion-physical-expr = { workspace = true }
5339
datafusion-physical-expr-common = { workspace = true }
5440
datafusion-physical-plan = { workspace = true }
55-
flate2 = { version = "1.0.24", optional = true }
5641
futures = { workspace = true }
57-
glob = "0.3.0"
58-
itertools = { workspace = true }
5942
log = { workspace = true }
6043
object_store = { workspace = true }
61-
rand = { workspace = true }
6244
tokio = { workspace = true }
63-
tokio-util = { version = "0.7.4", features = ["io"], optional = true }
64-
url = { workspace = true }
65-
xz2 = { version = "0.1", optional = true, features = ["static"] }
66-
zstd = { version = "0.13", optional = true, default-features = false }
6745

6846
[dev-dependencies]
6947
tempfile = { workspace = true }

datafusion/catalog-listing/src/helpers.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
use std::mem;
2121
use std::sync::Arc;
2222

23-
use super::ListingTableUrl;
24-
use super::PartitionedFile;
2523
use datafusion_catalog::Session;
2624
use datafusion_common::internal_err;
2725
use datafusion_common::{HashMap, Result, ScalarValue};
26+
use datafusion_datasource::ListingTableUrl;
27+
use datafusion_datasource::PartitionedFile;
2828
use datafusion_expr::{BinaryExpr, Operator};
2929

3030
use arrow::{

0 commit comments

Comments
 (0)