Skip to content

Commit a2be244

Browse files
authored
unbundle ICU again due to binary size (#464)
1 parent 6430076 commit a2be244

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed

.github/workflows/rust.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,10 @@ jobs:
139139
# leak sanitization, but we don't care about backtraces here, so long
140140
# as the other tests have them.
141141
RUST_BACKTRACE: "0"
142+
# We cannot run "modern-full" with asan as the chrono feature will auto-load relase binaries of
143+
# the ICU-extension, which are not built with ASAN and will cause a crash.
142144
run: |
143-
cargo -Z build-std test --features "modern-full extensions-full" --target x86_64-unknown-linux-gnu --package duckdb
145+
cargo -Z build-std test --features "serde_json url r2d2 uuid polars extensions-full" --target x86_64-unknown-linux-gnu --package duckdb
144146
- name: publish crates --dry-run
145147
uses: katyo/publish-crates@v2
146148
with:

crates/duckdb/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ default = []
2222
bundled = ["libduckdb-sys/bundled"]
2323
json = ["libduckdb-sys/json", "bundled"]
2424
parquet = ["libduckdb-sys/parquet", "bundled"]
25-
icu = ["libduckdb-sys/icu", "bundled"]
2625
vscalar = []
2726
vscalar-arrow = []
2827
vtab = []
@@ -31,7 +30,7 @@ vtab-excel = ["vtab", "calamine"]
3130
vtab-arrow = ["vtab", "num"]
3231
appender-arrow = ["vtab-arrow"]
3332
vtab-full = ["vtab-excel", "vtab-arrow", "appender-arrow"]
34-
extensions-full = ["json", "parquet", "icu", "vtab-full"]
33+
extensions-full = ["json", "parquet", "vtab-full"]
3534
buildtime_bindgen = ["libduckdb-sys/buildtime_bindgen"]
3635
modern-full = ["chrono", "serde_json", "url", "r2d2", "uuid", "polars"]
3736
polars = ["dep:polars", "dep:polars-arrow"]

crates/libduckdb-sys/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ bundled = ["cc"]
2121
buildtime_bindgen = ["bindgen", "pkg-config", "vcpkg"]
2222
json = ["bundled"]
2323
parquet = ["bundled"]
24-
icu = ["bundled"]
25-
extensions-full = ["json", "parquet", "icu"]
24+
extensions-full = ["json", "parquet"]
2625
winduckdb = []
2726
# Warning: experimental feature
2827
loadable-extension = ["prettyplease", "quote", "syn"]

crates/libduckdb-sys/build.rs

-3
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ mod build_bundled {
133133
#[cfg(feature = "json")]
134134
add_extension(&mut cfg, &manifest, "json", &mut cpp_files, &mut include_dirs);
135135

136-
#[cfg(feature = "icu")]
137-
add_extension(&mut cfg, &manifest, "icu", &mut cpp_files, &mut include_dirs);
138-
139136
// duckdb/tools/pythonpkg/setup.py
140137
cfg.define("DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT", "1");
141138
cfg.define("DUCKDB_EXTENSION_AUTOLOAD_DEFAULT", "1");

crates/libduckdb-sys/duckdb.tar.gz

-4.63 MB
Binary file not shown.

crates/libduckdb-sys/update_sources.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# List of extensions' sources to grab. Technically, these sources will be compiled
1818
# but not included in the final build unless they're explicitly enabled.
19-
EXTENSIONS = ["core_functions", "parquet", "json", "icu"]
19+
EXTENSIONS = ["core_functions", "parquet", "json"]
2020

2121
# Clear the duckdb directory
2222
try:

0 commit comments

Comments
 (0)