8000 Merge v1.2.2 into main by carlopi · Pull Request #17037 · duckdb/duckdb · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge v1.2.2 into main #17037

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

Merged
merged 65 commits into from
Apr 9, 2025
Merged

Merge v1.2.2 into main #17037

merged 65 commits into from
Apr 9, 2025

Conversation

carlopi
Copy link
Contributor
@carlopi carlopi commented Apr 8, 2025

This brings in the latest changes in v1.2-histrionicus into main.

The more complex bit was merging .github/config/out_of_tree.cmake, that is still likely will not really compile due to patches being applied to different commits.

Four regressions:

  • httpfs had sha c22532453e9fab8404f91729708d9f35e23d323d in v1.2.2, rolling back a few commits to 85ac4667bcb0d868199e156f8dd918b0278db7b9 due to changes in Secret interface
  • avro is currently disabled, needs a patch and re-enabling
  • delta is currently disabled, needs a different set of patches and re-enabling
  • aws tests are currently skipped

And an unrelated change, that was needed due to incompatibility:

  • bump spatial and remove the patch

There are relevant issues to solve them and can be handled piece by piece.

Mytherin and others added 30 commits March 14, 2025 16:10
* Only Finalize when all threads have been merged.

fixes: duckdb#16617
fixes: dudblabs/duckdb-internal#4425
I picked up the previous work on
duckdb#16331 by @Tishj and added a
test.

As far as I can tell, setting the `gstate` to uninitialised is fine,
here, and flushing before deleting fixes the issue.
This PR fixes duckdb#16942 

As mentioned
[here](https://duckdb.org/docs/stable/sql/dialect/sql_quirks#nan-values)
DuckDB does not follow the IEEE-754 behavior for nan comparisons,
instead it makes NaN the biggest value in the floating point ordering.

This PR adjusts the pyarrow dataset filters we create when pushing
DuckDB table filters in to pyarrow.
When embedding DuckDB, it is some times important to make sure all
output follows a certain structure (example JSON) and/or goes to
specific stream.

This PR allows overriding the Printer's default behavior.
Co-authored-by: Carlo Piovesan <piovesan.carlo@gmail.com>
bump duckdb-httpfs, and duckdb-aws to latest version of
v1.2-histrionicus

Also removing `DONT_LINK` from avro since duckdb-iceberg tries to
automatically load it, and if it is not available duckdb-iceberg will
through an error. This means any time iceberg is autoloaded and avro is
not available/linked, then statements/tests will fail.

EDIT: not bumping iceberg in this PR. Want to try and isolate errors.


EDIT2: Not bumping aws, there seems to be an issue with windows and
provider `credential_chain`. Want to try and debug it on the windows
laptop first
@carlopi
8000 Copy link
Contributor Author
carlopi commented Apr 8, 2025

Sure, I can split this in 2, extensions vs all the rest.
But extensions commits is also where most complexity is, maybe I should annotate with a comment what's the 1.2.2 state vs current state, and I think we should strive to have that fixed with some urgency.

I will have a look in a bit.

@carlopi carlopi marked this pull request as draft April 8, 2025 18:16
@carlopi carlopi marked this pull request as ready for review April 8, 2025 20:57
@duckdb-draftbot duckdb-draftbot marked this pull request as draft April 8, 2025 22:45
@carlopi carlopi marked this pull request as ready for review April 9, 2025 07:27
@carlopi
Copy link
Contributor Author
carlopi commented Apr 9, 2025

@Mytherin: I think some changes were still tied to extensions in v1.2-histrionicus, and this looks to me a reasonable compromise: bumping what can be bumping, and skipping in some places.

Note that main was skipping iceberg that is now re-introduced.

If Windows Extensions job passes this is good to go for me.

@carlopi
Copy link
Contributor Author
carlopi commented Apr 9, 2025

Windows Extensions fails on what looks to me an irrelevant spatial test, unsure if path is skipping also spatial tests.

@Maxxen
Copy link
Member
Maxxen commented Apr 9, 2025

Spatial test is fixed on spatial main branch - solution is just bumping to use that commit

@Maxxen
Copy link
Member
Maxxen commented Apr 9, 2025

4be6065edc313a53ff2196ff79c11a0d5e249720

@duckdb-draftbot duckdb-draftbot marked this pull request as draft April 9, 2025 10:36
@carlopi carlopi marked this pull request as ready for review April 9, 2025 10:36
@carlopi carlopi force-pushed the merge_v122_in_main branch from 3316e73 to 9bf0866 Compare April 9, 2025 10:44
@duckdb-draftbot duckdb-draftbot marked this pull request as draft April 9, 2025 10:44
@carlopi carlopi force-pushed the merge_v122_in_main branch from 9bf0866 to 7997d80 Compare April 9, 2025 10:46
@carlopi carlopi marked this pull request as ready for review April 9, 2025 10:47
@carlopi
Copy link
Contributor Author
carlopi commented Apr 9, 2025

Thanks @Maxxen, moving to 4be6065edc313a53ff2196ff79c11a0d5e249720 and removing patch + APPLY_PATCHES works

@Mytherin Mytherin merged commit bbdc794 into duckdb:main Apr 9, 2025
54 checks passed
@Mytherin
Copy link
Collaborator
Mytherin commented Apr 9, 2025

Thanks!

krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 15, 2025
krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 15, 2025
krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 16, 2025
krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 16, 2025
krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants
0