Skip to content

Commit b9d4c60

Browse files
authored
chore(query): refactor common/arrow removes arrow/io crates (#16808)
* refactor native engine * update * update * [ci skip] update * [ci skip] update * remove ffi * remove ffi * remove ffi * fix init nested * fix init nested * fix stat
1 parent a34da6f commit b9d4c60

File tree

355 files changed

+806
-56032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

355 files changed

+806
-56032
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ members = [
2727
"src/common/storage",
2828
"src/common/vector",
2929
"src/common/license",
30-
"src/common/parquet2",
3130
"src/query/ast",
3231
"src/query/codegen",
3332
"src/query/config",
@@ -140,7 +139,6 @@ databend-common-meta-store = { path = "src/meta/store" }
140139
databend-common-meta-types = { path = "src/meta/types" }
141140
databend-common-metrics = { path = "src/common/metrics" }
142141
databend-common-openai = { path = "src/common/openai" }
143-
databend-common-parquet2 = { path = "src/common/parquet2" }
144142
databend-common-pipeline-core = { path = "src/query/pipeline/core" }
145143
databend-common-pipeline-sinks = { path = "src/query/pipeline/sinks" }
146144
databend-common-pipeline-sources = { path = "src/query/pipeline/sources" }
@@ -196,12 +194,6 @@ databend-storages-common-session = { path = "src/query/storages/common/session"
196194
databend-storages-common-stage = { path = "src/query/storages/common/stage" }
197195
databend-storages-common-table-meta = { path = "src/query/storages/common/table_meta" }
198196

199-
# Specific dependencies
200-
parquet2 = { package = "databend-common-parquet2", path = "src/common/parquet2", default-features = false, features = [
201-
"serde_types",
202-
"async",
203-
] }
204-
205197
# Crates.io dependencies
206198
ahash = "0.8"
207199
aho-corasick = { version = "1.0.1" } #
@@ -214,7 +206,6 @@ arrow-buffer = { version = "53" }
214206
arrow-cast = { version = "53", features = ["prettyprint"] }
215207
arrow-data = { version = "53" }
216208
arrow-flight = { version = "53", features = ["flight-sql-experimental", "tls"] }
217-
arrow-format = { version = "0.8.1", features = ["flight-data", "flight-service", "ipc"] }
218209
arrow-ipc = { version = "53" }
219210
arrow-ord = { version = "53" }
220211
arrow-schema = { version = "53", features = ["serde"] }
@@ -612,7 +603,6 @@ overflow-checks = true
612603
rpath = false
613604

614605
[patch.crates-io]
615-
arrow-format = { git = "https://github.com/Xuanwo/arrow-format", rev = "5502823a" }
616606
async-backtrace = { git = "https://github.com/datafuse-extras/async-backtrace.git", rev = "dea4553" }
617607
async-recursion = { git = "https://github.com/datafuse-extras/async-recursion.git", rev = "a353334" }
618608
backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git", rev = "72265be", features = [

src/common/arrow/Cargo.toml

Lines changed: 2 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,87 +11,33 @@ doctest = false
1111
test = true
1212

1313
[features]
14-
default = ["arrow-default", "parquet-default"]
14+
default = ["arrow-default"]
1515

1616
arrow = ["arrow-buffer", "arrow-schema", "arrow-data", "arrow-array"]
17-
io_flight = ["io_ipc", "arrow-format/flight-data"]
18-
io_ipc = []
19-
io_ipc_compression = []
20-
21-
# base64 + io_ipc because arrow schemas are stored as base64-encoded ipc format.
22-
io_parquet = ["io_ipc", "base64", "streaming-iterator", "fallible-streaming-iterator"]
23-
io_parquet_async = ["futures", "io_parquet", "parquet2/async"]
24-
25-
io_parquet_compression = [
26-
"io_parquet_zstd",
27-
"io_parquet_gzip",
28-
"io_parquet_snappy",
29-
"io_parquet_lz4",
30-
"io_parquet_brotli",
31-
]
3217

3318
# sample testing of generated arrow data
34-
io_parquet_sample_test = ["io_parquet_async"]
35-
36-
# compression backends
37-
io_parquet_brotli = ["parquet2/brotli"]
38-
io_parquet_gzip = ["parquet2/gzip"]
39-
io_parquet_lz4 = ["parquet2/lz4"]
40-
io_parquet_snappy = ["parquet2/snappy"]
41-
io_parquet_zstd = ["parquet2/zstd"]
42-
43-
# parquet bloom filter functions
44-
io_parquet_bloom_filter = ["parquet2/bloom_filter"]
4519

4620
compute = [
47-
"compute_aggregate",
48-
"compute_cast",
4921
"compute_concatenate",
50-
"compute_merge_sort",
51-
"compute_sort",
52-
"compute_take",
5322
]
54-
compute_aggregate = []
55-
compute_cast = ["lexical-core", "compute_take"]
5623
compute_concatenate = []
57-
compute_merge_sort = ["itertools", "compute_sort"]
58-
compute_sort = ["compute_take"]
59-
compute_take = []
6024

6125
serde_types = ["serde", "serde_derive"]
6226
simd = []
6327

6428
arrow-default = [
6529
"arrow",
66-
"io_ipc",
67-
"io_ipc_compression",
68-
"io_flight",
69-
"io_parquet_async",
70-
"io_parquet_compression",
71-
"io_parquet",
7230
"compute",
7331
"serde_types",
7432
"simd",
7533
]
7634

77-
parquet-default = [
78-
"parquet2/lz4",
79-
"parquet2/zstd",
80-
"parquet2/snappy",
81-
# this feature can't be built in musl
82-
# "parquet2/gzip_zlib_ng",
83-
"parquet2/brotli",
84-
]
85-
8635
[dependencies]
8736
ahash = { workspace = true }
8837
arrow-array = { workspace = true, optional = true }
8938
arrow-buffer = { workspace = true, optional = true }
9039
arrow-data = { workspace = true, optional = true }
91-
arrow-format = { workspace = true }
9240
arrow-schema = { workspace = true, optional = true }
93-
async-stream = { workspace = true, optional = true }
94-
base64 = { workspace = true, optional = true }
9541
bitpacking = { workspace = true }
9642
bytemuck = { workspace = true }
9743
byteorder = { workspace = true }
@@ -101,28 +47,23 @@ chrono-tz = { workspace = true, optional = true }
10147
dyn-clone = { workspace = true }
10248
either = { workspace = true }
10349
ethnum = { workspace = true }
104-
fallible-streaming-iterator = { workspace = true, optional = true }
10550
foreign_vec = { workspace = true }
106-
futures = { workspace = true, optional = true }
10751
hashbrown_v0_14 = { workspace = true }
10852
indexmap = { workspace = true }
109-
itertools = { workspace = true, optional = true }
110-
lexical-core = { workspace = true, optional = true }
11153
log = { workspace = true }
11254
lz4 = { workspace = true }
11355
num = { workspace = true, features = ["std"] }
11456
num-traits = { workspace = true }
11557
opendal = { workspace = true }
11658
ordered-float = { workspace = true }
117-
parquet2 = { workspace = true }
11859
rand = { workspace = true }
11960
ringbuffer = { workspace = true }
12061
roaring = { workspace = true }
12162
serde = { workspace = true, features = ["rc"], optional = true }
12263
serde_derive = { workspace = true, optional = true }
64+
serde_json = { workspace = true }
12365
simdutf8 = { workspace = true }
12466
snap = { workspace = true }
125-
streaming-iterator = { workspace = true, optional = true }
12667
zstd = { workspace = true }
12768

12869
[dev-dependencies]

0 commit comments

Comments
 (0)