[reconfigurator] Introduce IdMap and use it in BlueprintZonesConfig
#7327
Conversation
This file contains 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
jgallagher
commented
Jan 9, 2025
| { | ||
| "$ref": "#/components/schemas/IdMapBlueprintZoneConfig" | ||
| } | ||
| ] |
There was a problem hiding this comment.
I'm not sure why this changed, exactly. Does JsonSchema do something special for BTreeMap that it doesn't know how to do for IdMap?
I think this is semantically equivalent, though; allOf says to apply all of the inner subschemas, and since this subschema is the same as what the prior schema was, this is basically undoing an inlining?
andrewjstone
approved these changes
Jan 9, 2025
There was a problem hiding this comment.
Looks great. Thanks for all the work here @jgallagher.
I have no idea about the JsonSchema question. Maybe @ahl does.
| @@ -794,7 +795,7 @@ impl DataStore { | |||
| e.to_string() | |||
| )) | |||
| })?; | |||
| sled_zones.zones.insert(zone.id, zone); | |||
| sled_zones.zones.insert(zone); | |||
| Self { original_id: borrowed.id(), borrowed: Some(borrowed) } | ||
| } | ||
|
|
||
| pub fn into_ref(mut self) -> &'a T { |
There was a problem hiding this comment.
Nice closing of this loophole too!
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.
@andrewjstone mentioned being bothered by our
BTreeMap<Id, ValueWithAnId>maps on #7315:This has bugged me too, and adding a blippy check crossed my mind. But I think it would be better to make this just not possible, so this PR introduces a newtype wrapper around
BTreeMap<T::Id, T>that enforces "key must be value's ID" via a mix of compile time API constraints (e.g.,insertonly takes the value and generates the key on its own) and runtime checks (e.g., when mutating a value stored in the map, it will panic if that mutation changes the ID of the value).The new code is all in
id_map.rs, and the rest of the changes are replacing theBlueprintZonesConfigmap with it. If this looks reasonable to folks, followup PRs to change the other similarBTreeMaps to useIdMapshould be straightforward.