Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to pass vendored feature to openssl in libduckdb-sys #321

Merged
merged 3 commits into from
Jun 6, 2024

Conversation

muralisoundararajan
Copy link
Contributor

openssl module imported from rust-openssl provides an ability to use vendored openssl as a feature. In libduckdb-sys, when it is introduced as module, the ability to provide "vendored" feature was not added to libduckdb-sys and duckdb crates.

This change adds ability to pass "vendored" feature to "openssl" module within the "libduckdb-sys"

Resolves #320

Copy link
Member

@Mause Mause left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Appreciate the renamed features to include what they really do as well

@muralisoundararajan
Copy link
Contributor Author

@Mause Thanks for the review.

CI pipeline is failing with the same reason as main line due to new version of OpenSSL 3.3.1 available in choco and runner-images for Windows is using the previous version.

By any chance, would it be possible to wait for this week duckdb release to wait till we have this issue is resolved, so that this PR can be part of the release?

@Maxxen
Copy link
Member

Maxxen commented Jun 6, 2024

@muralisoundararajan Its not obvious to me how to solve this issue (googling for this gives me no results). Could you share some more information from your investigation? Is this just a problem with choco that we have to wait for them to fix or can we adjust something in our CI pipeline to resolve it?

I suspect we can maybe remove the choco openssl install completely and just rely on the openssl version provided by the runner environment?

@Maxxen
Copy link
Member

Maxxen commented Jun 6, 2024

Actually, I think I fixed it in #327

@muralisoundararajan
Copy link
Contributor Author

@Maxxen Yes, that seem to resolve the issue. Thanks for the quick turnaround.

I rebased my changes, would it be possible to run the CI workflow.

@muralisoundararajan
Copy link
Contributor Author

Another option I was contemplating was to use openssl_vendored in msvc environment during the failure.

@Maxxen Maxxen merged commit 3bd503c into duckdb:main Jun 6, 2024
4 checks passed
@Maxxen
Copy link
Member

Maxxen commented Jun 6, 2024

Thanks! Sorry for the friction :)

