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.

Sign up for GitHub

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

Jump to bottom

[NO COMMIT] Debug windows CI failure #13143

Closed
wants to merge 9 commits into from
Closed

[NO COMMIT] Debug windows CI failure #13143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f505cd
Make preserve/preclude options mutable
pdillinger Nov 7, 2024
0db46b6
ASC fixes
pdillinger Nov 8, 2024
c7bf26a
Merge remote-tracking branch 'origin/main' into preserve_preclude_mut…
pdillinger Nov 8, 2024
79fc668
Still pre-mutable, test for what's broken
pdillinger Nov 15, 2024
1a2aa4f
Merge remote-tracking branch 'origin/main' into preserve_preclude_mut…
pdillinger Nov 15, 2024
e937f3a
Fix unused in release
pdillinger Nov 15, 2024
06797f4
Merge remote-tracking branch 'origin/main' into preserve_preclude_mut…
pdillinger Nov 18, 2024
03ab734
Differential debug in CI, step 1
pdillinger Nov 18, 2024
ee04540
Attempt fix
pdillinger Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions db/column_family.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,6 +1561,11 @@ Status ColumnFamilyData::SetOptions(
BuildColumnFamilyOptions(initial_cf_options_, mutable_cf_options_);
ConfigOptions config_opts;
config_opts.mutable_options_only = true;
#ifndef NDEBUG
if (TEST_allowSetOptionsImmutableInMutable) {
config_opts.mutable_options_only = false;
}
#endif
Status s = GetColumnFamilyOptionsFromMap(config_opts, cf_opts, options_map,
&cf_opts);
if (s.ok()) {
Expand Down
Loading
Loading