{{ message }}
Repository navigation
Merge v1.4-andium into v1.5-variegata, and add storage versions v1.4.5 and v1.5.4 - #23082
Merged
Merged
Conversation
I'm not backporting the relaxed assertion or the reproducer, just the commit iteration bugfix. The reason is we can't relax the assert in the same way due to a lack of delta indexes, and the reproducer could still fail on relassert or debug with the assert (For 1.4 it makes more sense to keep the assert in and look out for errors there, than to have the specific reproducer).
Fixes duckdb#22279 Backports duckdb#21489 to v1.4
Backporting a test fix duckdb#21432 to `v1.4-andium` just in case. Ref: duckdblabs/duckdb-internal#8404
Backporting a test fix duckdb#21432 to `v1.4-andium` just in case. Ref: duckdblabs/duckdb-internal#8404
contains a fix for Azure @Tmonster i promise, i will leave you alone :)
The emscripten action has been [renamed](emscripten-core/setup-emsdk#61). Namespace runners have action caching so that could be the reason why we're not seeing similar errors in CI. Related PR: duckdb/extension-ci-tools#381. See also: - duckdb#23043 - duckdb#23044
…m, and add v1.5.4 storage
Member
Author
carlopi
changed the title
carlopi
changed the title
Member
krlmlr
pushed a commit
to krlmlr/duckdb
that referenced
this pull request
Jun 21, 2026
…s v1.4.5/v1.5.4)
Resolutions: version_map.json = union of variegata's v1.5.4 (68/7) and main's v2.0.0 (69/8), latest/default follow v2.0; storage_info.{cpp,hpp} kept main's enum form and regenerated; string_uncompressed.hpp kept main's overflow-checked NumericCast<>.
krlmlr
pushed a commit
to krlmlr/duckdb
that referenced
this pull request
Jun 21, 2026
krlmlr
pushed a commit
to krlmlr/duckdb
that referenced
this pull request
Jun 21, 2026
…s v1.4.5/v1.5.4)
Resolutions: version_map.json = union of variegata's v1.5.4 (68/7) and main's v2.0.0 (69/8), latest/default follow v2.0; storage_info.{cpp,hpp} kept main's enum form and regenerated; string_uncompressed.hpp kept main's overflow-checked NumericCast<>.
krlmlr
pushed a commit
to krlmlr/duckdb
that referenced
this pull request
Jun 21, 2026
…storage versions v1.4.5 and v1.5.4 (duckdb#23082) Brings this change from the v1.5-variegata release branch; it overlapped with the main/v2.0 line and was resolved as follows: - `src/include/duckdb/storage/storage_info.hpp`: regenerated enum from version_map.json. - `src/include/duckdb/transaction/duck_transaction_manager.hpp`: kept main's structure, incorporating the v1.5 change. - `src/storage/storage_info.cpp`: regenerated from version_map.json in main's enum form. - `src/storage/version_map.json`: union of storage/serialization versions (v1.5.4 and v2.0.0); latest/default follow v2.0. - `src/transaction/duck_transaction_manager.cpp`: kept main's structure, incorporating the v1.5 change.
krlmlr
pushed a commit
to krlmlr/duckdb
that referenced
this pull request
Jun 21, 2026
…storage versions v1.4.5 and v1.5.4 (duckdb#23082) Brings this change from the v1.5-variegata release branch; it overlapped with the main/v2.0 line and was resolved as follows: - `src/include/duckdb/storage/storage_info.hpp`: regenerated enum from version_map.json. - `src/include/duckdb/transaction/duck_transaction_manager.hpp`: kept main's structure, incorporating the v1.5 change. - `src/storage/storage_info.cpp`: regenerated from version_map.json in main's enum form. - `src/storage/version_map.json`: union of storage/serialization versions (v1.5.4 and v2.0.0); latest/default follow v2.0. - `src/transaction/duck_transaction_manager.cpp`: kept main's structure, incorporating the v1.5 change.
kaka11chen
pushed a commit
to kaka11chen/astrovela_vane
that referenced
this pull request
Aug 14, 2026
…5 and v1.5.4 (duckdb/duckdb#23082) Upstream-Commit: duckdb/duckdb@082b80b
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.