Skip to content

Re-enable Avro on core#17072

Merged
Mytherin merged 5 commits intoduckdb:mainfrom
Tishj:patch_avro
Apr 12, 2025
Merged

Re-enable Avro on core#17072
Mytherin merged 5 commits intoduckdb:mainfrom
Tishj:patch_avro

Conversation

@Tishj
Copy link
Contributor

@Tishj Tishj commented Apr 11, 2025 •
edited
Loading

This PR fixes https://github.com/duckdblabs/duckdb-internal/issues/4611

See duckdb/duckdb-avro#21

I am improving the output of failing a patch:

Applying patch: avro_multi_file_reader.patch

Failed to apply patch, command to reproduce locally:
patch -d /Users/thijs/DuckDBLabs/duckdb/build/extension_configuration/_deps/avro_extension_fc-src -p1 --forward -i /Users/thijs/DuckDBLabs/duckdb/.github/patches/extensions/avro/avro_multi_file_reader.patch

Error output:
patch: **** duckdb is not a normal file--can't patch


Standard output:
patching file .clang-format
patching file CMakeLists.txt

Exiting
FAILED: avro_extension_fc-populate-prefix/src/avro_extension_fc-populate-stamp/avro_extension_fc-populate-patch /Users/thijs/DuckDBLabs/duckdb/build/extension_configuration/_deps/avro_extension_fc-subbuild/avro_extension_fc-populate-prefix/src/avro_extension_fc-populate-stamp/avro_extension_fc-populate-patch 
cd /Users/thijs/DuckDBLabs/duckdb/build/extension_configuration/_deps/avro_extension_fc-src && /Users/thijs/.pyenv/versions/3.11.0/bin/python3.11 /Users/thijs/DuckDBLabs/duckdb/scripts/apply_extension_patches.py /Users/thijs/DuckDBLabs/duckdb/.github/patches/extensions/avro/ && /opt/homebrew/Cellar/cmake/4.0.0/bin/cmake -E touch /Users/thijs/DuckDBLabs/duckdb/build/extension_configuration/_deps/avro_extension_fc-subbuild/avro_extension_fc-populate-prefix/src/avro_extension_fc-populate-stamp/avro_extension_fc-populate-patch
ninja: build stopped: subcommand failed.

By printing the command to run the patch locally, and also printing the stderr+stdout captured from the subprocess call

@Tishj
Copy link
Contributor Author

Tishj commented Apr 11, 2025

Actually, never mind, this will need to be updated again, because of #17071

But at least we can see if the CI passes for now

@duckdb-draftbot duckdb-draftbot marked this pull request as draft April 11, 2025 11:04
@Tishj Tishj marked this pull request as ready for review April 11, 2025 11:04
@duckdb-draftbot duckdb-draftbot marked this pull request as draft April 11, 2025 21:30
@Tishj Tishj marked this pull request as ready for review April 11, 2025 21:39
@Mytherin Mytherin merged commit 09b7c4f into duckdb:main Apr 12, 2025
54 checks passed
@Mytherin
Copy link
Collaborator

Mytherin commented Apr 12, 2025

Thanks!

krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 18, 2025
@krlmlr
vendor: Update vendored sources to duckdb/duckdb@94d529e
fa72767 
[Nested] Optimize List Type in `list_value` (duckdb/duckdb#17063)
Re-enable Avro on core (duckdb/duckdb#17072)
Fix httpfs patches: avoid `git log` since might contain unsanitised `error` word (duckdb/duckdb#17075)
krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 18, 2025
@krlmlr
vendor: Update vendored sources to duckdb/duckdb@94d529e
4396fa8 
[Nested] Optimize List Type in `list_value` (duckdb/duckdb#17063)
Re-enable Avro on core (duckdb/duckdb#17072)
Fix httpfs patches: avoid `git log` since might contain unsanitised `error` word (duckdb/duckdb#17075)
krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 18, 2025
@krlmlr
vendor: Update vendored sources to duckdb/duckdb@94d529e
83f23c4 
[Nested] Optimize List Type in `list_value` (duckdb/duckdb#17063)
Re-enable Avro on core (duckdb/duckdb#17072)
Fix httpfs patches: avoid `git log` since might contain unsanitised `error` word (duckdb/duckdb#17075)
krlmlr added a commit to duckdb/duckdb-r that referenced this pull request May 19, 2025
@krlmlr
vendor: Update vendored sources to duckdb/duckdb@94d529e
0bda53c 
[Nested] Optimize List Type in `list_value` (duckdb/duckdb#17063)
Re-enable Avro on core (duckdb/duckdb#17072)
Fix httpfs patches: avoid `git log` since might contain unsanitised `error` word (duckdb/duckdb#17075)
@Tishj Tishj deleted the patch_avro branch November 7, 2025 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Ready For Review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Tishj @Mytherin @carlopi