@muralisoundararajan muralisoundararajan deleted the openssl-vendored branch June 6, 2024 11:47
robert3005 referenced this pull request in spiraldb/vortex Jul 11, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [duckdb](https://togithub.com/wangfenjin/duckdb-rs) |
workspace.dependencies | major | `0.10.2` -> `1.0.0` |

---

### Release Notes

<details>
<summary>wangfenjin/duckdb-rs (duckdb)</summary>

###
[`v1.0.0`](https://togithub.com/duckdb/duckdb-rs/releases/tag/v1.0.0)

[Compare
Source](https://togithub.com/wangfenjin/duckdb-rs/compare/v0.10.2...v1.0.0)

This release upgrades the shipped DuckDB to v1.0.0, in addition to a
number of bug fixes.

**Note**: The `httpfs` module that ships the `httpfs` extension is
removed in this release. The `httpfs` extension can instead be used
through DuckDB's native extension installation/loading mechanism.

#### What's Changed

- feat: support "large" arrow data types by
[@&#8203;Mause](https://togithub.com/Mause) in
[https://github.com/duckdb/duckdb-rs/pull/307](https://togithub.com/duckdb/duckdb-rs/pull/307)
- Fixes the issue ignoring nulls when copy from arrow array to flat
vector by [@&#8203;y-f-u](https://togithub.com/y-f-u) in
[https://github.com/duckdb/duckdb-rs/pull/316](https://togithub.com/duckdb/duckdb-rs/pull/316)
- change SQLite to DuckDB by
[@&#8203;era127](https://togithub.com/era127) in
[https://github.com/duckdb/duckdb-rs/pull/308](https://togithub.com/duckdb/duckdb-rs/pull/308)
- Organise workspace crates and consolidate Cargo.toml manifest
properties/dependencies by
[@&#8203;Swoorup](https://togithub.com/Swoorup) in
[https://github.com/duckdb/duckdb-rs/pull/285](https://togithub.com/duckdb/duckdb-rs/pull/285)
- Update README.md by [@&#8203;yoonghm](https://togithub.com/yoonghm) in
[https://github.com/duckdb/duckdb-rs/pull/242](https://togithub.com/duckdb/duckdb-rs/pull/242)
- Add support for DuckDB arrays when using Arrow's FixedSizeList by
[@&#8203;Jeadie](https://togithub.com/Jeadie) in
[https://github.com/duckdb/duckdb-rs/pull/323](https://togithub.com/duckdb/duckdb-rs/pull/323)
- Add support for BinaryArray in arrow-vtab by
[@&#8203;phillipleblanc](https://togithub.com/phillipleblanc) in
[https://github.com/duckdb/duckdb-rs/pull/324](https://togithub.com/duckdb/duckdb-rs/pull/324)
- use openssl from runner by
[@&#8203;Maxxen](https://togithub.com/Maxxen) in
[https://github.com/duckdb/duckdb-rs/pull/327](https://togithub.com/duckdb/duckdb-rs/pull/327)
- Add ability to pass vendored feature to openssl in libduckdb-sys by
[@&#8203;muralisoundararajan](https://togithub.com/muralisoundararajan)
in
[https://github.com/duckdb/duckdb-rs/pull/321](https://togithub.com/duckdb/duckdb-rs/pull/321)
- Implement appender for date/time types by
[@&#8203;rijkvp](https://togithub.com/rijkvp) in
[https://github.com/duckdb/duckdb-rs/pull/313](https://togithub.com/duckdb/duckdb-rs/pull/313)
- Support decimal128 without casting to double by
[@&#8203;Maxxen](https://togithub.com/Maxxen) in
[https://github.com/duckdb/duckdb-rs/pull/328](https://togithub.com/duckdb/duckdb-rs/pull/328)
- feat: experimental support for further nested types by
[@&#8203;Mause](https://togithub.com/Mause) in
[https://github.com/duckdb/duckdb-rs/pull/318](https://togithub.com/duckdb/duckdb-rs/pull/318)
- upgrade arrow-rs to 52 by [@&#8203;Mause](https://togithub.com/Mause)
in
[https://github.com/duckdb/duckdb-rs/pull/332](https://togithub.com/duckdb/duckdb-rs/pull/332)
- Expose the underlying schema of executed statement by
[@&#8203;abhiaagarwal](https://togithub.com/abhiaagarwal) in
[https://github.com/duckdb/duckdb-rs/pull/333](https://togithub.com/duckdb/duckdb-rs/pull/333)
- Remove mut from raw_query by
[@&#8203;rijkvp](https://togithub.com/rijkvp) in
[https://github.com/duckdb/duckdb-rs/pull/339](https://togithub.com/duckdb/duckdb-rs/pull/339)
- Support Arrow type `LargeUtf8`. by
[@&#8203;Jeadie](https://togithub.com/Jeadie) in
[https://github.com/duckdb/duckdb-rs/pull/341](https://togithub.com/duckdb/duckdb-rs/pull/341)
- Update duckdb-rs to DuckDB v1.0.0 by
[@&#8203;Mytherin](https://togithub.com/Mytherin) in
[https://github.com/duckdb/duckdb-rs/pull/336](https://togithub.com/duckdb/duckdb-rs/pull/336)
- fix: don't write files outside of `OUT_DIR` by
[@&#8203;frectonz](https://togithub.com/frectonz) in
[https://github.com/duckdb/duckdb-rs/pull/347](https://togithub.com/duckdb/duckdb-rs/pull/347)
- Remove built-in HTTPFS extension and fix Windows CI by
[@&#8203;Mytherin](https://togithub.com/Mytherin) in
[https://github.com/duckdb/duckdb-rs/pull/353](https://togithub.com/duckdb/duckdb-rs/pull/353)
- Upgrade duckdb-loadable-macros to 0.1.2 by
[@&#8203;Mytherin](https://togithub.com/Mytherin) in
[https://github.com/duckdb/duckdb-rs/pull/354](https://togithub.com/duckdb/duckdb-rs/pull/354)

#### New Contributors

- [@&#8203;y-f-u](https://togithub.com/y-f-u) made their first
contribution in
[https://github.com/duckdb/duckdb-rs/pull/316](https://togithub.com/duckdb/duckdb-rs/pull/316)
- [@&#8203;era127](https://togithub.com/era127) made their first
contribution in
[https://github.com/duckdb/duckdb-rs/pull/308](https://togithub.com/duckdb/duckdb-rs/pull/308)
-
[@&#8203;muralisoundararajan](https://togithub.com/muralisoundararajan)
made their first contribution in
[https://github.com/duckdb/duckdb-rs/pull/321](https://togithub.com/duckdb/duckdb-rs/pull/321)
- [@&#8203;rijkvp](https://togithub.com/rijkvp) made their first
contribution in
[https://github.com/duckdb/duckdb-rs/pull/313](https://togithub.com/duckdb/duckdb-rs/pull/313)
- [@&#8203;abhiaagarwal](https://togithub.com/abhiaagarwal) made their
first contribution in
[https://github.com/duckdb/duckdb-rs/pull/333](https://togithub.com/duckdb/duckdb-rs/pull/333)
- [@&#8203;frectonz](https://togithub.com/frectonz) made their first
contribution in
[https://github.com/duckdb/duckdb-rs/pull/347](https://togithub.com/duckdb/duckdb-rs/pull/347)

**Full Changelog**:
duckdb/duckdb-rs@v0.10.2...v1.0.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/spiraldb/vortex).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjUuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQyNS4xIiwidGFyZ2V0QnJhbmNoIjoiZGV2ZWxvcCIsImxhYmVscyI6W119-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Robert Kruszewski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

using vendored_openssl with bundled ducdkb-rs
3 participants